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

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

Issue 100253002: Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/shell_integration_linux.cc ('k') | chrome/common/service_process_util_posix.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>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 if (bind(socket_fd, 72 if (bind(socket_fd,
73 reinterpret_cast<sockaddr *>(&address), 73 reinterpret_cast<sockaddr *>(&address),
74 length) == 0) { 74 length) == 0) {
75 fd_ = socket_fd; 75 fd_ = socket_fd;
76 return true; 76 return true;
77 } else { 77 } else {
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 (HANDLE_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 (HANDLE_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/browser/shell_integration_linux.cc ('k') | chrome/common/service_process_util_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698