mirror of
https://github.com/mirror/make.git
synced 2025-01-11 04:40:30 +08:00
da7df54309
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.
72 lines
2.7 KiB
C
72 lines
2.7 KiB
C
/* Definitions for Windows process invocation.
|
|
Copyright (C) 1996-2012 Free Software Foundation, Inc.
|
|
This file is part of GNU Make.
|
|
|
|
GNU Make is free software; you can redistribute it and/or modify it under the
|
|
terms of the GNU General Public License as published by the Free Software
|
|
Foundation; either version 3 of the License, or (at your option) any later
|
|
version.
|
|
|
|
GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef SUB_PROC_H
|
|
#define SUB_PROC_H
|
|
|
|
/*
|
|
* Component Name:
|
|
*
|
|
* $Date$
|
|
*
|
|
* $Source$
|
|
*
|
|
* $Id$
|
|
*/
|
|
|
|
#define EXTERN_DECL(entry, args) extern entry args
|
|
#define VOID_DECL void
|
|
|
|
EXTERN_DECL(HANDLE process_init, (VOID_DECL));
|
|
EXTERN_DECL(HANDLE process_init_fd, (HANDLE stdinh, HANDLE stdouth,
|
|
HANDLE stderrh));
|
|
EXTERN_DECL(long process_begin, (HANDLE proc, char **argv, char **envp,
|
|
char *exec_path, char *as_user));
|
|
EXTERN_DECL(long process_pipe_io, (HANDLE proc, char *stdin_data,
|
|
int stdin_data_len));
|
|
EXTERN_DECL(long process_file_io, (HANDLE proc));
|
|
EXTERN_DECL(void process_cleanup, (HANDLE proc));
|
|
EXTERN_DECL(HANDLE process_wait_for_any, (int block, DWORD* pdwWaitStatus));
|
|
EXTERN_DECL(void process_register, (HANDLE proc));
|
|
EXTERN_DECL(HANDLE process_easy, (char** argv, char** env,
|
|
int outfd, int errfd));
|
|
EXTERN_DECL(BOOL process_kill, (HANDLE proc, int signal));
|
|
EXTERN_DECL(int process_used_slots, (VOID_DECL));
|
|
|
|
/* support routines */
|
|
EXTERN_DECL(long process_errno, (HANDLE proc));
|
|
EXTERN_DECL(long process_last_err, (HANDLE proc));
|
|
EXTERN_DECL(long process_exit_code, (HANDLE proc));
|
|
EXTERN_DECL(long process_signal, (HANDLE proc));
|
|
EXTERN_DECL(char * process_outbuf, (HANDLE proc));
|
|
EXTERN_DECL(char * process_errbuf, (HANDLE proc));
|
|
EXTERN_DECL(int process_outcnt, (HANDLE proc));
|
|
EXTERN_DECL(int process_errcnt, (HANDLE proc));
|
|
EXTERN_DECL(void process_pipes, (HANDLE proc, int pipes[3]));
|
|
EXTERN_DECL(void process_noinherit, (int fildes));
|
|
|
|
/* jobserver routines */
|
|
EXTERN_DECL(int open_jobserver_semaphore, (const char* name));
|
|
EXTERN_DECL(int create_jobserver_semaphore, (int tokens));
|
|
EXTERN_DECL(void free_jobserver_semaphore, (VOID_DECL));
|
|
EXTERN_DECL(int acquire_jobserver_semaphore, (VOID_DECL));
|
|
EXTERN_DECL(int release_jobserver_semaphore, (VOID_DECL));
|
|
EXTERN_DECL(int has_jobserver_semaphore, (VOID_DECL));
|
|
EXTERN_DECL(char* get_jobserver_semaphore_name, (VOID_DECL));
|
|
EXTERN_DECL(int wait_for_semaphore_or_child_process, (VOID_DECL));
|
|
|
|
#endif
|