Rework test suite to use run script.

[openldap] / servers / slurpd / replica.c

diff --git a/servers/slurpd/replica.c b/servers/slurpd/replica.c
index 7ccd356a15f33150411684ae415237c8fc5643b5..d24ba413a76bfe8e21cbd192a14abb8466bb592a 100644 (file)
--- a/servers/slurpd/replica.c
+++ b/servers/slurpd/replica.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -18,11 +23,11 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/stdlib.h>
 
 #include "slurp.h"
 #include "globals.h"
 
-
 /*
  * Just invoke the Ri's process() member function, and log the start and
  * finish.
@@ -34,13 +39,25 @@ replicate(
 {
     Ri         *ri = (Ri *) ri_arg;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ARGS, "replicate: "
+               "begin replication thread for %s:%d\n",
+           ((Ri *)ri)->ri_hostname, ((Ri *)ri)->ri_port, 0 );
+#else
     Debug( LDAP_DEBUG_ARGS, "begin replication thread for %s:%d\n",
            ((Ri *)ri)->ri_hostname, ((Ri *)ri)->ri_port, 0 );
+#endif
 
     ri->ri_process( ri );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ARGS, "replicate: "
+               "begin replication thread for %s:%d\n",
+           ri->ri_hostname, ri->ri_port, 0 );
+#else
     Debug( LDAP_DEBUG_ARGS, "end replication thread for %s:%d\n",
            ri->ri_hostname, ri->ri_port, 0 );
+#endif
     return NULL;
 }
 
@@ -55,10 +72,16 @@ start_replica_thread(
 )
 {
     /* POSIX_THREADS or compatible */
-    if ( pthread_create( &(ri->ri_tid), NULL, replicate,
+    if ( ldap_pvt_thread_create( &(ri->ri_tid), 0, replicate,
            (void *) ri ) != 0 ) {
-       Debug( LDAP_DEBUG_ANY, "replica \"%s:%d\" pthread_create failed\n",
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ERR, "start_replica_thread: "
+               "replica %s:%d ldap_pvt_thread_create failed\n",
+           ri->ri_hostname, ri->ri_port, 0 );
+#else
+       Debug( LDAP_DEBUG_ANY, "replica \"%s:%d\" ldap_pvt_thread_create failed\n",
                ri->ri_hostname, ri->ri_port, 0 );
+#endif
        return -1;
     }