From d0b73466cbb22109065e1f19c3bd3de5899fb1b8 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Wed, 2 Feb 2005 14:40:15 +0000
Subject: [PATCH] remove server specific code.
---
src/zmapThreads/zmapSlave_P.h | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/zmapThreads/zmapSlave_P.h b/src/zmapThreads/zmapSlave_P.h
index 65289b4fb..61ae108f8 100755
--- a/src/zmapThreads/zmapSlave_P.h
+++ b/src/zmapThreads/zmapSlave_P.h
@@ -25,40 +25,38 @@
*
* Description:
* HISTORY:
- * Last edited: Sep 17 09:31 2004 (edgrif)
+ * Last edited: Feb 2 11:30 2005 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
- * CVS info: $Id: zmapSlave_P.h,v 1.6 2004-09-17 08:32:19 edgrif Exp $
+ * CVS info: $Id: zmapSlave_P.h,v 1.7 2005-02-02 14:40:15 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SLAVE_P_H
#define ZMAP_SLAVE_P_H
#include <glib.h>
-#include <ZMap/zmapConn.h>
-#include <ZMap/zmapFeature.h>
-#include <ZMap/zmapServer.h>
+#include <ZMap/zmapThreads.h>
typedef struct
{
- ZMapConnection connection ;
+ ZMapThread thread ;
gboolean thread_died ;
gchar *initial_error ; /* Holds string description of first
serious error that caused thread
termination. */
- ZMapServer server ; /* The server for this thread..... */
+ void *slave_data ; /* Any state required by slave. */
} zmapThreadCBstruct, *zmapThreadCB ;
-/* Error messages, needs some refining. */
-#define ZMAPSLAVE_CONNCREATE "Connection creation failed"
-#define ZMAPSLAVE_CONNOPEN "Connection open failed"
-#define ZMAPSLAVE_CONNCONTEXT "Connection create context failed"
-#define ZMAPSLAVE_CONNREQUEST "Connection request failed"
+/* Error messages, needs some refining and changing now thread bit is more generalised. */
+#define ZMAPTHREAD_SLAVECREATE "Thread creation failed"
+#define ZMAPTHREAD_SLAVEOPEN "Thread open failed"
+#define ZMAPTHREAD_SLAVECONTEXT "Thread create context failed"
+#define ZMAPTHREAD_SLAVEREQUEST "Thread request failed"
--
GitLab