fix up problem of a thread being defined differently on different platforms.

src/zmapThreads/zmapSlave.c

@@ -28,12 +28,13 @@
  *              
  * Exported functions: See zmapConn_P.h
  * HISTORY:
- * Last edited: Nov  7 16:53 2006 (edgrif)
+ * Last edited: Feb 21 15:21 2007 (edgrif)
  * Created: Thu Jul 24 14:37:26 2003 (edgrif)
- * CVS info:   $Id: zmapSlave.c,v 1.27 2006-11-08 09:24:32 edgrif Exp $
+ * CVS info:   $Id: zmapSlave.c,v 1.28 2007-03-01 09:15:56 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
+#include <stdio.h>
 #include <strings.h>
 
 /* YOU SHOULD BE AWARE THAT ON SOME PLATFORMS (E.G. ALPHAS) THERE SEEMS TO BE SOME INTERACTION
@@ -69,7 +70,7 @@ void *zmapNewThread(void *thread_args)
   TIMESPEC timeout ;
   ZMapThreadRequest signalled_state ;
 
-  ZMAPTHREAD_DEBUG(("%lu: main thread routine starting....\n", thread->thread_id)) ;
+  ZMAPTHREAD_DEBUG(("%s: main thread routine starting....\n", zMapThreadGetThreadID(thread))) ;
 
   /* We set up the thread struct and then immediately set up our pthread clean up routine
    * to catch errors, if we are cancelled before this then the clean up routine will not
@@ -104,7 +105,7 @@ void *zmapNewThread(void *thread_args)
     {
       void *request ;
 
-      ZMAPTHREAD_DEBUG(("%lu: about to do timed wait\n", thread->thread_id)) ;
+      ZMAPTHREAD_DEBUG(("%s: about to do timed wait\n", zMapThreadGetThreadID(thread))) ;
 
       /* this will crap over performance...asking the time all the time !! */
       timeout.tv_sec = 5 ;				    /* n.b. interface seems to absolute time. */
@@ -113,7 +114,7 @@ void *zmapNewThread(void *thread_args)
       signalled_state = zmapCondVarWaitTimed(thread_state, ZMAPTHREAD_REQUEST_WAIT, &timeout, TRUE,
 					     &request) ;
 
