summaryrefslogtreecommitdiff
path: root/job.c
AgeCommit message (Collapse)AuthorFilesLines
2013-05-05cosmetics: fix few innocuous typosStefano Lattarini1-1/+1
Most of these were found using Lucas De Marchi's 'codespell' tool. * ChangeLog: Fix minor typos. * ChangeLog.2: Likewise. * README.Amiga: Likewise. * TODO.private: Likewise. * function.c: Likewise. * glob/glob.h: Likewise. * job.c: Likewise. * main.c: Likewise. * readme.vms: Likewise. * remake.c: Likewise. * tests/ChangeLog: Likewise. * tests/NEWS: Likewise. * tests/README: Likewise. * tests/scripts/variables/private: Likewise. * vmsdir.h: Likewise. * signame.c: Likewise. While at it, improve line wrapping in the touched comment. Copyright-paperwork-exempt: yes Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
2013-05-05Rename the -O "job" mode to "line" and "make" to "recurse".Paul Smith1-2/+2
2013-05-05Ensure command lines are written synchronously with -O.Paul Smith1-63/+63
If output-sync is enabled, have make write the command line to the temp file instead of printing it directly to the screen to ensure that the output is ordered properly. Also, remove extraneous enter/leave operations by having them printed directly when dumping temp file output.
2013-05-04Don't pump output to the descriptor, as we use FILE* elsewhere.Paul Smith1-49/+29
2013-05-04Improve sync handling for -Ojob/-Otarget and recursion.Paul Smith1-125/+142
If we are not going to sync a command line then dump any collected output first to preserve ordering. Do some code cleanup: * Move the handle init to a separate function. * Move the temp file truncation to the output function. * Remember whether we sync in a variable for readability. * Handle EINTR and short writes in child_out(). * Always call sync_output() in case output_sync was changed due to error.
2013-05-04Fix a possibly confusing comment at end of pump_from_tmp_fd.Eli Zaretskii1-1/+2
2013-05-04Fix the MS-Windows branch of output_sync code.Eli Zaretskii1-2/+1
job.c (start_job_command): Make the condition for creating a temporary output file be identical to the Posix code branch. Suggested by Frank Heckenbach <f.heckenbach@fh-soft.de>.
2013-05-01Fix treatment of whitespace after a backslash on MS-Windows.Eli Zaretskii1-0/+9
job.c (construct_command_argv_internal): Don't treat a backslash as an escape character before whitespace, if the shell is not a Posix shell. For the description of the problem, see http://lists.gnu.org/archive/html/make-w32/2013-04/msg00014.html.
2013-05-01job.c (start_job_command) [WINDOWS32]: Make the same fix forEli Zaretskii1-2/+4
MS-Windows as the previous commit did for Posix platforms.
2013-05-01Don't synchronize output for recursive make unless -OmakePaul Smith1-2/+4
2013-04-29Fix the .ONESHELL operation on MS-Windows.Eli Zaretskii1-3/+3
job.c (construct_command_argv_internal) [WINDOWS32]: Return right after generating new_argv for one_shell case. This fixes the Windows build for both Unixy shell and stock Windows shells.
2013-04-28Ensure error messages are printed with sync'd output.Paul Smith1-17/+58
Enhance the child_error() function so that it will write error output to the child's sync output buffer, if it exists. If it doesn't the output goes to stdout/stderr.
2013-04-28Small cleanups and fixes.Paul Smith1-2/+2
2013-04-28Fix a few compiler warnings found by Eli.Paul Smith1-3/+4
2013-04-28Add support for per-job output sync.Paul Smith1-24/+43
A new flag to the -O/--output-sync, "job", selects a per-job (that is, per line of a recipe) output synchronization. To support this move the close of the temp file out of the sync_output() function and don't do it until we free the child, since we may call sync_output() multiple times in a given recipe. When we set up for a new temp file, if we're in per-job mode we truncate the file and seek to the beginning to re-use it for every job.
2013-04-27Fix support for .ONESHELL when dealing with non-POSIX shells.Paul Smith1-26/+26
2013-04-27Support .ONESHELL on MS-Windows, for default Windows shells.Eli Zaretskii1-22/+99
read.c (record_files): Pay attention to .ONESHELL in MS-Windows. job.c (construct_command_argv_internal): Support .ONESHELL on MS-Windows, when the shell is not a Unixy shell.
2013-04-27 job.c: Fix compilation error on GNU/Linux due to "label at end of compound ↵Eli Zaretskii1-1/+6
statement".
2013-04-27Support --output-sync on MS-Windows.Eli Zaretskii1-10/+71
w32/compat/posixfcn.c: New file, with emulations of Posix functions and Posix functionality for MS-Windows. w32/subproc/sub_proc.c: Include io.h. (process_noinherit): New function, forces a file descriptor to not be inherited by child processes. (process_easy): Accept two additional arguments, and use them to set up the standard output and standard error handles of the child process. w32/include/sub_proc.h (process_easy): Adjust prototype. (process_noinherit): Add prototype. read.c [WINDOWS32]: Include windows.h and sub_proc.h. makeint.h (LOCALEDIR) [WINDOWS32}: Define to NULL if not defined. This is needed because the MS-Windows build doesn't have a canonical place for LOCALEDIR. (WIN32_LEAN_AND_MEAN) [WINDOWS32]: Define, to avoid getting from windows.h header too much stuff that could conflict with the code. main.c <sync_mutex>: New static variable. <switches>: Add support for "--sync-mutex" switch. (decode_output_sync_flags): Decode the --sync-mutex= switch. (prepare_mutex_handle_string) [WINDOWS32]: New function. (main): Add "output-sync" to .FEATURES. job.h (CLOSE_ON_EXEC) [WINDOWS32]: Define to call process_noinherit. (F_GETFD, F_SETLKW, F_WRLCK, F_UNLCK, struct flock) [WINDOWS32]: New macros. (RECORD_SYNC_MUTEX): New macro, a no-op for Posix platforms. (sync_handle_t): New typedef. job.c <sync_handle>: Change type to sync_handle_t. (FD_NOT_EMPTY): Seek to the file's end. Suggested by Frank Heckenbach <f.heckenbach@fh-soft.de>. (pump_from_tmp_fd) [WINDOWS32]: Switch to_fd to binary mode for the duration of this function, and then change back before returning. (start_job_command) [WINDOWS32]: Support output_sync mode on MS-Windows. Use a system-wide mutex instead of locking stdout/stderr. Call process_easy with two additional arguments: child->outfd and child->errfd. (exec_command) [WINDOWS32]: Pass two additional arguments, both -1, to process_easy, to adjust for the changed function signature. function.c (windows32_openpipe) [WINDOWS32]: This function now returns an int, which is -1 if it fails and zero otherwise. It also calls 'error' instead of 'fatal', to avoid exiting prematurely. (func_shell_base) [WINDOWS32]: Call perror_with_name if windows32_openpipe fails, now that it always returns. This avoids a compiler warning that error_prefix is not used in the MS-Windows build. config.h.W32.template (OUTPUT_SYNC): Define. build_w32.bat: Add w32/compat/posixfcn.c to compilation and linking commands. From Frank Heckenbach <f.heckenbach@fh-soft.de>: job.c (sync_output): Don't discard the output if acquire_semaphore fails; instead, dump the output unsynchronized.
2013-04-16Some cleanups for Windows builds after the output-sync option.Paul Smith1-4/+0
Note currently output-sync is not supported on Windows.
2013-04-16Create an open_tmpfd() function to return temp files by FD. Use it.Paul Smith1-55/+8
2013-04-15Save the output from the entire recipe, not per-job.Paul Smith1-18/+21
2013-04-15Change the arg option for -O from numeric to string.Paul Smith1-2/+2
2013-04-14Rename the "parallel-sync" option to "output-sync".Paul Smith1-87/+85
2013-04-14Initial patch for output synchronization. See Savannah bug #33138.Frank Heckenbach1-0/+253
Based on work by David Boyce <David.S.Boyce@gmail.com>.
2013-01-20Rename struct floc to typedef gmk_floc as an externally scoped symbol.Paul Smith1-1/+1
2013-01-20Rename the make.h file to makeint.h for internal use only.Paul Smith1-2/+2
2012-12-08 job.c (create_batch_file): Fix last change: always increment theEli Zaretskii1-6/+12
counter of batch files before trying to use it.
2012-12-07 job.c (construct_command_argv_internal): Remove " fromEli Zaretskii1-1/+12
sh_chars_dos[]. Ignore an escaped backslash inside a string quoted with "..". This lifts the 4KB or 8KB command-line length limitation imposed by the Windows shell when a command uses quoted strings, because we now don't call the shell in that case.
2012-12-07 job.c (reap_children): Add debug message for when removal of a temporaryEli Zaretskii1-1/+0
batch file fails.
2012-12-07Avoid leaving temporary batch files in the temporary directory.Eli Zaretskii1-4/+30
job.c (create_batch_file): Declare the counter of batch files static, to avoid having 2 jobs using the same file name and stepping on each other's toes. When all 64K names are used up, make one more loop looking for slots that became vacant. This avoids leaving behind temporary batch files in the temporary directory, which happens frequently on a fast machine when using parallel builds.
2012-09-09Keep the command line on the heap to avoid stack overflow.Paul Smith1-4/+9
Fixes Savannah bug #36451.
2012-03-05Simplify copyrights using ranges of years.Paul Smith1-3/+1
The new GNU Maintainer's Manual allows the use of year ranges in certain situations; take advantage of this simplification.
2012-03-04Convert all "`'" quotes to "''" per new GNU Coding Standard guidelines.Paul Smith1-41/+41
Fixes Savannah bug #34530.
2012-03-03Ensure that .ONESHELL works with .SHELLFLAGS options containing whitespace.Paul Smith1-5/+23
See Savannah bug #35397.
2012-01-16Update copyright notices.Paul Smith1-3/+3
2011-11-15Enable jobserver on W32 when using configure.Paul Smith1-3/+5
Some W32 cleanups: see Savannah bug #34830 Forgot to modify the config.h.W32.template file for jobserver support.
2011-11-14Don't use Hungarian notation: remove _p/_ptr from var names.Paul Smith1-8/+8
Fixes Savannah bug #32567.
2011-11-14Support jobserver capability on Windows systems.Paul Smith1-4/+53
Implementation contributed by Troy Runkel <Troy.Runkel@mathworks.com>
2011-05-07 job.c (construct_command_argv_internal): Don't assume shellflagsEli Zaretskii1-7/+16
is always non-NULL. Escape-protect characters special to the shell when copying the value of SHELL into new_line. Fixes Savannah bug #23922.
2010-11-06Improve backslash/newline handling to adhere to POSIX requirements.Paul Smith1-9/+23
2010-08-29Bump the version to 3.82.90.Paul Smith1-25/+60
Fix some doc bugs. Implement the --trace flag. Show filename/linenumber on error.
2010-08-29Set shellflags to a reasonable default if it's not set already.Paul Smith1-1/+5
2010-07-24job.cEli Zaretskii1-1/+3
2010-07-19- Many fixup patches from Savannah.Paul Smith1-6/+4
- Fix the test suite on Solaris (from Boris) - Update the manual for .ONESHELL
2010-07-13Update copyrights for 2010.Paul Smith1-2/+2
2010-07-12Fixes to build_w32.bat for building with MSVC 64bit.Paul Smith1-0/+2
2010-07-12Add the beginning of the .ONESHELL special feature.Paul Smith1-7/+124
Original patch by David Boyce. Modified by Paul Smith.
2010-07-09 job.c (pid2str) [WINDOWS32]: Don't use %Id with GCC < 4.x.Eli Zaretskii1-6/+11
(exec_command) [WINDOWS32]: Use pid2str instead of non-portable %Id. main.c (handle_runtime_exceptions): Use %p to print addresses, to DTRT on both 32-bit and 64-bit hosts. Savannah bug #27809. job.c (w32_kill, start_job_command, create_batch_file): Use pid_t for process IDs and intptr_t for the 1st arg of _open_osfhandle. function.c (windows32_openpipe): Use pid_t for process IDs and intptr_t for the 1st arg of _open_osfhandle. (func_shell): Use pid_t for process IDs. main.c (main) [WINDOWS32]: Pacify the compiler. config.h.W32.template (pid_t): Add a definition for 64-bit Windows builds that don't use GCC. Savannah bug #27809. Patch by Ozkan Sezer <sezeroz@gmail.com>
2010-07-06- Enhance .POSIX to set -e when invoking shells, as demanded by aPaul Smith1-17/+26
backward-incompatible change in the 2008 POSIX specification. - Add the .SHELLFLAGS variable so people can choose their own shell flags. - Add tests for this. - Add documentation for this.