Fix unparse in prev commit

[openldap] / libraries / libldap_r / thr_lwp.c

diff --git a/libraries/libldap_r/thr_lwp.c b/libraries/libldap_r/thr_lwp.c
index 6f113c6907768cf3475edac6fa1878789b8ec5a3..3dabfe4fb725c197362bbdf54a721970a7f75f9d 100644 (file)
--- a/libraries/libldap_r/thr_lwp.c
+++ b/libraries/libldap_r/thr_lwp.c
@@ -1,15 +1,19 @@
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* thr_lwp.c - wrappers around SunOS LWP threads */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-/* thr_lwp.c - wrappers around SunOS LWP threads */
-
 /* BUGS:
  * - slurpd calls the get_stack/free_stack functions. Should be fixed, so
  *   they can become static.
@@ -34,7 +38,9 @@
 
 #include "ldap-int.h"
 
-#include "ldap_pvt_thread.h"
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"     /* May rename the symbols defined below */
 
 #include <lwp/lwp.h>
 #include <lwp/stackdep.h>
@@ -46,7 +52,7 @@
  * Initialize LWP by spinning of a schedular
  */
 int
-ldap_pvt_thread_initialize( void )
+ldap_int_thread_initialize( void )
 {
        thread_t                tid;
        stkalign_t              *stack;
@@ -61,9 +67,9 @@ ldap_pvt_thread_initialize( void )
 }
 
 int
-ldap_pvt_thread_destroy( void )
+ldap_int_thread_destroy( void )
 {
-       /* need to destory lwp_scheduler thread and clean up private
+       /* need to destroy lwp_scheduler thread and clean up private
                variables */
        return 0;
 }
@@ -75,7 +81,7 @@ struct stackinfo {
 
 static struct stackinfo        *stacks;
 
-static stkalign_t * ldap_pvt_thread_get_stack( int *stacknop )
+static stkalign_t * ldap_int_thread_get_stack( int *stacknop )
 {
        int     i;
 
@@ -121,7 +127,7 @@ static stkalign_t * ldap_pvt_thread_get_stack( int *stacknop )
 }
 
 static void
-ldap_pvt_thread_free_stack( int        stackno )
+ldap_int_thread_free_stack( int        stackno )
 {
        if ( stackno < 0 || stackno > MAX_THREADS ) {
                Debug( LDAP_DEBUG_ANY, "free_stack of bogus stack %d\n",
@@ -131,12 +137,12 @@ ldap_pvt_thread_free_stack( int   stackno )
        stacks[stackno].stk_inuse = 0;
 }
 
-static static void
+static void
 lwp_create_stack( void *(*func)(), void *arg, int stackno )
 {
        (*func)( arg );
 
-       ldap_pvt_thread_free_stack( stackno );
+       ldap_int_thread_free_stack( stackno );
 }
 
 int 
@@ -148,7 +154,7 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
        stkalign_t      *stack;
        int             stackno;
 
-       if ( (stack = ldap_pvt_thread_get_stack( &stackno )) == NULL ) {
+       if ( (stack = ldap_int_thread_get_stack( &stackno )) == NULL ) {
                return( -1 );
        }
        return( lwp_create( thread, lwp_create_stack, MINPRIO, 0, 
@@ -307,7 +313,7 @@ ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
 
 int 
 ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond, 
-                     ldap_pvt_thread_mutex_t *mutex )
+       ldap_pvt_thread_mutex_t *mutex )
 {
        if ( ! cond->lcv_created ) {
                cv_create( &cond->lcv_cv, *mutex );
@@ -359,4 +365,14 @@ ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cv )
        return( cv->lcv_created ? cv_broadcast( cv->lcv_cv ) : 0 );
 }
 
+ldap_pvt_thread_t
+ldap_pvt_thread_self( void )
+{
+       thread_t                mylwp;
+
+       lwp_self( &mylwp );
+
+       return mylwp;
+}
+
 #endif /* HAVE_LWP */