summaryrefslogtreecommitdiffstats
path: root/third_party/tcmalloc/chromium/src/symbolize.cc
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 12:22:51 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 12:22:51 +0000
commitdb3fb1cb119f862b96ca3de8f74ff647fef6f94e (patch)
treed547159ec152ac05ed793f9cac867b500a42a8f7 /third_party/tcmalloc/chromium/src/symbolize.cc
parentfa82f93da256dede111ee4143c340e55a195d7e3 (diff)
downloadchromium_src-db3fb1cb119f862b96ca3de8f74ff647fef6f94e.zip
chromium_src-db3fb1cb119f862b96ca3de8f74ff647fef6f94e.tar.gz
chromium_src-db3fb1cb119f862b96ca3de8f74ff647fef6f94e.tar.bz2
The newer version of tcmalloc should fix the problems with running tcmalloc under Valgrind.
Review URL: http://codereview.chromium.org/1735024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/chromium/src/symbolize.cc')
-rw-r--r--third_party/tcmalloc/chromium/src/symbolize.cc42
1 files changed, 33 insertions, 9 deletions
diff --git a/third_party/tcmalloc/chromium/src/symbolize.cc b/third_party/tcmalloc/chromium/src/symbolize.cc
index 9dd890e..ff45e3e 100644
--- a/third_party/tcmalloc/chromium/src/symbolize.cc
+++ b/third_party/tcmalloc/chromium/src/symbolize.cc
@@ -87,16 +87,40 @@ int SymbolTable::Symbolize() {
#else
// All this work is to do two-way communication. ugh.
extern char* program_invocation_name; // gcc provides this
- int child_in[2]; // file descriptors
- int child_out[2]; // for now, we don't worry about child_err
- if (socketpair(AF_UNIX, SOCK_STREAM, 0, child_in) == -1) {
- return 0;
- }
- if (socketpair(AF_UNIX, SOCK_STREAM, 0, child_out) == -1) {
- close(child_in[0]);
- close(child_in[1]);
- return 0;
+ int *child_in = NULL; // file descriptors
+ int *child_out = NULL; // for now, we don't worry about child_err
+ int child_fds[5][2]; // socketpair may be called up to five times below
+
+ // The client program may close its stdin and/or stdout and/or stderr
+ // thus allowing socketpair to reuse file descriptors 0, 1 or 2.
+ // In this case the communication between the forked processes may be broken
+ // if either the parent or the child tries to close or duplicate these
+ // descriptors. The loop below produces two pairs of file descriptors, each
+ // greater than 2 (stderr).
+ for (int i = 0; i < 5; i++) {
+ if (socketpair(AF_UNIX, SOCK_STREAM, 0, child_fds[i]) == -1) {
+ for (int j = 0; j < i; j++) {
+ close(child_fds[j][0]);
+ close(child_fds[j][1]);
+ return 0;
+ }
+ } else {
+ if ((child_fds[i][0] > 2) && (child_fds[i][1] > 2)) {
+ if (child_in == NULL) {
+ child_in = child_fds[i];
+ } else {
+ child_out = child_fds[i];
+ for (int j = 0; j < i; j++) {
+ if (child_fds[j] == child_in) continue;
+ close(child_fds[j][0]);
+ close(child_fds[j][1]);
+ }
+ break;
+ }
+ }
+ }
}
+
switch (fork()) {
case -1: { // error
close(child_in[0]);