dreid 01/10/28 04:53:52
Modified: include/arch/beos proc_mutex.h thread_mutex.h
thread_rwlock.h
Log:
Add the new lock structures...
Revision Changes Path
1.2 +4 -1 apr/include/arch/beos/proc_mutex.h
Index: proc_mutex.h
===================================================================
RCS file: /home/cvs/apr/include/arch/beos/proc_mutex.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proc_mutex.h 2001/09/19 20:06:43 1.1
+++ proc_mutex.h 2001/10/28 12:53:51 1.2
@@ -55,7 +55,6 @@
#ifndef PROC_MUTEX_H
#define PROC_MUTEX_H
-#include <kernel/OS.h>
#include "apr_pools.h"
#include "apr_proc_mutex.h"
#include "apr_file_io.h"
@@ -65,6 +64,10 @@
struct apr_proc_mutex_t {
apr_pool_t *pool;
+
+ /* Our lock :) */
+ sem_id Lock;
+ int32 LockCount;
};
#endif /* PROC_MUTEX_H */
1.2 +9 -0 apr/include/arch/beos/thread_mutex.h
Index: thread_mutex.h
===================================================================
RCS file: /home/cvs/apr/include/arch/beos/thread_mutex.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thread_mutex.h 2001/09/04 23:28:50 1.1
+++ thread_mutex.h 2001/10/28 12:53:51 1.2
@@ -65,6 +65,15 @@
struct apr_thread_mutex_t {
apr_pool_t *pool;
+
+ /* Our lock :) */
+ sem_id Lock;
+ int32 LockCount;
+
+ /* If we nest locks we need these... */
+ int nested;
+ apr_os_thread_t owner;
+ int owner_ref;
};
#endif /* THREAD_MUTEX_H */
1.2 +12 -0 apr/include/arch/beos/thread_rwlock.h
Index: thread_rwlock.h
===================================================================
RCS file: /home/cvs/apr/include/arch/beos/thread_rwlock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thread_rwlock.h 2001/09/08 23:36:34 1.1
+++ thread_rwlock.h 2001/10/28 12:53:51 1.2
@@ -65,6 +65,18 @@
struct apr_thread_rwlock_t {
apr_pool_t *pool;
+
+ /* Our lock :) */
+ sem_id Lock;
+ int32 LockCount;
+ /* Read/Write lock stuff */
+ sem_id Read;
+ int32 ReadCount;
+ sem_id Write;
+ int32 WriteCount;
+ int32 Nested;
+
+ thread_id writer;
};
#endif /* THREAD_RWLOCK_H */
