Move abort() into opr

We need our own abort function, because the behaviour of the Windows
abort() implementation isn't sufficiently flexible for us.
Because we're replacing an operating system function, reather than
implementing a missing function, this doesn't belong in roken.

So, provide an alternative opr_abort() implementation in our portable
runtime layer, which is a synonym for abort() on Unix, and implements
the required DebugBreak() functionality on Windows.

Remove lwp_abort() which was just creating another, unnecessary, layer
of abstraction.

Change-Id: Ice226d70d2791beaba011f42e39fde60242f6cc3
Reviewed-on: http://gerrit.openafs.org/4428
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/WINNT/client_exp/NTMakefile b/src/WINNT/client_exp/NTMakefile
index e7c9830cdf1a262ba13fbf2c28dd2e53f9d5bfdb..31f33bea0bb931151cc38355b5020eab499c2d2a 100644 (file)
--- a/src/WINNT/client_exp/NTMakefile
+++ b/src/WINNT/client_exp/NTMakefile
@@ -84,6 +84,7 @@ DLLLIBS =\
        $(DESTDIR)\lib\afs\TaLocaleU.lib \
        $(DESTDIR)\lib\afs\mtafsutil.lib \
         $(DESTDIR)\lib\afsroken.lib \
+       $(DESTDIR)\lib\opr.lib \
         $(DESTDIR)\lib\libafsconf.lib
 
 $(DLLFILE): $(DLLOBJS) $(DLLLIBS)

diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c
index b0148ea44195756639016665d33ccb8420f8fb60..2ed325a6d8c4ab9b4437592af3b776a308901476 100644 (file)
--- a/src/lwp/iomgr.c
+++ b/src/lwp/iomgr.c
@@ -38,14 +38,12 @@
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-extern void lwp_abort(void);
-#endif /* AFS_NT40_ENV */
-
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 
+#include <afs/opr.h>
+
 #include "lwp.h"
 #include "timer.h"
 
@@ -552,7 +550,7 @@ static void *IOMGR(void *dummy)
                  }
 #endif
                  iomgr_errno = errno;
-                 lwp_abort();
+                 opr_abort();
               }
            }
 
@@ -834,7 +832,7 @@ int IOMGR_Select(int fds, fd_set *readfds, fd_set *writefds,
        fprintf(stderr, "IOMGR_Select: fds=%d, more than max %d\n",
                fds, FD_SETSIZE);
        fflush(stderr);
-       lwp_abort();
+       opr_abort();
     }
 #endif
 

diff --git a/src/lwp/lwp.h b/src/lwp/lwp.h
index a94209e882ee98d9b2d4288c715c2e7b08d3773f..3b58c59178b504f2404c919d60da298fe42a99d2 100644 (file)
--- a/src/lwp/lwp.h
+++ b/src/lwp/lwp.h
@@ -72,9 +72,6 @@ extern unsigned int FT_ApproxTime(void);
 #define LWP_ENOROCKS   -15     /* all rocks are in use */
 #define LWP_EBADROCK   -16     /* the specified rock does not exist */
 
-#ifndef AFS_NT40_ENV
-#define lwp_abort() abort()
-#endif
 /* Maximum priority permissible (minimum is always 0) */
 #define LWP_MAX_PRIORITY 4     /* changed from 1 */
 

diff --git a/src/lwp/lwp_nt.c b/src/lwp/lwp_nt.c
index 147a91a2bd826fa00d14a2b92bd24b29d980f7f0..c37baebda415dfe46b925eb3f5644130e32b6517 100644 (file)
--- a/src/lwp/lwp_nt.c
+++ b/src/lwp/lwp_nt.c
@@ -22,6 +22,7 @@
 #include <roken.h>
 
 #ifdef AFS_NT40_ENV
+#include <afs/opr.h>
 #include <afs/afsutil.h>
 #include "lwp.h"
 
@@ -54,7 +55,6 @@ char lwp_debug = 0;
 
 /* Forward declarations */
 static void Dispatcher(void);
-static void Exit_LWP(void);
 static void Abort_LWP(char *msg);
 static VOID WINAPI Enter_LWP(PVOID fiberData);
 static void Initialize_PCB(PROCESS pcb, int priority, int stacksize,
@@ -519,7 +519,7 @@ static void Abort_LWP(char *msg)
     printf("***LWP: Abort --- dumping PCBs ...\n");
     Dump_Processes();
 #endif
-    Exit_LWP();
+    opr_abort();
 }
 
 #ifdef DEBUG
