stoddard 99/10/04 22:09:19
Modified: src/os/win32 os.c Log: Throw out some trash. The lock functions are in APR now. Revision Changes Path 1.3 +4 -95 apache-2.0/src/os/win32/os.c Index: os.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/os.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- os.c 1999/08/27 22:57:27 1.2 +++ os.c 1999/10/05 05:09:19 1.3 @@ -36,6 +36,10 @@ } +/* ToDo: + * Adapt the winnt mpm to use the APR thread functions. + * The APR thread functions need to be tested... + */ thread * create_thread(void (thread_fn)(void *), void *thread_arg) { @@ -79,98 +83,3 @@ } - -API_EXPORT(mutex *) ap_create_mutex(char *name) -{ - return(CreateMutex(NULL, FALSE, name)); -} - -API_EXPORT(mutex *) ap_open_mutex(char *name) -{ - return(OpenMutex(MUTEX_ALL_ACCESS, FALSE, name)); -} - - -API_EXPORT(int) ap_acquire_mutex(mutex *mutex_id) -{ - int rv; - - rv = WaitForSingleObject(mutex_id, INFINITE); - - return(map_rv(rv)); -} - -API_EXPORT(int) ap_release_mutex(mutex *mutex_id) -{ - return(ReleaseMutex(mutex_id)); -} - -API_EXPORT(void) ap_destroy_mutex(mutex *mutex_id) -{ - CloseHandle(mutex_id); -} - - -semaphore * -create_semaphore(int initial) -{ - return(CreateSemaphore(NULL, initial, 1000000, NULL)); -} - -int acquire_semaphore(semaphore *semaphore_id) -{ - int rv; - - rv = WaitForSingleObject(semaphore_id, INFINITE); - - return(map_rv(rv)); -} - -int release_semaphore(semaphore *semaphore_id) -{ - return(ReleaseSemaphore(semaphore_id, 1, NULL)); -} - -void destroy_semaphore(semaphore *semaphore_id) -{ - CloseHandle(semaphore_id); -} - - -event * -create_event(int manual, int initial, char *name) -{ - return(CreateEvent(NULL, manual, initial, name)); -} - -event * -open_event(char *name) -{ - return(OpenEvent(EVENT_ALL_ACCESS, FALSE, name)); -} - - -int acquire_event(event *event_id) -{ - int rv; - - rv = WaitForSingleObject(event_id, INFINITE); - - return(map_rv(rv)); -} - -int set_event(event *event_id) -{ - return(SetEvent(event_id)); -} - -int reset_event(event *event_id) -{ - return(ResetEvent(event_id)); -} - - -void destroy_event(event *event_id) -{ - CloseHandle(event_id); -}