This is a much larger commit than I meant to have, but a lot has

been changed in my tree today :)

- remove the sms code I committed yesterday
- add an apr_pool_t to the sms structure
- add locking code to the tracking sms

This threw up an issue with locking, so next

- change the locking code to add an owner and ref counting
  so we can lock multiple times from the same thread.  this was
  needed by the apr_sms_tracking_reset code where we lock
  and then call free which locks again...

I haven't added the locking changes for os2 or win32 after
the problems I created with my last commit :)

Changes to testlock on the way.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61716 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 11 insertions, 0 deletions

diff --git a/threadproc/beos/thread.c b/threadproc/beos/thread.c
index d0fac8e4e..facd41194 100644
--- a/threadproc/beos/thread.c
+++ b/threadproc/beos/thread.c
@@ -53,6 +53,7 @@
  */
 
 #include "threadproc.h"
+#include "apr_portable.h"
 
 apr_status_t apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *cont)
 {
@@ -122,6 +123,11 @@ apr_status_t apr_thread_create(apr_thread_t **new, apr_threadattr_t *attr,
     } 
 }
 
+apr_os_thread_t apr_os_thread_current(void)
+{
+    return find_thread(NULL);
+}
+
 apr_status_t apr_thread_exit(apr_thread_t *thd, apr_status_t *retval)
 {
     apr_pool_destroy(thd->cntxt);
diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c
index a8bcc3334..8aa35e1bf 100644
--- a/threadproc/unix/thread.c
+++ b/threadproc/unix/thread.c
@@ -158,6 +158,11 @@ apr_status_t apr_thread_create(apr_thread_t **new, apr_threadattr_t *attr,
     } 
 }
 
+apr_os_thread_t apr_os_thread_current(void)
+{
+    return pthread_self();
+}
+
 apr_status_t apr_thread_exit(apr_thread_t *thd, apr_status_t *retval)
 {
     apr_pool_destroy(thd->cntxt);