@@ -606,17 +606,6 @@ static void Dispatcher(void)
     SwitchToFiber(lwp_cpptr->fiber);
 }
 
-void lwp_abort(void)
-{
-    afs_NTAbort();
-}
-
-static void Exit_LWP(void)
-{
-
-    lwp_abort();
-}
-
 static void Delete_PCB(PROCESS pid)
 {
     Debug(4, ("Entered Delete_PCB"))

diff --git a/src/opr/Makefile.in b/src/opr/Makefile.in
index d339cfc031cb0347cd1e9935a4d99bbf480442f3..566cdbe829caa931cc577bf0df7419455ca4f4d6 100644 (file)
--- a/src/opr/Makefile.in
+++ b/src/opr/Makefile.in
@@ -2,9 +2,10 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-objects = casestrcpy.o
+objects = assert.o casestrcpy.o
 
-all: $(TOP_INCDIR)/afs/opr.h $(TOP_LIBDIR)/libopr.a
+all: $(TOP_INCDIR)/afs/opr.h \
+     $(TOP_LIBDIR)/libopr.a
 
 libopr.a: $(objects)
        -$(RM) -f $@

diff --git a/src/opr/NTMakefile b/src/opr/NTMakefile
index 6784827e40a66b9bd1a3863e14de4b3c4d3fe1d8..a10ee520d30a176597934914dd2890ec82970b25 100644 (file)
--- a/src/opr/NTMakefile
+++ b/src/opr/NTMakefile
@@ -16,6 +16,7 @@ INCFILES = \
 LIBFILE = $(DESTDIR)\lib\opr.lib
 
 LIBOBJS = \
+       $(OUT)\assert.obj \
        $(OUT)\casestrcpy.obj \
        $(OUT)\AFS_component_version_number.obj
 

diff --git a/src/opr/assert.c b/src/opr/assert.c
new file mode 100644 (file)
index 0000000..268ed93
--- /dev/null
+++ b/src/opr/assert.c
@@ -0,0 +1,15 @@
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
+#include "opr.h"
+
+#ifdef AFS_NT40_ENV
+void
+opr_NTAbort(void)
+{
+    DebugBreak();
+}
+#endif
+
+

diff --git a/src/opr/opr.h b/src/opr/opr.h
index dacc7035545ad4a7514264a7013da83264585e69..20a4e82f41ed112d794120579f5dc0f17a1b8180 100644 (file)
--- a/src/opr/opr.h
+++ b/src/opr/opr.h
@@ -1,7 +1,14 @@
 #ifndef OPENAFS_OPR_OPR_H
 #define OPENAFS_OPR_OPR_H 1
 
-/* casestrcpy.c */
+/* assert.c */
+#ifdef AFS_NT40_ENV
+# define opr_abort() opr_NTAbort()
+extern void opr_NTAbort(void);
+#else
+# define opr_abort() abort()
+#endif
+
 
 #define lcstring opr_lcstring
 #define ucstring opr_ucstring

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index 4e574287171125e7393e050ee71e94356a372cd9..0ba9b7458d874ae0b2c6768ed7b50704220dd5df 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -233,7 +233,7 @@ osi_Panic(char *msg, ...)
     va_end(ap);
     fflush(stderr);
     fflush(stdout);
-    afs_abort();
+    opr_abort();
 }
 
 /*

diff --git a/src/rx/test/NTMakefile b/src/rx/test/NTMakefile
index e3abf173e35d0179693fd7f2607b818b5daf7bfc..3fa8ed5dabfb286e4d8f91e7b4f83307e03f2476 100644 (file)
--- a/src/rx/test/NTMakefile
+++ b/src/rx/test/NTMakefile
@@ -19,7 +19,8 @@ LIBS = \
        $(DESTDIR)\lib\afs\mtafsutil.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afspthread.lib \
-        $(DESTDIR)\lib\afsroken.lib
+        $(DESTDIR)\lib\afsroken.lib \
+       $(DESTDIR)\lib\opr.lib
 
 
 RXTESTOBJS = $(OUT)\testclient.obj $(OUT)\testserver.obj

diff --git a/src/rx/test/testclient.c b/src/rx/test/testclient.c
index 4a2978bbf3745feb77298aa8c4bb80ed3579de67..e06933ed1a0061f57faaa4b1482e54842b8d4461 100644 (file)
--- a/src/rx/test/testclient.c
+++ b/src/rx/test/testclient.c
@@ -27,6 +27,8 @@
 #endif
 #include <sys/stat.h>
 #include <signal.h>
+
+#include <afs/opr.h>
 #include <rx/rx_clock.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
@@ -416,7 +418,7 @@ Abort(const char *msg, ...)
        rx_PrintStats(debugFile);
        fflush(debugFile);
     }
-    afs_abort();
+    opr_abort();
     exit(1);
 }
 

diff --git a/src/rx/test/testserver.c b/src/rx/test/testserver.c
index 12289196c1c26a615c55ff5bb6b9613270f16891..5780db30892004070c43f45fb9de1601abc1f26f 100644 (file)
--- a/src/rx/test/testserver.c
+++ b/src/rx/test/testserver.c
@@ -28,6 +28,8 @@
 #endif
 #include <signal.h>
 #include <sys/stat.h>
+
+#include <afs/opr.h>
 #include <rx/rx_clock.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
@@ -319,7 +321,7 @@ Abort(char *msg, ...)
        rx_PrintStats(debugFile);
        fflush(debugFile);
     }
-    afs_abort();
+    opr_abort();
     exit(1);
 }
 

diff --git a/src/rxdebug/NTMakefile b/src/rxdebug/NTMakefile
index 96bfeec967ce0ba1beb517a92f55d6e32b44a34f..21c44163d7b35cbb6218ff9e85f5894b0de83e7d 100644 (file)
--- a/src/rxdebug/NTMakefile
+++ b/src/rxdebug/NTMakefile
@@ -25,7 +25,8 @@ RXDLIBS = $(LIBDIR)\afs\afscmd.lib \
          $(LIBDIR)\afslwp.lib \
          $(LIBDIR)\afs\afsutil.lib \
           $(LIBDIR)\afs\afsreg.lib \
-         $(LIBDIR)\afsroken.lib
+         $(LIBDIR)\afsroken.lib \
+         $(LIBDIR)\opr.lib
 
 $(OUT)\rxdebug.res: rxdebug.rc $(VERSFILE).h
        $(RC) /Fo$*.RES $(*F).rc 

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 31bed6601b8903df764c71ad3f7b88746476c697..eef5c1cd2c7c439158efafc5040e4eee47c2b8c1 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -57,14 +57,6 @@ extern int OpenLog(const char *filename);
 extern int ReOpenLog(const char *fileName);
 extern void SetupLogSignals(void);
 
-/* abort the current process. */
-#ifdef AFS_NT40_ENV
-#define afs_abort() afs_NTAbort()
-#else
-#define afs_abort() abort()
-#endif
-
-
 #ifdef AFS_NT40_ENV
 #ifndef _MFC_VER
 #include <winsock2.h>
