From 282113ba894449ed17e85b296cf0760d5206ac8d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 19 Nov 2003 18:49:41 +0000 Subject: Don't use safe_new but new throughout. Fix copyright dates throughout. * Makefile.in: Accomodate all new files and name changes. Add a *.d dependency. (sbindir): Add. (etcdir): Drop in favor of more appropriate sysconfdir definition. (sysconfdir): Add. (CXXFLAGS): Add -MMD flag. Add SYSCONFDIR definition. (.SUFFIXES): Add. (install): Add action items. (libclean): New target. (fullclean): Ditto. * bsd_helper.cc: New file. * bsd_helper.h: Ditto. * bsd_log.cc: Ditto. * bsd_log.h: Ditto. * bsd_mutex.cc: Ditto. * bsd_mutex.h: Ditto. * client.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. (client_request::handle_request): Add Message Queue and Semaphore handling. * cygserver.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. Use new debug/log/panic logging functions. (DEF_CONFIG_FILE): New definition for configuration file. Use throughout. (getfunc): Remove. (__cygserver__printf): Remove. (client_request_attach_tty::serve): Return error if impersonation fails. (print_usage): Pump up help message. (print_version): Add output of default configuration file. (main): Accommodate new options. Allow overwrite of threading options from config file. Call several new initialization functions. Drop printing dots. Don't define SIGHANDLE inline. * cygserver.conf: New file. * cygserver_process.h: Rename to process.h. * cygserver_transport.h: Rename to transport.h. * cygserver_transport_pipes.h: Rename to transport_pipes.h. * cygserver_transport_sockets.h: Rename to transport_sockets.h. * msg.cc: Rewrite. * sem.cc: Rewrite. * shm.cc: Rewrite. * sysv_msg.cc: New file, derived from FreeBSD version 1.52. * sysv_sem.cc: New file, derived from FreeBSD version 1.66. * sysv_shm.cc: New file, derived from FreeBSD version 1.89. * threaded_queue.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. * transport.cc (transport_layer_base::impersonate_client): Define bool. (transport_layer_base::revert_to_self): Ditto. * transport.h (transport_layer_base::impersonate_client): Declare bool. (transport_layer_base::revert_to_self): Ditto. * transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Don't call init_security. (init_security): Remove. (transport_layer_pipes::accept): Use global sec_all_nih. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Define bool. (transport_layer_pipes::revert_to_self): Ditt. * transport_pipes.h (transport_layer_pipes::impersonate_client): Declare bool. (transport_layer_pipes::revert_to_self): Ditto. * woutsup.h: Include bsd compatibility headers. (SIGHANDLE): Add definition. (__cygserver__printf): Remove definition. (__noop_printf): Ditto. (debug_printf): Define using debug. (syscall_printf): Define using log. (system_printf): Ditto. Drop all other _printf definitions. --- winsup/cygserver/bsd_mutex.h | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 winsup/cygserver/bsd_mutex.h (limited to 'winsup/cygserver/bsd_mutex.h') diff --git a/winsup/cygserver/bsd_mutex.h b/winsup/cygserver/bsd_mutex.h new file mode 100644 index 000000000..3b07bf3c6 --- /dev/null +++ b/winsup/cygserver/bsd_mutex.h @@ -0,0 +1,51 @@ +/* bsd_mutex.h: BSD Mutex helper + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ +#ifndef _BSD_MUTEX_H +#define _BSD_MUTEX_H + +#define MTX_DEF 0 + +#define MA_OWNED 1 +#define MA_NOTOWNED 2 + +#define PZERO (0x20) +#define PRIO_MASK (0x1f) +#define PDROP 0x1000 +#define PCATCH 0x2000 +#define PLOCK 0x3000 + +struct mtx { + HANDLE h; + const char *name; + DWORD owner; +}; + +/* Some BSD kernel global mutex. */ +extern struct mtx Giant; + +void mtx_init (mtx *, const char *, const void *, int); +void _mtx_lock (mtx *, DWORD winpid, const char *, int); +#define mtx_lock(m) _mtx_lock((m), (td->ipcblk->winpid), __FILE__, __LINE__) +int mtx_owned (mtx *); +void _mtx_assert(mtx *, int, const char *, int); +#define mtx_assert(m,w) _mtx_assert((m),(w),__FILE__,__LINE__) +void _mtx_unlock (mtx *, const char *, int); +#define mtx_unlock(m) _mtx_unlock((m),__FILE__,__LINE__) + +void mtx_destroy (mtx *); + +void msleep_init (void); +int _msleep (void *, struct mtx *, int, const char *, int, struct thread *); +#define msleep(i,m,p,w,t) _msleep((i),(m),(p),(w),(t),(td)) +#define tsleep(i,p,w,t) _msleep((i),NULL,(p),(w),(t),(td)) +int wakeup (void *); +void wakeup_all (void); + +#endif /* _BSD_MUTEX_H */ -- cgit v1.2.3