summaryrefslogtreecommitdiff
path: root/job.c
AgeCommit message (Collapse)AuthorFilesLines
2013-09-14Support the -Orecurse option properly.Paul Smith1-2/+2
In this mode we still collect all the output from a given target and dump it at once. However we don't treat recursive lines any differently from non-recursive lines. Also we don't print enter/leave messages after every dump. However we do ensure that we always print them once to stdout, so the parent make will collect it properly.
2013-09-12Enhance the output sync mode.Paul Smith1-322/+65
Create a new file, output.c, and collect functions that generate output there. We introduce a new global context specifying where output should go (to stdout or to a sync file), and the lowest level output generator chooses where to write output based on that context. This allows us to set the context globally, and all operations that write output (including functions like $(info ...) etc.) will use it. Removed the "--trace=dir" capability. It was too confusing. If you have directory tracking enabled then output sync will print the enter/leave message for each synchronized block. If you don't want that, disable directory tracking.
2013-07-21[Bug #39158] Source cleanups suggested by cppcheck utility.Paul Smith1-18/+12
2013-07-21Safety cleanups: ensure OUTFD is -1 when closed.Paul Smith1-6/+9
2013-07-14Modify the update_status field in struct file to be an enum.Paul Smith1-9/+9
Makes the code a little clearer/cleaner, and solves a problem on systems where a char is unsigned by default.
2013-06-22Compare internal commands of non-Unix shells on Windows case-insensitively.Eli Zaretskii1-2/+2
job.c (construct_command_argv_internal) [WINDOWS32]: Use case-insensitive comparison with internal commands of non-Unix shells.
2013-06-22Create a character map to use for locating stop-points in strings.Paul Smith1-1/+1
In various places we were passing flags and characters to compare, then using complex conditionals to see where to stop in string searches. Performance numbers reveal that we were spending as much as 23% of our processing time in these functions, most of it in the comparison lines. Instead create a character map and use a single bitwise comparison to determine if this is any one of the stop characters.
2013-05-26[SV #39035] Compare OUT to the beginning of the OUT var/func, not IN.Paul Smith1-1/+3
2013-05-18Support "move" as internal shell command on Windows with cmd.exe.Eli Zaretskii1-2/+2
job.c (construct_command_argv_internal) <sh_cmds_dos> [WINDOWS32]: Add "move". Fixes Savannah bug #30714.
2013-05-17Update source file format: remove TABs, use GNU coding styles.Paul Smith1-794/+809
2013-05-17Update copyright for changes in 2013.Paul Smith1-1/+1
2013-05-13Add new --trace[=MODE] flags, with --trace=dirPaul Smith1-7/+13
This mode replaces the previous heuristic setting enabled with -O, where we would log directory enter/leave for each synchronized output. Now we only do that if --trace=dir is given.
2013-05-11Avoid printing stdout and stderr messages without a newline between them.Eli Zaretskii1-1/+1
job.c (child_out): Output the newline following the message before fllush-ing the stream. Avoids displaying the following failure message, which goes to stderr, on the same line.
2013-05-06Remove use of vfork().Paul Smith1-5/+4
GCC was giving us warnings, most OS's now just run fork() when you call vfork(), and looking at the standard definition of vfork() we are a long way from using it safely anyway: you're not allowed to even call a function before you exec().
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 01:09:54 +0000