From c304ca1a1ccf2d1032961479a4736bcde8d6ef46 Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Sun, 13 Aug 2017 15:30:09 -0700 Subject: [PATCH] Revert "Explicitly nulling chained_wait_prev after munmap()" This reverts commit 47d8a7e8820382d3957f4bebbac79e5fd24d3d7f. It was meant for the major branch. --- src/exec.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/exec.cpp b/src/exec.cpp index 03fc5687a..b340b9590 100644 --- a/src/exec.cpp +++ b/src/exec.cpp @@ -1071,9 +1071,8 @@ void exec_job(parser_t &parser, job_t *j) { { pid = execute_fork(false); if (pid == 0) { - // usleep is a hack that fixes any tcsetpgrp errors caused by race conditions + // a hack that fixes any tcsetpgrp errors caused by race conditions // usleep(20 * 1000); - // it should no longer be needed with the chained_wait_next code below. if (chained_wait_next != nullptr) { debug(3, L"Waiting for next command in chain to start.\n"); sem_wait(chained_wait_next); @@ -1127,7 +1126,6 @@ void exec_job(parser_t &parser, job_t *j) { debug(3, L"Unblocking previous command in chain.\n"); sem_post(chained_wait_prev); munmap(chained_wait_prev, sizeof(sem_t)); - chained_wait_prev = nullptr; } if (chained_wait_next != nullptr) { chained_wait_prev = chained_wait_next;