Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: chrome/common/multi_process_lock_linux.cc

Issue 622373003: Replacing the OVERRIDE with override in chrome/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved Error Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/common/mac/mock_launchd.h ('k') | chrome/common/multi_process_lock_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/multi_process_lock.h" 5 #include "chrome/common/multi_process_lock.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 #include <sys/socket.h> 8 #include <sys/socket.h>
9 #include <sys/un.h> 9 #include <sys/un.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/posix/eintr_wrapper.h" 14 #include "base/posix/eintr_wrapper.h"
15 15
16 class MultiProcessLockLinux : public MultiProcessLock { 16 class MultiProcessLockLinux : public MultiProcessLock {
17 public: 17 public:
18 explicit MultiProcessLockLinux(const std::string& name) 18 explicit MultiProcessLockLinux(const std::string& name)
19 : name_(name), fd_(-1) { } 19 : name_(name), fd_(-1) { }
20 20
21 virtual ~MultiProcessLockLinux() { 21 virtual ~MultiProcessLockLinux() {
22 if (fd_ != -1) { 22 if (fd_ != -1) {
23 Unlock(); 23 Unlock();
24 } 24 }
25 } 25 }
26 26
27 virtual bool TryLock() OVERRIDE { 27 virtual bool TryLock() override {
28 struct sockaddr_un address; 28 struct sockaddr_un address;
29 29
30 // +1 for terminator, +1 for 0 in position 0 that makes it an 30 // +1 for terminator, +1 for 0 in position 0 that makes it an
31 // abstract named socket. 31 // abstract named socket.
32 const size_t max_len = sizeof(address.sun_path) - 2; 32 const size_t max_len = sizeof(address.sun_path) - 2;
33 33
34 if (fd_ != -1) { 34 if (fd_ != -1) {
35 DLOG(ERROR) << "MultiProcessLock is already locked - " << name_; 35 DLOG(ERROR) << "MultiProcessLock is already locked - " << name_;
36 return true; 36 return true;
37 } 37 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 DVLOG(1) << "Couldn't bind socket - " 78 DVLOG(1) << "Couldn't bind socket - "
79 << &(address.sun_path[1]) 79 << &(address.sun_path[1])
80 << " Length: " << length; 80 << " Length: " << length;
81 if (IGNORE_EINTR(close(socket_fd)) < 0) { 81 if (IGNORE_EINTR(close(socket_fd)) < 0) {
82 PLOG(ERROR) << "close"; 82 PLOG(ERROR) << "close";
83 } 83 }
84 return false; 84 return false;
85 } 85 }
86 } 86 }
87 87
88 virtual void Unlock() OVERRIDE { 88 virtual void Unlock() override {
89 if (fd_ == -1) { 89 if (fd_ == -1) {
90 DLOG(ERROR) << "Over-unlocked MultiProcessLock - " << name_; 90 DLOG(ERROR) << "Over-unlocked MultiProcessLock - " << name_;
91 return; 91 return;
92 } 92 }
93 if (IGNORE_EINTR(close(fd_)) < 0) { 93 if (IGNORE_EINTR(close(fd_)) < 0) {
94 DPLOG(ERROR) << "close"; 94 DPLOG(ERROR) << "close";
95 } 95 }
96 fd_ = -1; 96 fd_ = -1;
97 } 97 }
98 98
99 private: 99 private:
100 std::string name_; 100 std::string name_;
101 int fd_; 101 int fd_;
102 DISALLOW_COPY_AND_ASSIGN(MultiProcessLockLinux); 102 DISALLOW_COPY_AND_ASSIGN(MultiProcessLockLinux);
103 }; 103 };
104 104
105 MultiProcessLock* MultiProcessLock::Create(const std::string &name) { 105 MultiProcessLock* MultiProcessLock::Create(const std::string &name) {
106 return new MultiProcessLockLinux(name); 106 return new MultiProcessLockLinux(name);
107 } 107 }
OLDNEW
« no previous file with comments | « chrome/common/mac/mock_launchd.h ('k') | chrome/common/multi_process_lock_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698