From 2ed0736bd0b653d3f4e2a972f30a8f994d211c67 Mon Sep 17 00:00:00 2001
From: "W. Eric Norum" <wenorum@lbl.gov>
Date: Sat, 26 Feb 2000 23:45:24 +0000
Subject: [PATCH] Reflect routine name change from threadSuspend() to
 threadSuspendSelf().

---
 src/db/callback.c                     | 2 +-
 src/db/dbBkpt.c                       | 5 ++++-
 src/db/dbLock.c                       | 2 +-
 src/libCom/osi/os/vxWorks/osdAssert.c | 4 ++--
 src/rsrv/caservertask.c               | 6 +++---
 src/rsrv/cast_server.c                | 6 +++---
 src/rsrv/online_notify.c              | 4 ++--
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/db/callback.c b/src/db/callback.c
index bc547a511..b8b01252e 100644
--- a/src/db/callback.c
+++ b/src/db/callback.c
@@ -121,7 +121,7 @@ static void callbackTask(int *ppriority)
             if(nget==0) break;
 	    if(nget!=sizeof(pcallback)) {
 		errMessage(0,"ringGet failed in callbackTask");
-		threadSuspend();
+		threadSuspendSelf();
 	    }
 	    ringOverflow[priority] = FALSE;
 	    (*pcallback->callback)(pcallback);
diff --git a/src/db/dbBkpt.c b/src/db/dbBkpt.c
index 94dced534..4d8f13b66 100644
--- a/src/db/dbBkpt.c
+++ b/src/db/dbBkpt.c
@@ -14,6 +14,9 @@ of this distribution.
 /* Modification Log:
  * -----------------
  *  $Log$
+ *  Revision 1.17  2000/02/25 22:26:38  mrk
+ *  more changes for creating dlls
+ *
  *  Revision 1.16  2000/02/25 22:01:24  mrk
  *  changes for creating DLLs
  *
@@ -827,7 +830,7 @@ int epicsShareAPI dbBkpt(struct dbCommon *precord)
       */
       semMutexGive(bkpt_stack_sem);
       dbScanUnlock(precord);
-      threadSuspend();
+      threadSuspendSelf();
       dbScanLock(precord);
       semMutexMustTake(bkpt_stack_sem);
    }
diff --git a/src/db/dbLock.c b/src/db/dbLock.c
index f02942b69..70d128241 100644
--- a/src/db/dbLock.c
+++ b/src/db/dbLock.c
@@ -195,7 +195,7 @@ void epicsShareAPI dbScanLock(dbCommon *precord)
     if(!(plockRecord= precord->lset)) {
 	epicsPrintf("dbScanLock plockRecord is NULL record %s\n",
 	    precord->name);
-	threadSuspend();
+	threadSuspendSelf();
     }
     while(TRUE) {
         while(changingLockSets) threadSleep(.05);
diff --git a/src/libCom/osi/os/vxWorks/osdAssert.c b/src/libCom/osi/os/vxWorks/osdAssert.c
index 890c4af51..06039c287 100644
--- a/src/libCom/osi/os/vxWorks/osdAssert.c
+++ b/src/libCom/osi/os/vxWorks/osdAssert.c
@@ -45,7 +45,7 @@
  * epicsAssert ()
  *
  * This forces assert failures into the log file and then
- * calls threadSuspend() instead of exit() so that we can debug
+ * calls threadSuspendSelf() instead of exit() so that we can debug
  * the problem.
  */
 epicsShareFunc void epicsShareAPI epicsAssert (const char *pFile, const unsigned line, const char *pExp,
@@ -83,6 +83,6 @@ epicsShareFunc void epicsShareAPI epicsAssert (const char *pFile, const unsigned
 	}
 	epicsPrintf ("This problem occurred in \"%s\"\n", epicsReleaseVersion);
 
-    threadSuspend ();
+    threadSuspendSelf ();
 }
 
diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index 6e7cd94a4..db6fa973c 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -281,7 +281,7 @@ LOCAL int req_server (void)
      */
     if ((IOC_sock = socket(AF_INET, SOCK_STREAM, 0)) == SOCKET_ERROR) {
         errlogPrintf ("CAS: Socket creation error\n");
-        threadSuspend ();
+        threadSuspendSelf ();
     }
 
     /* Zero the sock_addr structure */
@@ -293,14 +293,14 @@ LOCAL int req_server (void)
     if (bind(IOC_sock, (struct sockaddr *)&serverAddr, sizeof(serverAddr)) < 0) {
         errlogPrintf ("CAS: Bind error\n");
         socket_close (IOC_sock);
-        threadSuspend ();
+        threadSuspendSelf ();
     }
 
     /* listen and accept new connections */
     if (listen(IOC_sock, 10) < 0) {
         errlogPrintf ("CAS: Listen error\n");
         socket_close (IOC_sock);
-        threadSuspend ();
+        threadSuspendSelf ();
     }
 
     while (TRUE) {
diff --git a/src/rsrv/cast_server.c b/src/rsrv/cast_server.c
index 4f7ba1e84..450e5314c 100644
--- a/src/rsrv/cast_server.c
+++ b/src/rsrv/cast_server.c
@@ -149,7 +149,7 @@ int cast_server(void)
 
     if ((IOC_cast_sock = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
         epicsPrintf ("CAS: cast socket creation error\n");
-        threadSuspend ();
+        threadSuspendSelf ();
     }
 
     /*
@@ -187,7 +187,7 @@ int cast_server(void)
     if( bind(IOC_cast_sock, (struct sockaddr *)&sin, sizeof (sin)) < 0){
         epicsPrintf ("CAS: cast bind error\n");
         socket_close (IOC_cast_sock);
-        threadSuspend ();
+        threadSuspendSelf ();
     }
     
     /* tell clients we are on line again */
@@ -308,4 +308,4 @@ int cast_server(void)
             clean_addrq ();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index 22fc493b6..471879e53 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -86,14 +86,14 @@ int rsrv_online_notify_task()
      */
     if( (sock = socket (AF_INET, SOCK_DGRAM, 0)) == SOCKET_ERROR){
         errlogPrintf ("CAS: online socket creation error\n");
-        threadSuspend ();
+        threadSuspendSelf ();
     }
     
     status = setsockopt (sock, SOL_SOCKET, SO_BROADCAST, 
                 (char *)&true, sizeof(true));
     if (status<0) {
         errlogPrintf ("CAS: online socket set up error\n");
-        threadSuspend ();
+        threadSuspendSelf ();
     }
     
 #if 0