Changeset 2901


Ignore:
Timestamp:
Dec 24, 2006, 2:48:39 PM (18 years ago)
Author:
bird
Message:

hacking on the init code.

Location:
trunk/libc
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/libc/Config.kmk

    r2819 r2901  
    216216$(LIBC-STD.H):
    217217
     218ifneq ($(SUB_DEPTH),.)
     219std-update:
     220        $(MAKE) -C $(SUB_DEPTH) std-update
     221endif
     222

  • TabularUnified trunk/libc/Makefile.kmk

    r2807 r2901  
    2626
    2727DEPTH = ..
     28SUB_DEPTH = .
    2829include $(PATH_KBUILD)/subheader.kmk
    2930

  • TabularUnified trunk/libc/include/InnoTekLIBC/atexit.h

    r2787 r2901  
    1 /* $Id$ */
    2 /** @file
    3  *
    4  * LIBC atexit() and on_exit() support.
    5  *
    6  * Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
    7  *
    8  *
    9  * This file is part of InnoTek LIBC.
    10  *
    11  * InnoTek LIBC is free software; you can redistribute it and/or modify
    12  * it under the terms of the GNU Lesser General Public License as published
    13  * by the Free Software Foundation; either version 2 of the License, or
    14  * (at your option) any later version.
    15  *
    16  * InnoTek LIBC is distributed in the hope that it will be useful,
    17  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    18  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    19  * GNU Lesser General Public License for more details.
    20  *
    21  * You should have received a copy of the GNU Lesser General Public License
    22  * along with InnoTek LIBC; if not, write to the Free Software
    23  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    24  *
    25  */
    26 
    27 #ifndef __InnoTekLIBC_atexit_h__
    28 #define __InnoTekLIBC_atexit_h__
    29 
    30 #include <sys/types.h>
    31 
    32 /** Entry type. */
    33 typedef enum __LIBC_ATEXITTYPE
    34 {
    35     __LIBC_ATEXITTYPE_FREE = 0,
    36     __LIBC_ATEXITTYPE_ATEXIT,
    37     __LIBC_ATEXITTYPE_ONEXIT,
    38     /** State transition state. */
    39     __LIBC_ATEXITTYPE_TRANS,
    40     /** The module containing the callback was unloaded. */
    41     __LIBC_ATEXITTYPE_UNLOADED
    42 } __LIBC_ATEXITTYPE;
    43 
    44 /**
    45  * At exit entry.
    46  */
    47 typedef struct __LIBC_ATEXIT
    48 {
    49     /** Entry type. */
    50     __LIBC_ATEXITTYPE volatile enmType;
    51     /** The (native) module handle this callback is connected to.
    52      * This will be 0 if no such association. */
    53     uintptr_t                  hmod;
    54     union
    55     {
    56         /** Data for a atexit() registration. */
    57         struct
    58         {
    59             /** Pointer to the callback. */
    60             void (*pfnCallback)();
    61         } AtExit;
    62 
    63         /** Data for a on_exit() registration. */
    64         struct
    65         {
    66             /** Pointer to the callback .*/
    67             void (*pfnCallback)(int iExit, void *pvUser);
    68             /** User argument. */
    69             void *pvUser;
    70         } OnExit;
    71     } u;
    72 } __LIBC_ATEXIT, *__LIBC_PATEXIT;
    73 
    74 /**
    75  * Chunk of at exit registrations.
    76  */
    77 typedef struct __LIBC_ATEXITCHUNK
    78 {
    79     /** Pointer to the next chunk. */
    80     struct __LIBC_ATEXITCHUNK * volatile pNext;
    81     /** Number of entries which may contain a valid callback.
    82      * (May include freed entries.) */
    83     uint32_t volatile   c;
    84     /** Array of at exit entries. */
    85     __LIBC_ATEXIT       a[64];
    86 } __LIBC_ATEXITCHUNK, *__LIBC_PATEXITCHUNK;
    87 
    88 
    89 __BEGIN_DECLS
    90 
    91 /** Pointer to the head of the exit list chain - LIFO. */
    92 extern __LIBC_PATEXITCHUNK __libc_gAtExitHead;
    93 
    94 /**
    95  * Allocate a new atexit entry.
    96  *
    97  * @returns Pointer to new entry.
    98  * @returns NULL on failure.
    99  *
    100  * @param   pvCallback      The callback address.
    101  *                          This used to initialize the __LIBC_AT_EXIT::hmod field.
    102  */
    103 __LIBC_PATEXIT __libc_atexit_new(void *pvCallback);
    104 
    105 /**
    106  * Invalidate all atexit and on_exit callback for a
    107  * module which is being unloaded.
    108  *
    109  * @param   hmod        The module handle.
    110  */
    111 void __libc_atexit_unload(uintptr_t hmod);
    112 
    113 __END_DECLS
    114 
    115 #endif
     1#include <klibc/atexit.h>

  • TabularUnified trunk/libc/include/klibc/atexit.h

    r2899 r2901  
    22/** @file
    33 *
    4  * LIBC atexit() and on_exit() support.
     4 * kLIBC - atexit() and on_exit() internals.
    55 *
    6  * Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
     6 * Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
    77 *
    88 *
    9  * This file is part of InnoTek LIBC.
     9 * This file is part of kLIBC.
    1010 *
    11  * InnoTek LIBC is free software; you can redistribute it and/or modify
     11 * kLIBC is free software; you can redistribute it and/or modify
    1212 * it under the terms of the GNU Lesser General Public License as published
    1313 * by the Free Software Foundation; either version 2 of the License, or
    1414 * (at your option) any later version.
    1515 *
    16  * InnoTek LIBC is distributed in the hope that it will be useful,
     16 * kLIBC is distributed in the hope that it will be useful,
    1717 * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1818 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    … …  
    2020 *
    2121 * You should have received a copy of the GNU Lesser General Public License
    22  * along with InnoTek LIBC; if not, write to the Free Software
     22 * along with kLIBC; if not, write to the Free Software
    2323 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2424 *
    2525 */
    2626
    27 #ifndef __InnoTekLIBC_atexit_h__
    28 #define __InnoTekLIBC_atexit_h__
     27#ifndef __klibc_atexit_h__
     28#define __klibc_atexit_h__
    2929
    3030#include <sys/types.h>

  • TabularUnified trunk/libc/include/klibc/backend.h

    r2745 r2901  
    4949struct statfs;
    5050struct stat;
     51
     52
     53/** @defgroup __libc_Back_thread   LIBC Backend - Threads
     54 * @{ */
     55
     56/**
     57 * Initializes the backend.
     58 * Called when a frontend starts up.
     59 *
     60 * @returns 0 on success, non-zero on failure.
     61 * @param   hmod        The handle of the module that's causing the frontend to start up.
     62 * @param   pvOS        OS specific argument.
     63 * @param   fFlags      Termination flags.
     64 */
     65int __libc_Back_init(uintptr_t hmod, void *pvOS, unsigned fFlags);
     66
     67/**
     68 * Terminates the backend.
     69 * Called when a frontend shuts down.
     70 *
     71 * @returns 0 on success, non-zero on failure.
     72 * @param   hmod        The handle of the module that's causing the frontend to shut down.
     73 * @param   pvOS        OS specific argument.
     74 * @param   fFlags      Termination flags.
     75 */
     76int __libc_Back_term(uintptr_t hmod, void *pvOS, unsigned fFlags);
     77
     78/**
     79 * Initializes the argument vector.
     80 *
     81 * @returns 0 on success, non-zero on failure.
     82 * @param   pcArgs      Where to store the argument count.
     83 * @param   ppapszArgs  Where to store the vector pointer.
     84 * @param   fFlags      Init flags.
     85 */
     86int __libc_Back_initArgv(int *pcArgs, char ***ppapszArgs, unsigned fFlags);
     87
     88/** @} */
    5189
    5290

  • TabularUnified trunk/libc/include/klibc/initterm.h

    r2819 r2901  
    5151void __libc_TermDll(uintptr_t hmod, void *pvOS, unsigned fFlags);
    5252
     53extern char ** _org_environ;
     54
    5355__END_DECLS
    5456

  • TabularUnified trunk/libc/src/fbsdlibc/Makefile.kmk

    r2741 r2901  
    4444libc_fbsdlibc_TEMPLATE = libcsub
    4545libc_fbsdlibc_SOURCES := \
    46         $(foreach sublib,$(LIBC_SUB_LIBRARIES), $(PATH_TARGET)/$(sublib)/$(sublib).a)
     46        $(foreach sublib,$(LIBC_SUB_LIBRARIES), $(PATH_$(sublib))/$(sublib).a)
    4747ifdef CFG_LIBC_LOGSTRICT_LIBS
    4848LIBRARIES += libc_fbsdlibc_l
    4949libc_fbsdlibc_l_TEMPLATE = libcsub
    5050libc_fbsdlibc_l_SOURCES := \
    51         $(foreach sublib,$(LIBC_SUB_LIBRARIES), $(PATH_TARGET)/$(sublib)_l/$(sublib)_l.a)
     51        $(foreach sublib,$(LIBC_SUB_LIBRARIES), $(PATH_$(sublib)_l)/$(sublib)_l.a)
    5252endif
    5353ifdef CFG_LIBC_PROFILED_LIBS
    … …  
    5555libc_fbsdlibc_p_TEMPLATE = libcsub
    5656libc_fbsdlibc_p_SOURCES := \
    57         $(foreach sublib,$(LIBC_SUB_LIBRARIES), $(PATH_TARGET)/$(sublib)_p/$(sublib)_p.a)
     57        $(foreach sublib,$(LIBC_SUB_LIBRARIES), $(PATH_$(sublib)_p)/$(sublib)_p.a)
    5858endif
    5959

  • TabularUnified trunk/libc/src/libc/startup/Makefile.kmk

    r2819 r2901  
    3838    $(PATH_LIBC_SRC)/libc/startup/exit.c \
    3939    $(PATH_LIBC_SRC)/libc/startup/initterm.c \
    40     $(PATH_LIBC_SRC)/libc/startup/_exit.c \
     40    $(PATH_LIBC_SRC)/libc/startup/_exit.c
    4141
    4242libc_libc_startup_SOURCES.os2 = \
    4343    $(PATH_LIBC_SRC)/libc/startup/os2/dllinit-os2.c \
     44    $(PATH_LIBC_SRC)/libc/startup/os2/x86/mcountstub.s
    4445
    45 libc_libc_startup_SOURCES.x86 = \
    46     $(PATH_LIBC_SRC)/libc/startup/386/mcountstub.s
     46#libc_libc_startup_SOURCES.x86 = \
     47#    $(PATH_LIBC_SRC)/libc/startup/386/mcountstub.s
    4748
    4849# configure the variants. */

  • TabularUnified trunk/libc/src/libc/startup/initterm.c

    r2819 r2901  
    4343#include <klibc/logstrict.h>
    4444#include <klibc/backend.h>
     45#include <klibc/atexit.h>
     46#include <sys/builtin.h>
    4547
    4648
    … …  
    5658*******************************************************************************/
    5759static int __libc_init(uintptr_t hmod, void *pvOS, unsigned fFlags);
     60static void __libc_term(uintptr_t hmod, void *pvOS, unsigned fFlags);
    5861
    5962
    … …  
    7073int __libc_InitDll(uintptr_t hmod, void *pvOS, unsigned fFlags)
    7174{
    72     LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x\n", hmod, pvOs, fFlags);
     75    LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x\n", hmod, pvOS, fFlags);
    7376    int rc = __libc_init(hmod, pvOS, fFlags);
    7477    LIBCLOG_RETURN_INT(rc);
    … …  
    8790void __libc_TermDll(uintptr_t hmod, void *pvOS, unsigned fFlags)
    8891{
    89     LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x\n", hmod, pvOs, fFlags);
     92    LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x\n", hmod, pvOS, fFlags);
    9093
    9194    /*
    … …  
    115118void __libc_InitExe(uintptr_t hmod, void *pvOS, unsigned fFlags, __LIBC_PINITMAINARGS pArgs)
    116119{
    117     LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x pArgs=%p\n", hmod, pvOs, fFlags, (void *)pArgs);
     120    LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x pArgs=%p\n", hmod, pvOS, fFlags, (void *)pArgs);
    118121
    119122    /*
    … …  
    127130     * Create the argument vector.
    128131     */
    129     rc = __libc_Back_initArgv(&pArgs->argc, pArgs->argv);
     132    rc = __libc_Back_initArgv(&pArgs->argc, &pArgs->argv, fFlags);
    130133    if (rc)
    131134        __libc_Back_panic(0, NULL, "__libc_InitExe: init failed with rc=%d\n", rc);
    132135    pArgs->envp = _org_environ;
    133136
    134     LIBCLOG_RETURN_INT(0);
     137    LIBCLOG_RETURN_VOID();
    135138}
    136139
    … …  
    147150static int __libc_init(uintptr_t hmod, void *pvOS, unsigned fFlags)
    148151{
    149     LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x pArgs=%p\n", hmod, pvOs, fFlags, (void *)pArgs);
     152    LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x\n", hmod, pvOS, fFlags);
    150153
    151154    /*
    … …  
    188191 * @param   fFlags  Initialization flags, a combination of the __LIBC_INIT_FLAGS_* \#defines.
    189192 */
    190 static int __libc_term(uintptr_t hmod, void *pvOS, unsigned fFlags)
    191 {
     193static void __libc_term(uintptr_t hmod, void *pvOS, unsigned fFlags)
     194{
     195    LIBCLOG_ENTER("hmod=%tx pvOS=%p fFlags=%#x\n", hmod, pvOS, fFlags);
     196
    192197    /*
    193198     * Only initialize it once.
    … …  
    196201     * the loser begin able to call into LIBC while it's begin initialized.
    197202     */
    198     const int32_t cRefs = __atomic_increment_s32(&g_cCrtUsers);
     203    const int32_t cRefs = __atomic_decrement_s32(&g_cCrtUsers);
    199204    if (cRefs != 1)
    200         LIBCLOG_RETURN_MSG(0, "ret 0 (g_cCrtUsers=%d)\n", cRefs);
    201 
     205        LIBCLOG_RETURN_MSG_VOID("ret void (g_cCrtUsers=%d)\n", cRefs);
    202206
    203207    /*
Note: See TracChangeset for help on using the changeset viewer.