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 e7c9830..31f33be 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 b0148ea..2ed325a 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 a94209e..3b58c59 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 147a91a..c37baeb 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 d339cfc..566cdbe 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 6784827..a10ee52 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 dacc703..20a4e82 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 4e57428..0ba9b74 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 e3abf17..3fa8ed5 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 4a2978b..e06933e 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 1228919..5780db3 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 96bfeec..21c4416 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 31bed66..eef5c1c 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 197e1fd..0b51f11 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 3061873..99eda70 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: \