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

Side by Side Diff: content/zygote/zygote_linux.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/zygote/zygote_linux.h" 5 #include "content/zygote/zygote_linux.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <poll.h> 9 #include <poll.h>
10 #include <signal.h> 10 #include <signal.h>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 sizeof(kZygoteHelloMessage), 132 sizeof(kZygoteHelloMessage),
133 std::vector<int>()); 133 std::vector<int>());
134 #if defined(OS_CHROMEOS) 134 #if defined(OS_CHROMEOS)
135 LOG_IF(WARNING, !r) << "Sending zygote magic failed"; 135 LOG_IF(WARNING, !r) << "Sending zygote magic failed";
136 // Exit normally on chromeos because session manager may send SIGTERM 136 // Exit normally on chromeos because session manager may send SIGTERM
137 // right after the process starts and it may fail to send zygote magic 137 // right after the process starts and it may fail to send zygote magic
138 // number to browser process. 138 // number to browser process.
139 if (!r) 139 if (!r)
140 _exit(RESULT_CODE_NORMAL_EXIT); 140 _exit(RESULT_CODE_NORMAL_EXIT);
141 #else 141 #else
142 CHECK(r) << "Sending zygote magic failed"; 142 // Sending zygote magic failed
143 CHECK(r);
143 #endif 144 #endif
144 } 145 }
145 146
146 sigset_t ppoll_sigmask = orig_sigmask; 147 sigset_t ppoll_sigmask = orig_sigmask;
147 PCHECK(sigdelset(&ppoll_sigmask, SIGCHLD) == 0); 148 PCHECK(sigdelset(&ppoll_sigmask, SIGCHLD) == 0);
148 struct pollfd pfd; 149 struct pollfd pfd;
149 pfd.fd = kZygoteSocketPairFd; 150 pfd.fd = kZygoteSocketPairFd;
150 pfd.events = POLLIN; 151 pfd.events = POLLIN;
151 152
152 struct timespec timeout; 153 struct timespec timeout;
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 bool Zygote::HandleGetSandboxStatus(int fd, base::PickleIterator iter) { 665 bool Zygote::HandleGetSandboxStatus(int fd, base::PickleIterator iter) {
665 if (HANDLE_EINTR(write(fd, &sandbox_flags_, sizeof(sandbox_flags_))) != 666 if (HANDLE_EINTR(write(fd, &sandbox_flags_, sizeof(sandbox_flags_))) !=
666 sizeof(sandbox_flags_)) { 667 sizeof(sandbox_flags_)) {
667 PLOG(ERROR) << "write"; 668 PLOG(ERROR) << "write";
668 } 669 }
669 670
670 return false; 671 return false;
671 } 672 }
672 673
673 } // namespace content 674 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698