Changeset 1905

Timestamp:

Apr 24, 2005, 2:11:40 PM (20 years ago)

Author:

bird

Message:

Rewrote atexit() fixing recursive exit() calling. Added on_exit().

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/atexit.h (added)
• include/emx/startup.h (modified) (1 diff, 1 prop)
• include/stdlib.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (4 diffs, 1 prop)
• src/lib/libc06b4.def (modified) (1 diff, 1 prop)
• src/lib/misc/atexit.c (modified) (1 diff, 1 prop)
• src/lib/misc/on_exit.c (added)
• src/lib/startup/exit.c (modified) (1 diff, 1 prop)

trunk/src/emx/include/emx/startup.h

@@ -50 +50 @@
 #define _CRT_EXIT1(fun) __asm__ (".stabs \"___crtexit1__\", 23, 0, 0, _" #fun);
 
-extern void (*_atexit_v[64])(void);
-extern int _atexit_n;
-
 extern char ** _org_environ;
 

trunk/src/emx/include/stdlib.h

@@ -299 +299 @@
 void    *valloc(size_t);
 #endif
+int      on_exit(void (*)(int, void *), void *);
 /* bird: LIBC stuff - end  */
 

trunk/src/emx/src/lib/libc.def

@@ -31 +31 @@
     "___stdinp" @9
     "___stdoutp" @10
-    "__atexit_n" @11
-    "__atexit_v" @12
+    "___hexdig_D2A" @11
+    "__nl_current_default_domain" @12
     "__emx_optarg" @13
     "__emx_opterr" @14
@@ -74 +74 @@
     "___gettext_germanic_plural" @52
     "__nl_msg_cat_cntr" @53
+    "__nl_domain_bindings" @54
 
 
@@ -1429 +1430 @@
     "___g_xfmt" @1438
     "___hdtoa" @1439
-    "___hexdig_D2A" @1440
+    "__std_on_exit" @1440               ; april coding
     "___hexdig_init_D2A" @1441
     "___hexnan_D2A" @1442
@@ -1489 +1490 @@
     "__std_gethrtime" @1497
     ; more intl (configure tests checks for internal variables, arg!)
-    "__nl_current_default_domain" @1498
-    "__nl_default_default_domain" @1499
-    "__nl_default_dirname" @1500
-    "__nl_domain_bindings" @1501
-    "__nl_expand_alias" @1502
-    "__nl_explode_name" @1503
-    "__nl_normalize_codeset" @1504
+    "__nl_default_default_domain" @1498
+    "__nl_default_dirname" @1499
+    "__nl_expand_alias" @1500
+    "__nl_explode_name" @1501
+    "__nl_normalize_codeset" @1502

trunk/src/emx/src/lib/libc06b4.def

@@ -32 +32 @@
     "___stdinp" @9
     "___stdoutp" @10
-    "__atexit_n" @11
-    "__atexit_v" @12
+    "__atexit_n" = __osmajor @11        ; removed in libc06b5, never used outside exit() and atexit().
+    "__atexit_v" = __osmajor @12        ; removed in libc06b5, never used outside exit() and atexit().
     "__emx_optarg" @13
     "__emx_opterr" @14

trunk/src/emx/src/lib/misc/atexit.c