-      ZMAPTHREAD_DEBUG(("%lu: finished condvar wait, state = %s\n", thread->thread_id,
+      ZMAPTHREAD_DEBUG(("%s: finished condvar wait, state = %s\n", zMapThreadGetThreadID(thread),
 			zMapThreadGetRequestString(signalled_state))) ;
 
       /* pthread_testcancel fix for MACOSX */
@@ -133,7 +134,7 @@ void *zmapNewThread(void *thread_args)
 	  zMapAssert(request) ;
 
 	  /* this needs changing according to request.... */
-	  ZMAPTHREAD_DEBUG(("%lu: servicing request....\n", thread->thread_id)) ;
+	  ZMAPTHREAD_DEBUG(("%s: servicing request....\n", zMapThreadGetThreadID(thread))) ;
 
 
 	  zMapPrintTimer(NULL, "In thread, calling handler function") ;
@@ -151,7 +152,7 @@ void *zmapNewThread(void *thread_args)
 	    {
 	    case ZMAPTHREAD_RETURNCODE_OK:
 	      {
-		ZMAPTHREAD_DEBUG(("%lu: got all data....\n", thread->thread_id)) ;
+		ZMAPTHREAD_DEBUG(("%s: got all data....\n", zMapThreadGetThreadID(thread))) ;
 
 		/* Signal that we got some data. */
 		zmapVarSetValueWithData(&(thread->reply), ZMAPTHREAD_REPLY_GOTDATA, request) ;
@@ -163,7 +164,7 @@ void *zmapNewThread(void *thread_args)
 	      {
 		char *error_msg ;
 
-		ZMAPTHREAD_DEBUG(("%lu: request failed....\n", thread->thread_id)) ;
+		ZMAPTHREAD_DEBUG(("%s: request failed....\n", zMapThreadGetThreadID(thread))) ;
 
 		error_msg = g_strdup_printf("%s - %s", ZMAPTHREAD_SLAVEREQUEST, slave_error) ;
 
@@ -186,7 +187,7 @@ void *zmapNewThread(void *thread_args)
 
 
 
-		ZMAPTHREAD_DEBUG(("%lu: server died....\n", thread->thread_id)) ;
+		ZMAPTHREAD_DEBUG(("%s: server died....\n", zMapThreadGetThreadID(thread))) ;
 
 		error_msg = g_strdup_printf("%s - %s", ZMAPTHREAD_SLAVEREQUEST, slave_error) ;
 
@@ -235,7 +236,7 @@ void *zmapNewThread(void *thread_args)
   pthread_cleanup_pop(1) ;				    /* 1 => always call clean up routine */
 
 
-  ZMAPTHREAD_DEBUG(("%lu: main thread routine exitting....\n", thread->thread_id)) ;
+  ZMAPTHREAD_DEBUG(("%s: main thread routine exitting....\n", zMapThreadGetThreadID(thread))) ;
 
 
   return thread_args ;
@@ -261,7 +262,7 @@ static void cleanUpThread(void *thread_args)
 
   zMapAssert(thread_args) ;
 
-  ZMAPTHREAD_DEBUG(("%lu: thread clean-up routine starting....\n", thread->thread_id)) ;
+  ZMAPTHREAD_DEBUG(("%s: thread clean-up routine starting....\n", zMapThreadGetThreadID(thread))) ;
 
 
   if (thread_cb->thread_died)
@@ -282,8 +283,8 @@ static void cleanUpThread(void *thread_args)
       if ((slave_response = (*(thread->terminate_func))(&(thread_cb->slave_data), &error_msg))
 	  != ZMAPTHREAD_RETURNCODE_OK)
 	{
-	  ZMAPTHREAD_DEBUG(("%lu: Unable to close connection to server cleanly\n",
-			    thread->thread_id)) ;
+	  ZMAPTHREAD_DEBUG(("%s: Unable to close connection to server cleanly\n",
+			    zMapThreadGetThreadID(thread))) ;
 	}
     }
 
@@ -295,8 +296,8 @@ static void cleanUpThread(void *thread_args)
     zmapVarSetValueWithError(&(thread->reply), reply, error_msg) ;
 
 
-  ZMAPTHREAD_DEBUG(("%lu: thread clean-up routine exitting because %s....\n",
-		    thread->thread_id, zMapThreadGetReplyString(reply))) ;
+  ZMAPTHREAD_DEBUG(("%s: thread clean-up routine exitting because %s....\n",
+		    zMapThreadGetThreadID(thread), zMapThreadGetReplyString(reply))) ;
 
   return ;
 }

src/zmapThreads/zmapThreads.c

@@ -29,12 +29,13 @@
  *              
  * Exported functions: See ZMap/zmapThread.h
  * HISTORY:
- * Last edited: Jan 31 11:50 2007 (edgrif)
+ * Last edited: Feb 21 15:06 2007 (edgrif)
  * Created: Thu Jan 27 11:25:37 2005 (edgrif)
- * CVS info:   $Id: zmapThreads.c,v 1.5 2007-02-27 10:37:40 zmap Exp $
+ * CVS info:   $Id: zmapThreads.c,v 1.6 2007-03-01 09:15:56 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <ZMap/zmapUtils.h>
 #include <zmapThreads_P.h>
@@ -220,7 +221,7 @@ void zMapThreadKill(ZMapThread thread)
 {
   int status ;
 
-  ZMAPTHREAD_DEBUG(("GUI: killing and destroying thread for thread %lu\n", thread->thread_id)) ;
+  ZMAPTHREAD_DEBUG(("GUI: killing and destroying thread for thread %s\n", zMapThreadGetThreadID(thread))) ;
 
   /* we could signal an exit here by setting a condvar of EXIT...but that might lead to 
    * deadlocks, think about this bit.. */
@@ -238,7 +239,7 @@ void zMapThreadKill(ZMapThread thread)
 /* Release the threads resources, don't do this until the slave thread has gone. */
 void zMapThreadDestroy(ZMapThread thread)
 {
-  ZMAPTHREAD_DEBUG(("GUI: destroying thread for thread %lu\n", thread->thread_id)) ;
+  ZMAPTHREAD_DEBUG(("GUI: destroying thread for thread %s\n", zMapThreadGetThreadID(thread))) ;
 
   zmapVarDestroy(&thread->reply) ;
   zmapCondVarDestroy(&(thread->request)) ;

src/zmapThreads/zmapThreadsUtils.c

@@ -26,12 +26,13 @@
  *              
  * Exported functions: See ZMap/zmapThreads.h
  * HISTORY:
- * Last edited: Feb  1 09:57 2005 (edgrif)
+ * Last edited: Feb 21 15:15 2007 (edgrif)
  * Created: Thu Jan 27 11:50:01 2005 (edgrif)
- * CVS info:   $Id: zmapThreadsUtils.c,v 1.2 2006-11-08 09:24:36 edgrif Exp $
+ * CVS info:   $Id: zmapThreadsUtils.c,v 1.3 2007-03-01 09:15:56 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
+#include <stdio.h>
 #include <errno.h>
 #include <ZMap/zmapUtils.h>
 #include <zmapThreads_P.h>