@@ -77,8 +69,6 @@ extern void SetupLogSignals(void);
 /* Unbuffer output when Un*x would do line buffering. */
 #define setlinebuf(S) setvbuf(S, NULL, _IONBF, 0)
 
-/* Abort on error, possibly trapping to debugger or dumping a trace. */
-     void afs_NTAbort(void);
 #endif /* AFS_NT40_ENV */
 
 #ifndef HAVE_POSIX_REGEX

diff --git a/src/util/assert.c b/src/util/assert.c
index 197e1fdbf0d8cf9cbdf5e0aa34779e0987acd98e..0b51f11f88e3ed3e66e9852f4957f2a78ba2ad38 100644 (file)
--- a/src/util/assert.c
+++ b/src/util/assert.c
@@ -12,17 +12,10 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #include "afsutil.h"
 
-#ifdef AFS_NT40_ENV
-void
-afs_NTAbort(void)
-{
-    DebugBreak();
-}
-#endif
-
 #define TIMESTAMP_BUFFER_SIZE 26  /* including the null */
 
 void
@@ -38,5 +31,5 @@ AssertionFailed(char *file, int line)
     fprintf(stderr, "%s Assertion failed! file %s, line %d.\n", tdate, file,
            line);
     fflush(stderr);
-    afs_abort();
+    opr_abort();
 }

diff --git a/src/xstat/NTMakefile b/src/xstat/NTMakefile
index 3061873320c2afb52e0ab5438ae9a78c35532960..99eda7068d985c5ef39d3b70ffbf268e42be0145 100644 (file)
--- a/src/xstat/NTMakefile
+++ b/src/xstat/NTMakefile
@@ -26,7 +26,8 @@ LIBS= \
        $(LIBDIR)\afs\afspioctl.lib \
        $(LIBDIR)\afs\afsutil.lib \
        $(LIBDIR)\afs\afsreg.lib \
-       $(LIBDIR)\afsroken.lib
+       $(LIBDIR)\afsroken.lib \
+       $(LIBDIR)\opr.lib
 
 
 install: \