@@ -1 @@
-/* atexit.c (emx+gcc) -- Copyright (c) 1990-1996 by Eberhard Mattes */
+/* $Id: $ */
+/** @file
+ *
+ * LIBC atexit().
+ *
+ * Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
+ *
+ *
+ * This file is part of InnoTek LIBC.
+ *
+ * InnoTek LIBC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * InnoTek LIBC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with InnoTek LIBC; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
 
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include "libc-alias.h"
 #include <stdlib.h>
-#include <emx/startup.h>
+#include <InnoTekLIBC/atexit.h>
+#include <386/builtin.h>
+#include <emx/umalloc.h>
 
-int _STD(atexit) (void (*func)(void))
+
+int _STD(atexit)(void (*pfnCallback)(void))
 {
-  if (_atexit_n >= sizeof (_atexit_v) / sizeof (_atexit_v[0]))
+    __LIBC_PATEXIT pCur = __libc_atexit_new();
+    if (pCur)
+    {
+        pCur->u.AtExit.pfnCallback = pfnCallback;
+        pCur->enmType = __LIBC_ATEXITTYPE_ATEXIT;
+        return 0;
+    }
     return -1;
-  _atexit_v[_atexit_n++] = func;
-  return 0;
 }
+
+
+/**
+ * Allocate a new atexit entry.
+ *
+ * @returns Pointer to new entry.
+ * @returns NULL on failure.
+ */
+__LIBC_PATEXIT __libc_atexit_new(void)
+{
+    /*
+     * Search existing chunks.
+     * (This is made simple by us not freeing anything.)
+     */
+    __LIBC_PATEXITCHUNK pChunk;
+    for (pChunk = __libc_gAtExitHead; pChunk; pChunk = pChunk->pNext)
+    {
+        uint32_t i;
+        while ((i = pChunk->c) < sizeof(pChunk->a) / sizeof(pChunk->a[0]))
+        {
+            if (__atomic_cmpxchg32(&pChunk->c, i + 1, i))
+            {
+                pChunk->a[i].enmType = __LIBC_ATEXITTYPE_TRANS;
+                return &pChunk->a[i];
+            }
+        }
+    }
+
+    /*
+     * Add a new chunk.
+     */
+    pChunk = _hcalloc(1, sizeof(*pChunk));
+    if (!pChunk)
+        return NULL;
+    pChunk->c = 1;
+    pChunk->a[0].enmType = __LIBC_ATEXITTYPE_TRANS;
+    do
+    {
+        pChunk->pNext = __libc_gAtExitHead;
+    } while (__atomic_cmpxchg32((uint32_t volatile *)(void *)&__libc_gAtExitHead, (uint32_t)pChunk, (uint32_t)pChunk->pNext)); /** @todo atomic cmpxchg for ptrs! */
+
+    return &pChunk->a[0];
+}
+

trunk/src/emx/src/lib/startup/exit.c

@@ -1 @@
-/* exit.c (emx+gcc) -- Copyright (c) 1990-1998 by Eberhard Mattes */
+/* $Id: $ */
+/** @file
+ *
+ * LIBC exit().
+ *
+ * Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
+ *
+ *
+ * This file is part of InnoTek LIBC.
+ *
+ * InnoTek LIBC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * InnoTek LIBC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with InnoTek LIBC; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
 
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include "libc-alias.h"
 #include <stdlib.h>
 #include <emx/startup.h>
+#include <InnotekLIBC/atexit.h>
 #define __LIBC_LOG_GROUP  __LIBC_LOG_GRP_INITTERM
 #include <InnotekLIBC/logstrict.h>
 
-void (*_atexit_v[64])(void);
-int _atexit_n = 0;
 
-void _STD(exit) (int ret)
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** Static exit list entry. */
+static __LIBC_ATEXITCHUNK gAtExitChunk;
+/** Pointer to the head of the exit list chain - LIFO. */
+__LIBC_PATEXITCHUNK __libc_gAtExitHead = &gAtExitChunk;
+
+
+void _STD(exit)(int ret)
 {
-  LIBCLOG_ENTER("ret=%d\n", ret);
-  int i;
+    LIBCLOG_ENTER("ret=%d\n", ret);
 
-  for (i = _atexit_n-1; i >= 0; --i)
+    /*
+     * Call registered at exit callbacks.
+     *
+     * These are called in reverse registration order and we're
+     * removing them from the list as we move along to prevent endless recursions.
+     * (It is allowed to call exit() from a handler, but we must not call that handler again!)
+     */
+    for (__LIBC_PATEXITCHUNK pChunk = __libc_gAtExitHead; pChunk; pChunk = pChunk->pNext)
     {
-      LIBCLOG_MSG("calling _atexit[%d] %p\n", i, _atexit_v[i]);
-      _atexit_v[i]();
+        while (pChunk->c > 0)
+        {
+            __LIBC_PATEXIT pCur = &pChunk->a[--pChunk->c];
+            switch (pCur->enmType)
+            {
+                case __LIBC_ATEXITTYPE_ATEXIT:
+                    LIBCLOG_MSG("calling atexit: %p()\n", (void *)pCur->u.AtExit.pfnCallback);
+                    pCur->u.AtExit.pfnCallback();
+                    break;
+
+                case __LIBC_ATEXITTYPE_ONEXIT:
+                    LIBCLOG_MSG("calling onexit: %p(%d,%p)\n", (void *)pCur->u.OnExit.pfnCallback, ret, pCur->u.OnExit.pvUser);
+                    pCur->u.OnExit.pfnCallback(ret, pCur->u.OnExit.pvUser);
+                    break;
+
+                default:
+                    break;
+            }
+        }
     }
-  _CRT_term ();
-  LIBCLOG_MSG("calling _exit\n");
-  _exit (ret);
+
+    /*
+     * Terminate the CRT and do the real exit.
+     */
+    _CRT_term ();
+    LIBCLOG_MSG("calling _exit(%d)\n", ret);
+    _exit (ret);
 }