Changeset 1661

Timestamp:

Nov 22, 2004, 2:46:26 AM (21 years ago)

Author:

bird

Message:

Extended fmutex interface.

Location:

trunk/src/emx

Files:

• include/emx/io.h (modified) (1 diff, 1 prop)
• include/os2emx.h (modified) (1 diff, 1 prop)
• include/stdio.h (modified) (2 diffs, 1 prop)
• include/sys/fmutex.h (modified) (2 diffs, 1 prop)
• src/lib/app/stdio.c (modified) (3 diffs, 1 prop)
• src/lib/io/_fopen.c (modified) (1 diff, 1 prop)
• src/lib/io/_mfopen.c (modified) (1 diff, 1 prop)
• src/lib/io/_newstre.c (modified) (3 diffs, 1 prop)
• src/lib/io/fdopen.c (modified) (1 diff, 1 prop)
• src/lib/io/snprintf.c (modified) (1 diff, 1 prop)
• src/lib/io/sprintf.c (modified) (1 diff, 1 prop)
• src/lib/io/sscanf.c (modified) (1 diff, 1 prop)
• src/lib/io/vsnprint.c (modified) (1 diff, 1 prop)
• src/lib/io/vsprintf.c (modified) (1 diff, 1 prop)
• src/lib/io/vsscanf.c (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (4 diffs, 1 prop)
• src/lib/libc.smak (modified) (1 diff, 1 prop)
• src/lib/malloc/ucreate2.c (modified) (1 diff, 1 prop)
• src/lib/process/fmutex.c (modified) (10 diffs, 1 prop)
• src/lib/process/fmutex2.c (modified) (4 diffs, 1 prop)
• src/lib/sys/DosEx.c (modified) (1 diff, 1 prop)
• src/lib/sys/__init.c (modified) (5 diffs, 1 prop)
• src/lib/sys/__initdll.c (modified) (8 diffs, 1 prop)
• src/lib/sys/b_processWait.c (modified) (3 diffs, 1 prop)
• src/lib/sys/b_threadInit.c (modified) (3 diffs, 1 prop)
• src/lib/sys/execname.c (modified) (3 diffs, 1 prop)
• src/lib/sys/filehandles.c (modified) (1 diff, 1 prop)
• src/lib/sys/fs.c (modified) (1 diff, 1 prop)
• src/lib/sys/libcfork.c (modified) (6 diffs, 1 prop)
• src/lib/sys/signals.c (modified) (4 diffs, 1 prop)
• src/lib/sys/timebomb.c (modified) (2 diffs, 1 prop)

trunk/src/emx/include/emx/io.h

@@ -207 +207 @@
 
 #define STREAM_LOCK(f) \
-  (_fmutex_request(&(f)->__u.__fsem, _FMR_IGNINT) != 0 \
-   ? abort () : (void)0)
+  ((f)->__uVersion != _FILE_STDIO_VERSION ? __stream_abort (f, "version error") \
+   : _fmutex_request(&(f)->__u.__fsem, _FMR_IGNINT) != 0 \
+   ? __stream_abort (f, "fmutex request") : 0)
 
 #define STREAM_UNLOCK(f) \
-  (_fmutex_release(&(f)->__u.__fsem) != 0 ? abort() : (void)0)
+  (_fmutex_release(&(f)->__u.__fsem) != 0 ? __stream_abort (f, "fmutex release") : (void)0)
 
 #define STREAM_LOCK_NOWAIT(f) \
-  (_fmutex_request(&(f)->__u.__fsem, _FMR_NOWAIT) == 0)
-
-#define STREAM_UNLOCKED(f) _fmutex_available(&(f)->__u.__fsem)
+  (((f)->__uVersion == _FILE_STDIO_VERSION || __stream_abort (f, "version error")) && _fmutex_request(&(f)->__u.__fsem, _FMR_NOWAIT) == 0)
+
+#define STREAM_UNLOCKED(f) ((f)->__uVersion == _FILE_STDIO_VERSION && _fmutex_available(&(f)->__u.__fsem))
+
+int __stream_abort(struct _FILE *f, const char *pszMsg);
 
 #endif /* defined (_SYS_FMUTEX_H) */

trunk/src/emx/include/os2emx.h

@@ -13308 +13308 @@
 #define FS_SAVE()       __asm__ __volatile__ ("movl %%fs, %%eax; movl %%eax,%0;" : : "m" (__fs__) : "%eax" )
 #define FS_SAVE_LOAD()  __asm__ __volatile__ ("movl %%fs, %%eax; movl %%eax,%0; movl $DosTIB, %%eax; movl %%eax, %%fs" : : "m" (__fs__) : "%eax" )
+#define FS_VAR_SAVE_LOAD() FS_VAR(); FS_SAVE_LOAD()
 #define FS_RESTORE()    __asm__ __volatile__ ("movl %0, %%eax; movl %%eax,%%fs;" : : "m" (__fs__) : "%eax" )
 #else

trunk/src/emx/include/stdio.h

@@ -178 +178 @@
 #define _FILE_T
 #define _FILE_MEMBERS_HAVE_UNDERSCORE
-struct _file2;
+#define _FILE_STDIO_VERSION     (0x06000000 | sizeof(struct _FILE))
 typedef struct _FILE
 {
+    unsigned __uVersion;
     char * _ptr;
     char * _buffer;
@@ -201 +202 @@
         _fmutex   __fsem;
 #endif
-        char      __rsem_ersatz[8];
+        char      __rsem_ersatz[12];
     } __u;
-    /** Pointer to the stream vector which thie FILE belongs to.
+    /** Pointer to the stream vector which this FILE belongs to.
      * This member is the first which should not be zeroed by _newstream()! */
     void    *__pSV;

trunk/src/emx/include/sys/fmutex.h

@@ -6 +6 @@
 
 #ifndef _SYS_FMUTEX_H
-#define _SYS_FMUTEX_H
+    #define _SYS_FMUTEX_H
 
-#include <stdlib.h> /* need abort */
+    #include <sys/cdefs.h>
+    #include <stdlib.h> /* need abort */
+    #include <InnoTekLIBC/FastInfoBlocks.h>
 
-#if defined (__cplusplus)
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 /* Constants for _fmutex.fs.  See _fmutex_available() for ordering. */
 
-#define _FMS_UNINIT       0
-#define _FMS_AVAILABLE    1
-#define _FMS_OWNED_SIMPLE 2
-#define _FMS_OWNED_HARD   3
+    #define _FMS_UNINIT       0
+    #define _FMS_AVAILABLE    1
+    #define _FMS_OWNED_SIMPLE 2
+    #define _FMS_OWNED_HARD   3
 
 /* Constants for _fmutex_create() */
 
-#define _FMC_SHARED     0x01
+    #define _FMC_SHARED         0x01
+    #define _FMC_MUST_COMPLETE  0x02
+    #define _FMC_DUMMY          0x04    /* internal */
 
 /* Constants for _fmutex_request() */
 
-#define _FMR_IGNINT     0x01
-#define _FMR_NOWAIT     0x02
+    #define _FMR_IGNINT     0x01
+    #define _FMR_NOWAIT     0x02
 
 /* We cannot use __attribute__ ((__packed__)) because G++ does not
    support this. */
 
-#pragma pack(1)
+    #pragma pack(1)
 typedef struct
 {
     /** Handle to event semaphore. */
-    unsigned long hev;
+    unsigned long           hev;
     /** Semaphore status. */
-    __volatile__ signed char fs;
+    volatile signed char    fs;
     /** Semaphore create flags. (_FMC_SHARED) */
-    unsigned char flags;
-    /** padding the struct to 8 bytes. */
-    unsigned char padding[2];
+    unsigned char           flags;
+    /** padding the struct to 16 bytes. */
+    unsigned char           padding[2];
+    /** The (pid << 16) | tid of the owner. */
+    volatile unsigned       Owner;
+    /** Descriptive name of the mutex. */
+    const char             *pszDesc;
 } _fmutex;
-#pragma pack()
+    #pragma pack()
+
 
 
 unsigned __fmutex_request_internal (_fmutex *, unsigned, signed char);
-unsigned __fmutex_create_internal (_fmutex *, unsigned);
+unsigned __fmutex_request_internal_must_complete (_fmutex *, unsigned);
 unsigned __fmutex_release_internal (_fmutex *);
+unsigned __fmutex_release_internal_must_complete (_fmutex *);
 
 
 static __inline__ unsigned _fmutex_request (_fmutex *sem, unsigned flags)
 {
-  signed char fs;
-
-  fs = __cxchg (&sem->fs, _FMS_OWNED_SIMPLE);
-  if (fs == _FMS_AVAILABLE)
-    return 0;
-  else
-    return __fmutex_request_internal (sem, flags, fs);
+    if (!(sem->flags & _FMC_MUST_COMPLETE))
+    {
+        signed char fs = __cxchg (&sem->fs, _FMS_OWNED_SIMPLE);
+        if (fs == _FMS_AVAILABLE)
+        {
+            __atomic_xchg(&sem->Owner, fibGetTidPid());
+            return 0;
+        }
+        else
+            return __fmutex_request_internal (sem, flags, fs);
+    }
+    else
+        return __fmutex_request_internal_must_complete (sem, flags);
 }
 
@@ -67 +81 @@
 static __inline__ unsigned _fmutex_release (_fmutex *sem)
 {
-  signed char fs;
-
-  fs = __cxchg (&sem->fs, _FMS_AVAILABLE);
-  if (fs == _FMS_OWNED_HARD)
-    return __fmutex_release_internal (sem);
-  else
-    return 0;
+    if (!(sem->flags & _FMC_MUST_COMPLETE))
+    {
+        signed char fs;
+        __atomic_xchg(&sem->Owner, 0);
+        fs = __cxchg(&sem->fs, _FMS_AVAILABLE);
+        if (fs != _FMS_OWNED_HARD)
+            return 0;
+        else
+            return __fmutex_release_internal (sem);
+    }
+    else
+        return __fmutex_release_internal_must_complete (sem);
 }
-
 
 static __inline__ int _fmutex_available (_fmutex *sem)
 {
-  return sem->fs <= _FMS_AVAILABLE;
+    return sem->fs <= _FMS_AVAILABLE;
 }
 
 
 unsigned _fmutex_create (_fmutex *, unsigned);
+unsigned _fmutex_create2 (_fmutex *sem, unsigned, const char *);
 unsigned _fmutex_open (_fmutex *);
 unsigned _fmutex_close (_fmutex *);
 void _fmutex_dummy (_fmutex *);
 
-void _fmutex_checked_close (_fmutex *);
-void _fmutex_checked_create (_fmutex *, unsigned);
-void _fmutex_checked_open (_fmutex *);
+void _fmutex_checked_close(_fmutex *);
+void _fmutex_checked_create(_fmutex *, unsigned);
+void _fmutex_checked_create2(_fmutex *, unsigned, const char *);
+void _fmutex_checked_open(_fmutex *);
+void _fmutex_abort(_fmutex *, const char *);
 
 static __inline__ void _fmutex_checked_release (_fmutex * sem)
 {
-  if (_fmutex_release (sem) != 0)
-    abort ();
+    if (sem->Owner != fibGetTidPid())
+        _fmutex_abort(sem, "release not owner");
+    if (_fmutex_release (sem) != 0)
+        _fmutex_abort(sem, "release");
 }
 
 static __inline__ void _fmutex_checked_request (_fmutex * sem, unsigned flags)
 {
-  if (_fmutex_request (sem, flags) != 0)
-    abort ();
+    if (_fmutex_request (sem, flags) != 0)
+        _fmutex_abort(sem, "request");
 }
 
-#if defined (__cplusplus)
-}
-#endif
+__END_DECLS
 
 #endif /* not _SYS_FMUTEX_H */
+

trunk/src/emx/src/lib/app/stdio.c

@@ -6 +6 @@
 #include <sys/fmutex.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <emx/io.h>
 #include <emx/startup.h>
+#include <emx/syscalls.h>
 #define __LIBC_LOG_GROUP  __LIBC_LOG_GRP_STREAM
 #include <InnoTekLIBC/logstrict.h>
@@ -96 +98 @@
              */
             gPreStreamVec.cFree--;
+            gaPreFiles[i].__uVersion = _FILE_STDIO_VERSION;
             gaPreFiles[i]._flags    |= _IOOPEN | _IONOCLOSEALL;
             gaPreFiles[i]._handle    = i;
             gaPreFiles[i]._flush     = _flushstream;
-            if (_fmutex_create(&gaPreFiles[i].__u.__fsem, 0) != 0)
+            if (_fmutex_create2(&gaPreFiles[i].__u.__fsem, 0, "LIBC stream") != 0)
             {
                 LIBC_ASSERTM_FAILED("_setmore failed for i=%d\n", i);
@@ -155 +158 @@
 _CRT_INIT1(_init_streams)
 _CRT_EXIT1(_exit_streams)
+
+
+
+/**
+ * Fatal stream error.
+ *
+ * @returns 0.
+ * @param   f           Stream connected to the fatal error.
+ * @param   pszMsg      Message to print.
+ */
+int __stream_abort(FILE *f, const char *pszMsg)
+{
+    static const char szMsg[] = "\r\nLIBC fatal error - streams: ";
+    __write(2, szMsg, sizeof(szMsg) - 1);
+    __write(2, pszMsg, strlen(pszMsg));
+    if (f->__uVersion != _FILE_STDIO_VERSION)
+    {
+        static const char szMsg2[] = " (stream version mismatch (too))";
+        __write(2, szMsg2, sizeof(szMsg2) - 1);
+    }
+    __write(2, "\r\n", 2);
+    abort();
+    return 0;
+}
+

trunk/src/emx/src/lib/io/_fopen.c

@@ -81 +81 @@
   dst->_flags |= _IOOPEN | _IOBUFNONE;
   dst->_flush = _flushstream;
-  if (_fmutex_create (&dst->__u.__fsem, 0) != 0)
+  if (_fmutex_create2 (&dst->__u.__fsem, 0, "LIBC stream fopen") != 0)
     {
       STREAMV_LOCK;

trunk/src/emx/src/lib/io/_mfopen.c

@@ -90 +90 @@
   stream->_tmpidx = inc;
   stream->_ungetc_count = 0;
-  if (_fmutex_create (&stream->__u.__fsem, 0) != 0)
+  if (_fmutex_create2 (&stream->__u.__fsem, 0, "LIBC stream mfopen") != 0)
     {
       if (abuf != NULL) free (abuf);

trunk/src/emx/src/lib/io/_newstre.c

@@ -41 +41 @@
                      */
                     bzero(&pSV->aFiles[i], offsetof(FILE, __pSV));
+                    pSV->aFiles[i].__uVersion = _FILE_STDIO_VERSION;
                     return &pSV->aFiles[i];
                 }
@@ -76 +77 @@
         pFile = &pSV->aFiles[0];
         pFile->_flags = _IONEW;
+        pFile->__uVersion = _FILE_STDIO_VERSION;
 
         /*
@@ -103 +105 @@
 void _closestream(FILE *stream)
 {
-    stream->_flags = 0;
-    /* Assumption hare made about how the dummy stuff is made. */
-    if (stream->__u.__fsem.hev)
-        _fmutex_close(&stream->__u.__fsem);
+    if (stream->__uVersion == _FILE_STDIO_VERSION)
+    {
+        stream->_flags = 0;
+        /* Assumption hare made about how the dummy stuff is made. */
+        if (stream->__u.__fsem.hev)
+            _fmutex_close(&stream->__u.__fsem);
 
-    if (stream->__pSV)
-        ((struct streamvec *)stream->__pSV)->cFree++;
+        if (stream->__pSV)
+            ((struct streamvec *)stream->__pSV)->cFree++;
+    }
 }

trunk/src/emx/src/lib/io/fdopen.c

@@ -30 +30 @@
   if (!dst)
     return NULL;
-  if (_fmutex_create (&dst->__u.__fsem, 0) != 0)
+  if (_fmutex_create2 (&dst->__u.__fsem, 0, "LIBC stream fdopen") != 0)
     {
       STREAMV_LOCK;

trunk/src/emx/src/lib/io/snprintf.c

@@ -19 +19 @@
     return EOF;
   va_start (arg_ptr, format);
+  trick.__uVersion = _FILE_STDIO_VERSION;
   trick._buffer = buffer;
   trick._ptr = buffer;

trunk/src/emx/src/lib/io/sprintf.c

@@ -17 +17 @@
 
   va_start (arg_ptr, format);
+  trick.__uVersion = _FILE_STDIO_VERSION;
   trick._buffer = buffer;
   trick._ptr = buffer;

trunk/src/emx/src/lib/io/sscanf.c

@@ -18 +18 @@
 
   va_start (arg_ptr, format);
+  trick.__uVersion = _FILE_STDIO_VERSION;
   trick._buffer = (char *)buffer;               /* const -> non-const */
   trick._ptr = (char *)buffer;                  /* const -> non-const */

trunk/src/emx/src/lib/io/vsnprint.c

@@ -16 +16 @@
   if (n > INT_MAX)
     return EOF;
+  trick.__uVersion = _FILE_STDIO_VERSION;
   trick._buffer = buffer;
   trick._ptr = buffer;

trunk/src/emx/src/lib/io/vsprintf.c

@@ -14 +14 @@
   int result;
 
+  trick.__uVersion = _FILE_STDIO_VERSION;
   trick._buffer = buffer;
   trick._ptr = buffer;

trunk/src/emx/src/lib/io/vsscanf.c

@@ -16 +16 @@
   int result;
 
+  trick.__uVersion = _FILE_STDIO_VERSION;
   trick._buffer = (char *)buffer;             /* const -> non-const */
   trick._ptr = (char *)buffer;                /* const -> non-const */

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

@@ -21 +21 @@
 EXPORTS
 ; data
-    "___default_hash" @1
+    "___default_hash"  @1
     "___digits" @2
     "___libc_GLocaleCtype" @3
-    "___libc_GLocaleCtypeDefault" @4
-    "___progname" @5
-    "___stderrp" @6
-    "___stdinp" @7
-    "___stdoutp" @8
-    "__atexit_n" @9
-    "__atexit_v" @10
-    "__emx_optarg" @11
-    "__emx_opterr" @12
-    "__emx_optind" @13
-    "__emx_optmode" @14
-    "__emx_optopt" @15
-    "__emx_optswchar" @16
-    "__fmode_bin" @17
-    "__mb_cur_max" @18
-    "__org_environ" @19
-    "__osmajor" @20
-    "__osminor" @21
-    "__pipe_size" @22
-    "__rand48_add" @23
-    "__rand48_mult" @24
-    "__rand48_seed" @25
-    "__std_daylight" @26
-    "__std_environ" @27
-    "__std_timezone" @28
-    "__std_tzname" @29
-    "__streamv_fmutex" @30
-    "__streamvec_head" @31
-    "__streamvec_tail" @32
-    "__tmpidx" @33
-    "__tzi" @34
-    "__tzset_flag" @35
-    "__um_high_heap" @36
-    "__um_low_heap" @37
-    "__um_regular_heap" @38
-    "__um_tiled_heap" @39
-    "_error_message_count" @40
-    "_error_one_per_line" @41
-    "_error_print_progname" @42
-    "_optarg" @43
-    "_opterr" @44
-    "_optind" @45
-    "_optopt" @46
-    "_optreset" @47
+    "___libc_GpFIBGIS" @4
+    "___libc_GpFIBLIS" @5
+    "___libc_GpFIBPIB" @6
+    "___progname" @7
+    "___stderrp" @8
+    "___stdinp" @9
+    "___stdoutp" @10
+    "__atexit_n" @11
+    "__atexit_v" @12
+    "__emx_optarg" @13
+    "__emx_opterr" @14
+    "__emx_optind" @15
+    "__emx_optmode" @16
+    "__emx_optopt" @17
+    "__emx_optswchar" @18
+    "__fmode_bin" @19
+    "__mb_cur_max" @20
+    "__org_environ" @21
+    "__osmajor" @22
+    "__osminor" @23
+    "__pipe_size" @24
+    "__rand48_add" @25
+    "__rand48_mult" @26
+    "__rand48_seed" @27
+    "__std_daylight" @28
+    "__std_environ" @29
+    "__std_timezone" @30
+    "__std_tzname" @31
+    "__streamv_fmutex" @32
+    "__streamvec_head" @33
+    "__streamvec_tail" @34
+    "__tmpidx" @35
+    "__tzi" @36
+    "__tzset_flag" @37
+    "__um_high_heap" @38
+    "__um_low_heap" @39
+    "__um_regular_heap" @40
+    "__um_tiled_heap" @41
+    "_error_message_count" @42
+    "_error_one_per_line" @43
+    "_error_print_progname" @44
+    "_optarg" @45
+    "_opterr" @46
+    "_optind" @47
+    "_optopt" @48
+    "_optreset" @49
+    "_pwdb_versions" @50
 
 
@@ -158 +161 @@
     "DosOpenEventSemEx" @180
     "DosOpenMutexSemEx" @181
+    ; (sorted)
     "___add_ovflpage" @182
     "___addel" @183
@@ -204 +208 @@
     "___buf_init" @226
     "___call_hash" @227
-    "___libc_Back_fsDirCurrentSet" @228
-    "___chmod" @229
-    "___libc_Back_ioFileSizeSet" @230
-    "___close" @231
-    "___collate_range_cmp" @232
-    "___ctordtorInit1" @233
-    "___ctordtorTerm1" @234
-    "___dbpanic" @235
-    "___delpair" @236
-    "___dtoa" @237
-    "___dup" @238
-    "___dup2" @239
-    "___error" @240
-    "___error_at_line" @241
-    "___exit" @242
-    "___expand_table" @243
-    "___fcntl" @244
-    "___find_bigpair" @245
-    "___find_last_page" @246
-    "___findfirst" @247
-    "___findnext" @248
-    "___fmutex_release_internal" @249
-    "___fmutex_request_internal" @250
+    "___chmod" @228
+    "___close" @229
+    "___collate_range_cmp" @230
+    "___ctordtorInit1" @231
+    "___ctordtorTerm1" @232
+    "___dbpanic" @233
+    "___delpair" @234
+    "___dtoa" @235
+    "___dup" @236
+    "___dup2" @237
+    "___error" @238
+    "___error_at_line" @239
+    "___exit" @240
+    "___expand_table" @241
+    "___fcntl" @242
+    "___find_bigpair" @243
+    "___find_last_page" @244
+    "___findfirst" @245
+    "___findnext" @246
+    "___fmutex_release_internal" @247
+    "___fmutex_release_internal_must_complete" @248
+    "___fmutex_request_internal" @249
+    "___fmutex_request_internal_must_complete" @250
     "___fork" @251
     "___fpclassify" @252
@@ -232 +236 @@
     "___fpclassifyl" @254
     "___free_ovflpage" @255
-    "___libc_FHEx" @256
-    "___ftime" @257
-    "___libc_Back_fsSymlinkStat" @258
-    "___get_buf" @259
-    "___get_page" @260
-    "___libc_Back_fsDirCurrentGet" @261
-    "__std_chroot" @262
-    "___hash_open" @263
-    "___ibitmap" @264
-    "___imphandle" @265
-    "___init" @266
-    "___init_app" @267
-    "___init_dll" @268
-    "___ioctl1" @269
-    "___ioctl2" @270
-    "___isctype" @271
-    "___isfinite" @272
-    "___isfinitef" @273
-    "___isfinitel" @274
-    "___isnan" @275
-    "___isnanf" @276
-    "___isnanl" @277
-    "___isnormal" @278
-    "___isnormalf" @279
-    "___isnormall" @280
-    "___istype" @281
-    "___libc_Back_threadCleanup" @282
-    "___libc_Back_threadEnd" @283
-    "___libc_Back_threadInit" @284
-    "___libc_Back_threadStartup" @285
-    "___libc_FH" @286
-    "___libc_FHAllocate" @287
-    "___libc_FHClose" @288
-    "___libc_FHEnsureHandles" @289
-    "___libc_FHMoreHandles" @290
-    "___libc_ForkDefaultModuleCallback" @291
-    "___libc_ForkRegisterModule" @292
-    "___libc_HasHighMem" @293
-    "___libc_HeapEndVoting" @294
-    "___libc_HeapGetResult" @295
-    "___libc_HeapVote" @296
-    "___libc_HimemDefaultAlloc" @297
-    "___libc_HimemDefaultRelease" @298
-    "___libc_LogAssert" @299
-    "___libc_LogDumpHex" @300
-    "___libc_LogEnter" @301
-    "___libc_LogGroupInit" @302
-    "___libc_LogInit" @303
-    "___libc_LogLeave" @304
-    "___libc_LogMsg" @305
-    "___libc_LogRaw" @306
-    "___libc_PathRewrite" @307
-    "___libc_PathRewriteAdd" @308
-    "___libc_PathRewriteRemove" @309
-    "___libc_StrictMemoryR" @310
-    "___libc_StrictMemoryRW" @311
-    "___libc_StrictStringR" @312
-    "___libc_TLSAlloc" @313
-    "___libc_TLSDestructor" @314
-    "___libc_TLSFree" @315
-    "___libc_TLSGet" @316
-    "___libc_TLSGetDestructor" @317
-    "___libc_TLSSet" @318
-    "___libc_TcpipAllocFH43" @319
-    "___libc_TcpipAllocFH44" @320
-    "___libc_TcpipAllocFHEx43" @321
-    "___libc_TcpipAllocFHEx44" @322
-    "___libc_Tcpipbsdselect43" @323
-    "___libc_Tcpipbsdselect44" @324
-    "___libc_ThreadRegisterTermCallback" @325
-    "___libc_TranslateCodepage" @326
-    "___log2" @327
-    "___libc_Back_ioSeek" @328
-    "___mempcpy" @329
-    "___libc_Back_fsDirCreate" @330
-    "___libc_Back_ioFileOpen" @331
-    "___ovfl_delete" @332
-    "___ovfl_get" @333
-    "___ovfl_put" @334
-    "___pipe" @335
-    "___posix_spawn_file_actions_realloc" @336
-    "___put_page" @337
-    "___read" @338
-    "___read_kbd" @339
-    "___rec_close" @340
-    "___rec_delete" @341
-    "___rec_dleaf" @342
-    "___rec_fd" @343
-    "___rec_fmap" @344
-    "___rec_fpipe" @345
-    "___rec_get" @346
-    "___rec_iput" @347
-    "___rec_open" @348
-    "___rec_put" @349
-    "___rec_ret" @350
-    "___rec_search" @351
-    "___rec_seq" @352
-    "___rec_sync" @353
-    "___rec_vmap" @354
-    "___rec_vpipe" @355
-    "___reclaim_buf" @356
-    "___remove_zeros" @357
-    "___libc_Back_fsDirRemove" @358
-    "___select" @359
-    "___settime" @360
-    "___signbit" @361
-    "___signbitf" @362
-    "___signbitl" @363
-    "___small_atod" @364
-    "___small_dtoa" @365
-    "___smutex_request_internal" @366
-    "___spawni" @367
-    "___spawnve" @368
-    "___split_page" @369
-    "___libc_Back_fsFileStat" @370
-    "___strndup" @371
-    "___strnlen" @372
-    "___swchar" @373
-    "___threadid" @374
-    "___tolower" @375
-    "___toupper" @376
-    "___ttyname" @377
-    "___ulimit" @378
-    "___unwind2" @379
-    "___utimes" @380
-    "___wait" @381
-    "___waitpid" @382
-    "___write" @383
-    "__abspath" @384
-    "__assert" @385
-    "__atfork_callback" @386
-    "__beginthread" @387
-    "__bi_add_bb" @388
-    "__bi_cmp_bb" @389
-    "__bi_cmp_pow2" @390
-    "__bi_div_add_back" @391
-    "__bi_div_estimate" @392
-    "__bi_div_rem_bb" @393
-    "__bi_div_rem_bw" @394
-    "__bi_div_rem_pow2" @395
-    "__bi_div_subtract" @396
-    "__bi_fls" @397
-    "__bi_hdiv_rem_b" @398
-    "__bi_mul_bb" @399
-    "__bi_mul_bw" @400
-    "__bi_pow5" @401
-    "__bi_set_b" @402
-    "__bi_set_d" @403
-    "__bi_set_w" @404
-    "__bi_shl_b" @405
-    "__bi_shl_w" @406
-    "__bi_shr_b" @407
-    "__bi_sub_mul_bw" @408
-    "__bi_wdiv_rem_pow2" @409
-    "__chdir2" @410
-    "__clear87" @411
-    "__closestream" @412
-    "__compute_dst_table" @413
-    "__const_HALF" @414
-    "__const_M_ONE" @415
-    "__const_NAN" @416
-    "__const_ONE" @417
-    "__const_TWO" @418
-    "__const_ZERO" @419
-    "__control87" @420
-    "__core" @421
-    "__crlf" @422
-    "__day" @423
-    "__defext" @424
-    "__dorand48" @425
-    "__dt_free" @426
-    "__dt_read" @427
-    "__dt_sort" @428
-    "__dt_split" @429
-    "__ea_free" @430
-    "__ea_get" @431
-    "__ea_put" @432
-    "__ea_remove" @433
-    "__ea_set_errno" @434
-    "__ea_write" @435
-    "__ead_add" @436
-    "__ead_clear" @437
-    "__ead_copy" @438
-    "__ead_count" @439
-    "__ead_create" @440
-    "__ead_delete" @441
-    "__ead_destroy" @442
-    "__ead_enum" @443
-    "__ead_fea2list_size" @444
-    "__ead_fea2list_to_fealist" @445
-    "__ead_fealist_to_fea2list" @446
-    "__ead_find" @447
-    "__ead_get_fea2list" @448
-    "__ead_get_flags" @449
-    "__ead_get_name" @450
-    "__ead_get_value" @451
-    "__ead_make_index" @452
-    "__ead_name_len" @453
-    "__ead_read" @454
-    "__ead_replace" @455
-    "__ead_size_buffer" @456
-    "__ead_sort" @457
-    "__ead_use_fea2list" @458
-    "__ead_value_size" @459
-    "__ead_write" @460
-    "__emx_getopt" @461
-    "__emxload_connect" @462
-    "__emxload_disconnect" @463
-    "__emxload_do_connect" @464
-    "__emxload_do_disconnect" @465
-    "__emxload_do_receive" @466
-    "__emxload_do_request" @467
-    "__emxload_do_wait" @468
-    "__emxload_env" @469
-    "__emxload_list_get" @470
-    "__emxload_list_start" @471
-    "__emxload_prog" @472
-    "__emxload_request" @473
-    "__emxload_stop" @474
-    "__emxload_this" @475
-    "__emxload_unload" @476
-    "__endbuf1" @477
-    "__endthread" @478
-    "__envargs" @479
-    "__err" @480
-    "__errno" @481
-    "__errno_fun" @482
-    "__execname" @483
-    "__exit" @484
-    "__exit_streams" @485
-    "__fbuf" @486
-    "__fcloseall" @487
-    "__fflush_nolock" @488
-    "__filesys" @489
-    "__fill" @490
-    "__flush" @491
-    "__flushstream" @492
-    "__fmutex_checked_close" @493
-    "__fmutex_checked_create" @494
-    "__fmutex_checked_open" @495
-    "__fmutex_close" @496
-    "__fmutex_create" @497
-    "__fmutex_dummy" @498
-    "__fmutex_open" @499
-    "__fnexplode" @500
-    "__fnexplodefree" @501
-    "__fngetdrive" @502
-    "__fnisabs" @503
-    "__fnisrel" @504
-    "__fnlwr" @505
-    "__fnlwr2" @506
-    "__fnslashify" @507
-    "__fpreset" @508
-    "__fseek_hdr" @509
-    "__fseek_nolock" @510
-    "__fsetmode" @511
-    "__fsopen" @512
-    "__ftell_nolock" @513
-    "__fullpath" @514
-    "__fwrite_nolock" @515
-    "__fxam" @516
-    "__fxaml" @517
-    "__getcwd1" @518
-    "__getcwd2" @519
-    "__getdrive" @520
-    "__getext" @521
-    "__getext2" @522
-    "__getname" @523
-    "__getpass1" @524
-    "__getpass2" @525
-    "__getprogname" @526
-    "__gettid" @527
-    "__getvol" @528
-    "__gmt2loc" @529
-    "__hcalloc" @530
-    "__heap_walk" @531
-    "__heapchk" @532
-    "__heapmin" @533
-    "__heapset" @534
-    "__hinitheap" @535
-    "__hmalloc" @536
-    "__hrealloc" @537
-    "__imphandle" @538
-    "__init_streams" @539
-    "__input" @540
-    "__int86" @541
-    "__isterm" @542
-    "__lcalloc" @543
-    "__libc_16to32" @544
-    "__libc_32to16" @545
-    "__libc_thunk1" @546
-    "__linitheap" @547
-    "__lmalloc" @548
-    "__loc2gmt" @549
-    "__lrealloc" @550
-    "__makepath" @551
-    "__memcount" @552
-    "__memdif" @553
-    "__memrchr" @554
-    "__memswap" @555
-    "__mfclose" @556
-    "__mfopen" @557
-    "__mheap" @558
-    "__mktime" @559
-    "__month_day_leap" @560
-    "__month_day_non_leap" @561
-    "__msize" @562
-    "__newstream" @563
-    "__openstream" @564
-    "__os2_bad" @565
-    "__output" @566
-    "__path" @567
-    "__read_kbd" @568
-    "__remext" @569
-    "__response" @570
-    "__rfnlwr" @571
-    "__rmtmp" @572
-    "__scrsize" @573
-    "__searchenv" @574
-    "__seek_hdr" @575
-    "__sfnlwr" @576
-    "__sleep2" @577
-    "__splitargs" @578
-    "__splitpath" @579
-    "__status87" @580
-    "__std_abort" @581
-    "__std_abs" @582
-    "__std_access" @583
-    "__std_acos" @584
-    "__std_acosl" @585
-    "__std_asctime" @586
-    "__std_asctime_r" @587
-    "__std_asin" @588
-    "__std_asinl" @589
-    "__std_atan" @590
-    "__std_atan2" @591
-    "__std_atan2l" @592
-    "__std_atanl" @593
-    "__std_atexit" @594
-    "__std_atof" @595
-    "__std_atofl" @596
-    "__std_atoi" @597
-    "__std_atol" @598
-    "__std_atoll" @599
-    "__std_basename" @600
-    "__std_bcmp" @601
-    "__std_bcopy" @602
-    "__std_brk" @603
-    "__std_bsearch" @604
-    "__std_bzero" @605
-    "__std_calloc" @606
-    "__std_cbrt" @607
-    "__std_cbrtl" @608
-    "__std_ceil" @609
-    "__std_ceill" @610
-    "__std_cfgetispeed" @611
-    "__std_cfgetospeed" @612
-    "__std_cfsetispeed" @613
-    "__std_cfsetospeed" @614
-    "__std_cfsetspeed" @615
-    "__std_chdir" @616
-    "__chdrive" @617
-    "__std_chmod" @618
-    "__std_chsize" @619
-    "__std_clearerr" @620
-    "__std_clock" @621
-    "__std_close" @622
-    "__std_closedir" @623
-    "__std_copysign" @624
-    "__std_copysignf" @625
-    "__std_copysignl" @626
-    "__std_cos" @627
-    "__std_cosh" @628
-    "__std_coshl" @629
-    "__std_cosl" @630
-    "__std_creat" @631
-    "__std_ctime" @632
-    "__std_ctime_r" @633
-    "__std_cuserid" @634
-    "__std_difftime" @635
-    "__std_dirname" @636
-    "__std_div" @637
-    "__std_drand48" @638
-    "__std_dup" @639
-    "__std_dup2" @640
-    "__std_eaccess" @641
-    "__std_endpwent" @642
-    "__std_eof" @643
-    "__std_erand48" @644
-    "__std_execl" @645
-    "__std_execle" @646
-    "__std_execlp" @647
-    "__std_execlpe" @648
-    "__std_execv" @649
-    "__std_execve" @650
-    "__std_execvp" @651
-    "__std_execvpe" @652
-    "__std_exit" @653
-    "__std_exp" @654
-    "__std_expand" @655
-    "__std_expl" @656
-    "__std_fabs" @657
-    "__std_fabsl" @658
-    "__std_fclose" @659
-    "__std_fcntl" @660
-    "__std_fdopen" @661
-    "__std_feof" @662
-    "__std_ferror" @663
-    "__std_fflush" @664
-    "__std_ffs" @665
-    "__std_fgetc" @666
-    "__std_fgetchar" @667
-    "__std_fgetpos" @668
-    "__std_fgets" @669
-    "__std_filelength" @670
-    "__std_fileno" @671
-    "__std_flock" @672
-    "__std_floor" @673
-    "__std_floorl" @674
-    "__std_flushall" @675
-    "__std_fmod" @676
-    "__std_fmodl" @677
-    "__std_fnmatch" @678
-    "__std_fopen" @679
-    "__std_fork" @680
-    "__std_fpathconf" @681
-    "__std_fprintf" @682
-    "__std_fputc" @683
-    "__std_fputchar" @684
-    "__std_fputs" @685
-    "__std_fread" @686
-    "__std_free" @687
-    "__std_freopen" @688
-    "__std_frexp" @689
-    "__std_frexpl" @690
-    "__std_fscanf" @691
-    "__std_fseek" @692
-    "__std_fseeko" @693
-    "__std_fsetpos" @694
-    "__std_fstat" @695
-    "__std_fsync" @696
-    "__std_ftell" @697
-    "__std_ftello" @698
-    "__std_ftime" @699
-    "__std_ftruncate" @700
-    "__std_ftw" @701
-    "__std_fwrite" @702
-    "__std_gcvt" @703
-    "__std_getchar" @704
-    "__std_getcwd" @705
-    "__std_getegid" @706
-    "__std_getenv" @707
-    "__std_geteuid" @708
-    "__std_getgid" @709
-    "___libc_Back_signalTimer" @710
-    "__std_getgrnam" @711
-    "__std_getgroups" @712
-    "__std_getlogin" @713
-    "__std_getopt" @714
-    "__std_getpagesize" @715
-    "__std_getpass" @716
-    "__std_getpgrp" @717
-    "__std_getpid" @718
-    "__std_getppid" @719
-    "__std_ualarm" @720
-    "__std_getpwent" @721
-    "__std_setitimer" @722
-    "__std_getitimer" @723
-    "__std_getrlimit" @724
-    "__std_gets" @725
-    "__std_gettimeofday" @726
-    "__std_getuid" @727
-    "__std_getw" @728
-    "__std_getwd" @729
-    "__std_glob" @730
-    "__std_globfree" @731
-    "__std_gmtime" @732
-    "__std_gmtime_r" @733
-    "__std_hcreate" @734
-    "__std_hdestroy" @735
-    "__std_hsearch" @736
-    "__std_hypot" @737
-    "__std_hypotl" @738
-    "__std_imaxabs" @739
-    "__std_imaxdiv" @740
-    "__std_index" @741
-    "__std_insque" @742
-    "__std_ioctl" @743
-    "__std_isatty" @744
-    "__std_jrand48" @745
-    "__std_kill" @746
-    "__std_labs" @747
-    "__std_lcong48" @748
-    "__std_ldexp" @749
-    "__std_ldexpl" @750
-    "__std_ldiv" @751
-    "__std_lfind" @752
-    "__std_lltoa" @753
-    "__std_localeconv" @754
-    "__std_localtime" @755
-    "__std_localtime_r" @756
-    "__std_lockf" @757
-    "__std_log" @758
-    "__std_log10" @759
-    "__std_log10l" @760
-    "__std_logl" @761
-    "__std_longjmp" @762
-    "__std_lrand48" @763
-    "__std_lsearch" @764
-    "__std_lseek" @765
-    "__std_lstat" @766
-    "__std_ltoa" @767
-    "__std_malloc" @768
-    "__std_mblen" @769
-    "__std_mbstowcs" @770
-    "__std_mbtowc" @771
-    "__std_memccpy" @772
-    "__std_memchr" @773
-    "__std_memcmp" @774
-    "__std_memcpy" @775
-    "__std_memicmp" @776
-    "__std_memmove" @777
-    "__std_memset" @778
-    "__std_mkdir" @779
-    "__std_mkstemp" @780
-    "__std_mktemp" @781
-    "__std_mktime" @782
-    "__std_modf" @783
-    "__std_modfl" @784
-    "__std_mrand48" @785
-    "__std_nextafter" @786
-    "__std_nextafterf" @787
-    "__std_nextafterl" @788
-    "__std_nrand48" @789
-    "__std_open" @790
-    "__std_opendir" @791
-    "__std_pathconf" @792
-    "__std_pause" @793
-    "__std_pclose" @794
-    "__std_perror" @795
-    "__std_pipe" @796
-    "__std_popen" @797
-    "__std_posix_memalign" @798
-    "__std_pow" @799
-    "__std_powl" @800
-    "__std_printf" @801
-    "__std_putchar" @802
-    "__std_putenv" @803
-    "__std_puts" @804
-    "__std_putw" @805
-    "__std_qsort" @806
-    "__std_qsort_r" @807
-    "__std_raise" @808
-    "__std_rand" @809
-    "__std_read" @810
-    "__std_readdir" @811
-    "__std_readdir_r" @812
-    "__std_readv" @813
-    "__std_realloc" @814
-    "__std_realpath" @815
-    "__std_remove" @816
-    "__std_remque" @817
-    "__std_rename" @818
-    "__std_rewind" @819
-    "__std_rewinddir" @820
-    "__std_rindex" @821
-    "__std_rint" @822
-    "__std_rintl" @823
-    "__std_rmdir" @824
-    "__std_sbrk" @825
-    "__std_scanf" @826
-    "__std_seed48" @827
-    "__std_seekdir" @828
-    "__std_select" @829
-    "__std_setbuf" @830
-    "__std_setbuffer" @831
-    "__std_setenv" @832
-    "__std_setgid" @833
-    "__std_setjmp" @834
-    "__std_setlocale" @835
-    "__std_setmode" @836
-    "__std_setpgid" @837
-    "__std_setpwent" @838
-    "__std_setrlimit" @839
-    "__std_setsid" @840
-    "__std_settimeofday" @841
-    "__std_setuid" @842
-    "__std_setvbuf" @843
-    "__std_sigaction" @844
-    "__std_sigaddset" @845
-    "__std_sigdelset" @846
-    "__std_sigemptyset" @847
-    "__std_sigfillset" @848
-    "__std_sigismember" @849
-    "__std_siglongjmp" @850
-    "__std_signal" @851
-    "__std_sigpending" @852
-    "__std_sigprocmask" @853
-    "__std_sigsetjmp" @854
-    "__std_sigsuspend" @855
-    "__std_sin" @856
-    "__std_sinh" @857
-    "__std_sinhl" @858
-    "__std_sinl" @859
-    "__std_sleep" @860
-    "__std_snprintf" @861
-    "__std_sopen" @862
-    "__std_spawnl" @863
-    "__std_spawnle" @864
-    "__std_spawnlp" @865
-    "__std_spawnlpe" @866
-    "__std_spawnv" @867
-    "__std_spawnve" @868
-    "__std_spawnvp" @869
-    "__std_spawnvpe" @870
-    "__std_sprintf" @871
-    "__std_sqrt" @872
-    "__std_sqrtl" @873
-    "__std_srand" @874
-    "__std_srand48" @875
-    "__std_sscanf" @876
-    "__std_stat" @877
-    "__std_strcat" @878
-    "__std_strchr" @879
-    "__std_strcmp" @880
-    "__std_strcoll" @881
-    "__std_strcpy" @882
-    "__std_strcspn" @883
-    "__std_strdup" @884
-    "__std_strerror" @885
-    "__std_strerror_r" @886
-    "__std_strftime" @887
-    "__std_stricmp" @888
-    "__std_strlen" @889
-    "__std_strlwr" @890
-    "__std_strncat" @891
-    "__std_strncmp" @892
-    "__std_strncpy" @893
-    "__std_strnicmp" @894
-    "__std_strnset" @895
-    "__std_strpbrk" @896
-    "__std_strptime" @897
-    "__std_strrchr" @898
-    "__std_strrev" @899
-    "__std_strset" @900
-    "__std_strspn" @901
-    "__std_strstr" @902
-    "__std_strtod" @903
-    "__std_strtof" @904
-    "__std_strtoimax" @905
-    "__std_strtok" @906
-    "__std_strtok_r" @907
-    "__std_strtol" @908
-    "__std_strtold" @909
-    "__std_strtoll" @910
-    "__std_strtoul" @911
-    "__std_strtoull" @912
-    "__std_strtoumax" @913
-    "__std_strupr" @914
-    "__std_strxfrm" @915
-    "__std_swab" @916
-    "__std_sys_errlist" @917
-    "__std_sys_nerr" @918
-    "__std_sysconf" @919
-    "__std_system" @920
-    "__std_tan" @921
-    "__std_tanh" @922
-    "__std_tanhl" @923
-    "__std_tanl" @924
-    "__std_tcdrain" @925
-    "__std_tcflow" @926
-    "__std_tcflush" @927
-    "__std_tcgetattr" @928
-    "__std_tcgetpgrp" @929
-    "__std_tcsendbreak" @930
-    "__std_tcsetattr" @931
-    "__std_tcsetpgrp" @932
-    "__std_tdelete" @933
-    "__std_tell" @934
-    "__std_telldir" @935
-    "__std_tempnam" @936
-    "__std_tfind" @937
-    "__std_time" @938
-    "__std_times" @939
-    "__std_tmpfile" @940
-    "__std_tmpnam" @941
-    "__std_trunc" @942
-    "__std_truncate" @943
-    "__std_truncl" @944
-    "__std_tsearch" @945
-    "__std_ttyname" @946
-    "__std_twalk" @947
-    "__std_tzset" @948
-    "__std_ulimit" @949
-    "__std_ulltoa" @950
-    "__std_ultoa" @951
-    "__std_umask" @952
-    "__std_uname" @953
-    "__std_ungetc" @954
-    "__std_unlink" @955
-    "__std_unsetenv" @956
-    "__std_usleep" @957
-    "__std_utime" @958
-    "__std_utimes" @959
-    "__std_vfprintf" @960
-    "__std_vfscanf" @961
-    "__std_vprintf" @962
-    "__std_vscanf" @963
-    "__std_vsnprintf" @964
-    "__std_vsprintf" @965
-    "__std_vsscanf" @966
-    "__std_wait" @967
-    "__std_waitpid" @968
-    "__std_wcstombs" @969
-    "__std_wctomb" @970
-    "__std_write" @971
-    "__std_writev" @972
-    "__stream_read" @973
-    "__stream_write" @974
-    "__strncpy" @975
-    "__swchar" @976
-    "__sys_dump_heap_objs" @977
-    "__tcalloc" @978
-    "__tfree" @979
-    "__theapmin" @980
-    "__threadstore" @981
-    "__tmalloc" @982
-    "__tmpbuf1" @983
-    "__tmpidx_lock" @984
-    "__tmpidx_unlock" @985
-    "__tmpidxnam" @986
-    "__trealloc" @987
-    "__trslash" @988
-    "__uaddmem" @989
-    "__ucalloc" @990
-    "__uclose" @991
-    "__ucreate" @992
-    "__ucreate2" @993
-    "__udefault" @994
-    "__udestroy" @995
-    "__uflags" @996
-    "__uheap_type" @997
-    "__uheap_walk" @998
-    "__uheap_walk2" @999
-    "__uheapchk" @1000
-    "__uheapmin" @1001
-    "__uheapset" @1002
-    "__uldiv" @1003
-    "__um_addmem_nolock" @1004
-    "__um_alloc_no_lock" @1005
-    "__um_crumb_free_maybe_lock" @1006
-    "__um_default_alloc" @1007
-    "__um_default_expand" @1008
-    "__um_default_release" @1009
-    "__um_default_shrink" @1010
-    "__um_find_bucket" @1011
-    "__um_free_maybe_lock" @1012
-    "__um_init_default_regular_heap" @1013
-    "__um_init_default_tiled_heap" @1014
-    "__um_lump_alloc" @1015
-    "__um_lump_coalesce_free" @1016
-    "__um_lump_free_maybe_lock" @1017
-    "__um_lump_link_heap" @1018
-    "__um_lump_make_free" @1019
-    "__um_lump_unlink_bucket" @1020
-    "__um_lump_unlink_heap" @1021
-    "__um_realloc" @1022
-    "__um_seg_addmem" @1023
-    "__um_seg_setmem" @1024
-    "__um_walk_error" @1025
-    "__um_walk_no_lock" @1026
-    "__umalloc" @1027
-    "__ungetc_nolock" @1028
-    "__uopen" @1029
-    "__ustats" @1030
-    "__utcalloc" @1031
-    "__utdefault" @1032
-    "__utmalloc" @1033
-    "__vsopen" @1034
-    "__warn" @1035
-    "__wildcard" @1036
-    "__year_day" @1037
-    "_argz_delete" @1038
-    "_catclose" @1039
-    "_catgets" @1040
-    "_catopen" @1041
-    "_dbm_clearerr" @1042
-    "_dbm_close" @1043
-    "_dbm_delete" @1044
-    "_dbm_dirfno" @1045
-    "_dbm_error" @1046
-    "_dbm_fetch" @1047
-    "_dbm_firstkey" @1048
-    "_dbm_nextkey" @1049
-    "_dbm_open" @1050
-    "_dbm_store" @1051
-    "_dbopen" @1052
-    "_err_set_exit" @1053
-    "_err_set_file" @1054
-    "_errc" @1055
-    "_errx" @1056
-    "__std_getopt_long" @1057
-    "_heapsort" @1058
-    "_initstate" @1059
-    "_isalnum" @1060
-    "_isalpha" @1061
-    "_isascii" @1062
-    "_isblank" @1063
-    "_iscntrl" @1064
-    "_isdigit" @1065
-    "_isgraph" @1066
-    "_ishexnumber" @1067
-    "_islower" @1068
-    "_isnumber" @1069
-    "_isprint" @1070
-    "_ispunct" @1071
-    "_isspace" @1072
-    "_isupper" @1073
-    "_isxdigit" @1074
-    "_lchmod" @1075
-    "_mergesort" @1076
-    "_mpool_close" @1077
-    "_mpool_filter" @1078
-    "_mpool_get" @1079
-    "_mpool_new" @1080
-    "_mpool_open" @1081
-    "_mpool_put" @1082
-    "_mpool_sync" @1083
-    "_posix_spawn" @1084
-    "_posix_spawn_file_actions_addclose" @1085
-    "_posix_spawn_file_actions_adddup2" @1086
-    "_posix_spawn_file_actions_addopen" @1087
-    "_posix_spawn_file_actions_destroy" @1088
-    "_posix_spawn_file_actions_init" @1089
-    "_posix_spawnattr_destroy" @1090
-    "_posix_spawnattr_getflags" @1091
-    "_posix_spawnattr_getpgroup" @1092
-    "_posix_spawnattr_getschedparam" @1093
-    "_posix_spawnattr_getschedpolicy" @1094
-    "_posix_spawnattr_getsigdefault" @1095
-    "_posix_spawnattr_getsigmask" @1096
-    "_posix_spawnattr_init" @1097
-    "_posix_spawnattr_setflags" @1098
-    "_posix_spawnattr_setpgroup" @1099
-    "_posix_spawnattr_setschedparam" @1100
-    "_posix_spawnattr_setschedpolicy" @1101
-    "_posix_spawnattr_setsigdefault" @1102
-    "_posix_spawnattr_setsigmask" @1103
-    "_posix_spawnp" @1104
-    "_radixsort" @1105
-    "_random" @1106
-    "_reallocf" @1107
-    "_regcomp" @1108
-    "_regerror" @1109
-    "_regexec" @1110
-    "_regfree" @1111
-    "_setprogname" @1112
-    "_setstate" @1113
-;    "_sig_info" @1114
-    "_sradixsort" @1115
-    "_srandom" @1116
-    "_srandomdev" @1117
-    "_stpcpy" @1118
-    "_strcasestr" @1119
-    "_strlcat" @1120
-    "_strlcpy" @1121
-    "_strnstr" @1122
-    "_strsep" @1123
-    "_strsignal" @1124
-;    "_sys_exception" @1125
-    "_sys_nsig" @1126
-    "_sys_siglist" @1127
-    "_sys_signame" @1128
-    "_toascii" @1129
-    "_tolower" @1130
-    "_toupper" @1131
-    "_verr" @1132
-    "_verrc" @1133
-    "_verrx" @1134
-    "_vwarn" @1135
-    "_vwarnc" @1136
-    "_vwarnx" @1137
-    "_warnc" @1138
-    "_warnx" @1139
-    ; new stuff.
-
-    "___libc_SpmCheck" @1140
-    "___libc_Back_miscLoadAvg" @1141
-    "___libc_Back_fsFileStatFH" @1142
-    "___libc_Back_fsStat" @1143
-    "___libc_Back_fsStatFH" @1144
-    "___libc_Back_fsStats" @1145
-    "_getmntinfo" @1146
-    "__std_fstatfs" @1147
-    "__std_fstatvfs" @1148
-    "__std_getfsstat" @1149
-    "__std_getloadavg" @1150
-    "__std_statfs" @1151
-    "__std_statvfs" @1152
-    "__std_chown" @1153
-    "__std_fchown" @1154
-    "__std_lchown" @1155
-    "__std_link" @1156
-    "__std_mknod" @1157
-    "__std_readlink" @1158
-    "__std_symlink" @1159
-    "___libc_Back_fsSync" @1160
-    "__std_sync" @1161
-    "_endgrent" @1162
-    "_getgrent" @1163
-    "_getgrent_r" @1164
-    "_getgrgid_r" @1165
-    "_getgrnam_r" @1166
-    "___gr_match_entry" @1167
-    "___gr_parse_entry" @1168
-    "__nsdbtaddsrc" @1169
-    "__nsdbtput" @1170
-    "___nsdefaultsrc" @1171
-    "__nsdispatch" @1172
-    "_setgrent" @1173
-    "_setgroupent" @1174
-    "_endnetgrent" @1175
-    "_endusershell" @1176
-    "_getnetgrent" @1177
-    "_getpwent_r" @1178
-    "_getpwnam_r" @1179
-    "_getpwuid_r" @1180
-    "_getusershell" @1181
-    "_innetgr" @1182
-    "_pwdb_versions" @1183
-    "___pw_match_entry" @1184
-    "___pw_parse_entry" @1185
-    "___pw_scan" @1186
-    "_setnetgrent" @1187
-    "_setusershell" @1188
-    "_sl_add" @1189
-    "_sl_find" @1190
-    "_sl_free" @1191
-    "_sl_init" @1192
-    "__std_setpassent" @1193
-    "__std_setgroups" @1194
-    "___libc_OS2ErrorPop" @1195
-    "___libc_OS2ErrorPush" @1196
-    "___libc_OS2ErrorSet" @1197
-    "__getdcwd" @1198
-    "___libc_Back_fsDirChangeRoot" @1199
-    "___libc_Back_fsSymlinkCreate" @1200
-    "___libc_Back_fsSymlinkRead" @1201
-    "___libc_Back_ioFHToPath" @1202
-    "__std_getdtablesize" @1203
-    "_strmode" @1204
-    "___strverscmp" @1205
-    "__getcwdux" @1206
-    "___libc_Back_fsPathResolve" @1207
-    "__std_canonicalize_file_name" @1208
-    "__std_alarm" @1209
-    "___libc_Back_fsDriveDefaultGet" @1210
-    "___libc_Back_fsDriveDefaultSet" @1211
-    "__realrealpath" @1212
-
-    ; 0.6 alpha 3 - start
-    "___libc_Timebomb" @1217
-    "___libc_Back_ldrClose" @1218
-    "___libc_Back_ldrOpen" @1219
-    "___libc_Back_ldrSymbol" @1220
-    "__std_dlclose" @1221
-    "__std_dlerror" @1222
-    "__std_dlopen" @1223
-    "__std_dlsym" @1224
-    "_getgrouplist" @1225
-    "_initgroups" @1226
-    "__std_memalign" @1227
-    "__std_valloc" @1228
-    "___lazyimp_resolver" @1229
-    "___lazyimp_resolver2" @1230
-    "___lazyldr_uconv_resolver" @1231
-    "___lazyldr_libuni_resolver" @1232
-    "___libc_Back_mmanProtect" @1233
-    "__std_mprotect" @1234
-    "__libc_Back_exceptionHandler" @1235
-    "__signal_os2" @1236
-    "__signal_sysv" @1237
-    "___sigpause_bsd" @1238
-    "__std_bsd_signal" @1239
-    "__std_killpg" @1240
-    "__std_psignal" @1241
-    "__std_sigaltstack" @1242
-    "__std_sigblock" @1243
-    "__std_sighold" @1244
-    "__std_sigignore" @1245
-    "__std_siginterrupt" @1246
-    "__std_sigpause" @1247
-    "__std_sigrelse" @1248
-    "__std_sigsetmask" @1249
-    "__std_sigtimedwait" @1250
-    "__std_sigvec" @1251
-    "__std_sigwait" @1252
-    "__std_sigwaitinfo" @1253
-    "__std_sigqueue" @1254
-    "__std_sigset" @1255
-    "_getgrgid" @1256
-    "_getpwnam" @1257
-    "_getpwuid" @1258
-    "___libc_Back_processGetEffGid" @1259
-    "___libc_Back_processGetEffUid" @1260
-    "___libc_Back_processGetGid" @1261
-    "___libc_Back_processGetUid" @1262
-    "___libc_Back_processSetGid" @1263
-    "___libc_Back_processSetGidAll" @1264
-    "___libc_Back_processSetUid" @1265
-    "___libc_Back_processSetUidAll" @1266
-    "___libc_Back_processWait" @1267
-    "___libc_Back_signalAction" @1268
-    "___libc_Back_signalInterrupt" @1269
-    "___libc_Back_signalMask" @1270
-    "___libc_Back_signalPending" @1271
-    "___libc_Back_signalQueue" @1272
-    "___libc_Back_signalRaise" @1273
-    "___libc_Back_signalSendPGrp" @1274
-    "___libc_Back_signalSendPid" @1275
-    "___libc_Back_signalStack" @1276
-    "___libc_Back_signalSuspend" @1277
-    "___libc_Back_signalWait" @1278
-    "__std_setegid" @1279
-    "__std_seteuid" @1280
-    "__std_setregid" @1281
-    "__std_setresgid" @1282
-    "__std_setresuid" @1283
-    "__std_setreuid" @1284
-    "__std_setrgid" @1285
-    "__std_setruid" @1286
-    "__std_waitid" @1287
-    "__std_wait3" @1288
-    "__std_wait4" @1289
-    "__std_getopt_long_only" @1290
-
+    "___ftime" @256
+    "___get_buf" @257
+    "___get_page" @258
+    "___gr_match_entry" @259
+    "___gr_parse_entry" @260
+    "___hash_open" @261
+    "___ibitmap" @262
+    "___imphandle" @263
+    "___init" @264
+    "___init_app" @265
+    "___init_dll" @266
+    "___ioctl1" @267
+    "___ioctl2" @268
+    "___isctype" @269
+    "___isfinite" @270
+    "___isfinitef" @271
+    "___isfinitel" @272
+    "___isnan" @273
+    "___isnanf" @274
+    "___isnanl" @275
+    "___isnormal" @276
+    "___isnormalf" @277
+    "___isnormall" @278
+    "___istype" @279
+    "___lazyimp_resolver" @280
+    "___lazyimp_resolver2" @281
+    "___lazyldr_libuni_resolver" @282
+    "___lazyldr_uconv_resolver" @283
+    "___libc_Back_fibDumpAll" @284
+    "___libc_Back_fsDirChangeRoot" @285
+    "___libc_Back_fsDirCreate" @286
+    "___libc_Back_fsDirCurrentGet" @287
+    "___libc_Back_fsDirCurrentSet" @288
+    "___libc_Back_fsDirRemove" @289
+    "___libc_Back_fsDriveDefaultGet" @290
+    "___libc_Back_fsDriveDefaultSet" @291
+    "___libc_Back_fsFileStat" @292
+    "___libc_Back_fsFileStatFH" @293
+    "___libc_Back_fsPathResolve" @294
+    "___libc_Back_fsStat" @295
+    "___libc_Back_fsStatFH" @296
+    "___libc_Back_fsStats" @297
+    "___libc_Back_fsSymlinkCreate" @298
+    "___libc_Back_fsSymlinkRead" @299
+    "___libc_Back_fsSymlinkStat" @300
+    "___libc_Back_fsSync" @301
+    "___libc_Back_ioFHToPath" @302
+    "___libc_Back_ioFileOpen" @303
+    "___libc_Back_ioFileSizeSet" @304
+    "___libc_Back_ioSeek" @305
+    "___libc_Back_ldrClose" @306
+    "___libc_Back_ldrOpen" @307
+    "___libc_Back_ldrSymbol" @308
+    "___libc_Back_miscLoadAvg" @309
+    "___libc_Back_mmanProtect" @310
+    "___libc_Back_processGetEffGid" @311
+    "___libc_Back_processGetEffUid" @312
+    "___libc_Back_processGetGid" @313
+    "___libc_Back_processGetUid" @314
+    "___libc_Back_processSetGid" @315
+    "___libc_Back_processSetGidAll" @316
+    "___libc_Back_processSetUid" @317
+    "___libc_Back_processSetUidAll" @318
+    "___libc_Back_processWait" @319
+    "___libc_Back_signalAction" @320
+    "___libc_Back_signalInterrupt" @321
+    "___libc_Back_signalMask" @322
+    "___libc_Back_signalPending" @323
+    "___libc_Back_signalQueue" @324
+    "___libc_Back_signalRaise" @325
+    "___libc_Back_signalSendPGrp" @326
+    "___libc_Back_signalSendPid" @327
+    "___libc_Back_signalStack" @328
+    "___libc_Back_signalSuspend" @329
+    "___libc_Back_signalTimer" @330
+    "___libc_Back_signalWait" @331
+    "___libc_Back_threadCleanup" @332
+    "___libc_Back_threadEnd" @333
+    "___libc_Back_threadInit" @334
+    "___libc_Back_threadStartup" @335
+    "___libc_FH" @336
+    "___libc_FHAllocate" @337
+    "___libc_FHClose" @338
+    "___libc_FHEnsureHandles" @339
+    "___libc_FHEx" @340
+    "___libc_FHMoreHandles" @341
+    "___libc_ForkDefaultModuleCallback" @342
+    "___libc_ForkRegisterModule" @343
+    "___libc_GLocaleCtypeDefault" @344
+    "___libc_HasHighMem" @345
+    "___libc_HeapEndVoting" @346
+    "___libc_HeapGetResult" @347
+    "___libc_HeapVote" @348
+    "___libc_HimemDefaultAlloc" @349
+    "___libc_HimemDefaultRelease" @350
+    "___libc_LogAssert" @351
+    "___libc_LogDumpHex" @352
+    "___libc_LogEnter" @353
+    "___libc_LogGroupInit" @354
+    "___libc_LogInit" @355
+    "___libc_LogLeave" @356
+    "___libc_LogMsg" @357
+    "___libc_LogRaw" @358
+    "___libc_OS2ErrorPop" @359
+    "___libc_OS2ErrorPush" @360
+    "___libc_OS2ErrorSet" @361
+    "___libc_PathRewrite" @362
+    "___libc_PathRewriteAdd" @363
+    "___libc_PathRewriteRemove" @364
+    "___libc_SpmCheck" @365
+    "___libc_StrictMemoryR" @366
+    "___libc_StrictMemoryRW" @367
+    "___libc_StrictStringR" @368
+    "___libc_TLSAlloc" @369
+    "___libc_TLSDestructor" @370
+    "___libc_TLSFree" @371
+    "___libc_TLSGet" @372
+    "___libc_TLSGetDestructor" @373
+    "___libc_TLSSet" @374
+    "___libc_TcpipAllocFH43" @375
+    "___libc_TcpipAllocFH44" @376
+    "___libc_TcpipAllocFHEx43" @377
+    "___libc_TcpipAllocFHEx44" @378
+    "___libc_Tcpipbsdselect43" @379
+    "___libc_Tcpipbsdselect44" @380
+    "___libc_ThreadRegisterTermCallback" @381
+    "___libc_Timebomb" @382
+    "___libc_TranslateCodepage" @383
+    "___log2" @384
+    "___mempcpy" @385
+    "___nsdefaultsrc" @386
+    "___ovfl_delete" @387
+    "___ovfl_get" @388
+    "___ovfl_put" @389
+    "___pipe" @390
+    "___posix_spawn_file_actions_realloc" @391
+    "___put_page" @392
+    "___pw_match_entry" @393
+    "___pw_parse_entry" @394
+    "___pw_scan" @395
+    "___read" @396
+    "___read_kbd" @397
+    "___rec_close" @398
+    "___rec_delete" @399
+    "___rec_dleaf" @400
+    "___rec_fd" @401
+    "___rec_fmap" @402
+    "___rec_fpipe" @403
+    "___rec_get" @404
+    "___rec_iput" @405
+    "___rec_open" @406
+    "___rec_put" @407
+    "___rec_ret" @408
+    "___rec_search" @409
+    "___rec_seq" @410
+    "___rec_sync" @411
+    "___rec_vmap" @412
+    "___rec_vpipe" @413
+    "___reclaim_buf" @414
+    "___remove_zeros" @415
+    "___select" @416
+    "___settime" @417
+    "___signbit" @418
+    "___signbitf" @419
+    "___signbitl" @420
+    "___sigpause_bsd" @421
+    "___small_atod" @422
+    "___small_dtoa" @423
+    "___smutex_request_internal" @424
+    "___spawni" @425
+    "___spawnve" @426
+    "___split_page" @427
+    "___stream_abort" @428
+    "___strndup" @429
+    "___strnlen" @430
+    "___strverscmp" @431
+    "___swchar" @432
+    "___threadid" @433
+    "___tolower" @434
+    "___toupper" @435
+    "___ttyname" @436
+    "___ulimit" @437
+    "___unwind2" @438
+    "___utimes" @439
+    "___wait" @440
+    "___waitpid" @441
+    "___write" @442
+    "__abspath" @443
+    "__assert" @444
+    "__atfork_callback" @445
+    "__beginthread" @446
+    "__bi_add_bb" @447
+    "__bi_cmp_bb" @448
+    "__bi_cmp_pow2" @449
+    "__bi_div_add_back" @450
+    "__bi_div_estimate" @451
+    "__bi_div_rem_bb" @452
+    "__bi_div_rem_bw" @453
+    "__bi_div_rem_pow2" @454
+    "__bi_div_subtract" @455
+    "__bi_fls" @456
+    "__bi_hdiv_rem_b" @457
+    "__bi_mul_bb" @458
+    "__bi_mul_bw" @459
+    "__bi_pow5" @460
+    "__bi_set_b" @461
+    "__bi_set_d" @462
+    "__bi_set_w" @463
+    "__bi_shl_b" @464
+    "__bi_shl_w" @465
+    "__bi_shr_b" @466
+    "__bi_sub_mul_bw" @467
+    "__bi_wdiv_rem_pow2" @468
+    "__chdir2" @469
+    "__chdrive" @470
+    "__clear87" @471
+    "__closestream" @472
+    "__compute_dst_table" @473
+    "__const_HALF" @474
+    "__const_M_ONE" @475
+    "__const_NAN" @476
+    "__const_ONE" @477
+    "__const_TWO" @478
+    "__const_ZERO" @479
+    "__control87" @480
+    "__core" @481
+    "__crlf" @482
+    "__day" @483
+    "__defext" @484
+    "__dorand48" @485
+    "__dt_free" @486
+    "__dt_read" @487
+    "__dt_sort" @488
+    "__dt_split" @489
+    "__ea_free" @490
+    "__ea_get" @491
+    "__ea_put" @492
+    "__ea_remove" @493
+    "__ea_set_errno" @494
+    "__ea_write" @495
+    "__ead_add" @496
+    "__ead_clear" @497
+    "__ead_copy" @498
+    "__ead_count" @499
+    "__ead_create" @500
+    "__ead_delete" @501
+    "__ead_destroy" @502
+    "__ead_enum" @503
+    "__ead_fea2list_size" @504
+    "__ead_fea2list_to_fealist" @505
+    "__ead_fealist_to_fea2list" @506
+    "__ead_find" @507
+    "__ead_get_fea2list" @508
+    "__ead_get_flags" @509
+    "__ead_get_name" @510
+    "__ead_get_value" @511
+    "__ead_make_index" @512
+    "__ead_name_len" @513
+    "__ead_read" @514
+    "__ead_replace" @515
+    "__ead_size_buffer" @516
+    "__ead_sort" @517
+    "__ead_use_fea2list" @518
+    "__ead_value_size" @519
+    "__ead_write" @520
+    "__emx_getopt" @521
+    "__emxload_connect" @522
+    "__emxload_disconnect" @523
+    "__emxload_do_connect" @524
+    "__emxload_do_disconnect" @525
+    "__emxload_do_receive" @526
+    "__emxload_do_request" @527
+    "__emxload_do_wait" @528
+    "__emxload_env" @529
+    "__emxload_list_get" @530
+    "__emxload_list_start" @531
+    "__emxload_prog" @532
+    "__emxload_request" @533
+    "__emxload_stop" @534
+    "__emxload_this" @535
+    "__emxload_unload" @536
+    "__endbuf1" @537
+    "__endthread" @538
+    "__envargs" @539
+    "__err" @540
+    "__errno" @541
+    "__errno_fun" @542
+    "__execname" @543
+    "__exit" @544
+    "__exit_streams" @545
+    "__fbuf" @546
+    "__fcloseall" @547
+    "__fflush_nolock" @548
+    "__filesys" @549
+    "__fill" @550
+    "__flush" @551
+    "__flushstream" @552
+    "__fmutex_abort" @553
+    "__fmutex_checked_close" @554
+    "__fmutex_checked_create" @555
+    "__fmutex_checked_create2" @556
+    "__fmutex_checked_open" @557
+    "__fmutex_close" @558
+    "__fmutex_create" @559
+    "__fmutex_create2" @560
+    "__fmutex_dummy" @561
+    "__fmutex_open" @562
+    "__fnexplode" @563
+    "__fnexplodefree" @564
+    "__fngetdrive" @565
+    "__fnisabs" @566
+    "__fnisrel" @567
+    "__fnlwr" @568
+    "__fnlwr2" @569
+    "__fnslashify" @570
+    "__fpreset" @571
+    "__fseek_hdr" @572
+    "__fseek_nolock" @573
+    "__fsetmode" @574
+    "__fsopen" @575
+    "__ftell_nolock" @576
+    "__fullpath" @577
+    "__fwrite_nolock" @578
+    "__fxam" @579
+    "__fxaml" @580
+    "__getcwd1" @581
+    "__getcwd2" @582
+    "__getcwdux" @583
+    "__getdcwd" @584
+    "__getdrive" @585
+    "__getext" @586
+    "__getext2" @587
+    "__getname" @588
+    "__getpass1" @589
+    "__getpass2" @590
+    "__getprogname" @591
+    "__gettid" @592
+    "__getvol" @593
+    "__gmt2loc" @594
+    "__hcalloc" @595
+    "__heap_walk" @596
+    "__heapchk" @597
+    "__heapmin" @598
+    "__heapset" @599
+    "__hinitheap" @600
+    "__hmalloc" @601
+    "__hrealloc" @602
+    "__imphandle" @603
+    "__init_streams" @604
+    "__input" @605
+    "__int86" @606
+    "__isterm" @607
+    "__lcalloc" @608
+    "__libc_16to32" @609
+    "__libc_32to16" @610
+    "__libc_Back_exceptionHandler" @611
+    "__libc_thunk1" @612
+    "__linitheap" @613
+    "__lmalloc" @614
+    "__loc2gmt" @615
+    "__lrealloc" @616
+    "__makepath" @617
+    "__memcount" @618
+    "__memdif" @619
+    "__memrchr" @620
+    "__memswap" @621
+    "__mfclose" @622
+    "__mfopen" @623
+    "__mheap" @624
+    "__mktime" @625
+    "__month_day_leap" @626
+    "__month_day_non_leap" @627
+    "__msize" @628
+    "__newstream" @629
+    "__nsdbtaddsrc" @630
+    "__nsdbtput" @631
+    "__nsdispatch" @632
+    "__openstream" @633
+    "__os2_bad" @634
+    "__output" @635
+    "__path" @636
+    "__read_kbd" @637
+    "__realrealpath" @638
+    "__remext" @639
+    "__response" @640
+    "__rfnlwr" @641
+    "__rmtmp" @642
+    "__scrsize" @643
+    "__searchenv" @644
+    "__seek_hdr" @645
+    "__sfnlwr" @646
+    "__signal_os2" @647
+    "__signal_sysv" @648
+    "__sleep2" @649
+    "__splitargs" @650
+    "__splitpath" @651
+    "__status87" @652
+    "__std_abort" @653
+    "__std_abs" @654
+    "__std_access" @655
+    "__std_acos" @656
+    "__std_acosl" @657
+    "__std_alarm" @658
+    "__std_asctime" @659
+    "__std_asctime_r" @660
+    "__std_asin" @661
+    "__std_asinl" @662
+    "__std_atan" @663
+    "__std_atan2" @664
+    "__std_atan2l" @665
+    "__std_atanl" @666
+    "__std_atexit" @667
+    "__std_atof" @668
+    "__std_atofl" @669
+    "__std_atoi" @670
+    "__std_atol" @671
+    "__std_atoll" @672
+    "__std_basename" @673
+    "__std_bcmp" @674
+    "__std_bcopy" @675
+    "__std_brk" @676
+    "__std_bsd_signal" @677
+    "__std_bsearch" @678
+    "__std_bzero" @679
+    "__std_calloc" @680
+    "__std_canonicalize_file_name" @681
+    "__std_cbrt" @682
+    "__std_cbrtl" @683
+    "__std_ceil" @684
+    "__std_ceill" @685
+    "__std_cfgetispeed" @686
+    "__std_cfgetospeed" @687
+    "__std_cfsetispeed" @688
+    "__std_cfsetospeed" @689
+    "__std_cfsetspeed" @690
+    "__std_chdir" @691
+    "__std_chmod" @692
+    "__std_chown" @693
+    "__std_chroot" @694
+    "__std_chsize" @695
+    "__std_clearerr" @696
+    "__std_clock" @697
+    "__std_close" @698
+    "__std_closedir" @699
+    "__std_copysign" @700
+    "__std_copysignf" @701
+    "__std_copysignl" @702
+    "__std_cos" @703
+    "__std_cosh" @704
+    "__std_coshl" @705
+    "__std_cosl" @706
+    "__std_creat" @707
+    "__std_ctime" @708
+    "__std_ctime_r" @709
+    "__std_cuserid" @710
+    "__std_difftime" @711
+    "__std_dirname" @712
+    "__std_div" @713
+    "__std_dlclose" @714
+    "__std_dlerror" @715
+    "__std_dlopen" @716
+    "__std_dlsym" @717
+    "__std_drand48" @718
+    "__std_dup" @719
+    "__std_dup2" @720
+    "__std_eaccess" @721
+    "__std_endpwent" @722
+    "__std_eof" @723
+    "__std_erand48" @724
+    "__std_execl" @725
+    "__std_execle" @726
+    "__std_execlp" @727
+    "__std_execlpe" @728
+    "__std_execv" @729
+    "__std_execve" @730
+    "__std_execvp" @731
+    "__std_execvpe" @732
+    "__std_exit" @733
+    "__std_exp" @734
+    "__std_expand" @735
+    "__std_expl" @736
+    "__std_fabs" @737
+    "__std_fabsl" @738
+    "__std_fchown" @739
+    "__std_fclose" @740
+    "__std_fcntl" @741
+    "__std_fdopen" @742
+    "__std_feof" @743
+    "__std_ferror" @744
+    "__std_fflush" @745
+    "__std_ffs" @746
+    "__std_fgetc" @747
+    "__std_fgetchar" @748
+    "__std_fgetpos" @749
+    "__std_fgets" @750
+    "__std_filelength" @751
+    "__std_fileno" @752
+    "__std_flock" @753
+    "__std_floor" @754
+    "__std_floorl" @755
+    "__std_flushall" @756
+    "__std_fmod" @757
+    "__std_fmodl" @758
+    "__std_fnmatch" @759
+    "__std_fopen" @760
+    "__std_fork" @761
+    "__std_fpathconf" @762
+    "__std_fprintf" @763
+    "__std_fputc" @764
+    "__std_fputchar" @765
+    "__std_fputs" @766
+    "__std_fread" @767
+    "__std_free" @768
+    "__std_freopen" @769
+    "__std_frexp" @770
+    "__std_frexpl" @771
+    "__std_fscanf" @772
+    "__std_fseek" @773
+    "__std_fseeko" @774
+    "__std_fsetpos" @775
+    "__std_fstat" @776
+    "__std_fstatfs" @777
+    "__std_fstatvfs" @778
+    "__std_fsync" @779
+    "__std_ftell" @780
+    "__std_ftello" @781
+    "__std_ftime" @782
+    "__std_ftruncate" @783
+    "__std_ftw" @784
+    "__std_fwrite" @785
+    "__std_gcvt" @786
+    "__std_getchar" @787
+    "__std_getcwd" @788
+    "__std_getdtablesize" @789
+    "__std_getegid" @790
+    "__std_getenv" @791
+    "__std_geteuid" @792
+    "__std_getfsstat" @793
+    "__std_getgid" @794
+    "__std_getgrnam" @795
+    "__std_getgroups" @796
+    "__std_getitimer" @797
+    "__std_getloadavg" @798
+    "__std_getlogin" @799
+    "__std_getopt" @800
+    "__std_getopt_long" @801
+    "__std_getopt_long_only" @802
+    "__std_getpagesize" @803
+    "__std_getpass" @804
+    "__std_getpgrp" @805
+    "__std_getpid" @806
+    "__std_getppid" @807
+    "__std_getpwent" @808
+    "__std_getrlimit" @809
+    "__std_gets" @810
+    "__std_gettimeofday" @811
+    "__std_getuid" @812
+    "__std_getw" @813
+    "__std_getwd" @814
+    "__std_glob" @815
+    "__std_globfree" @816
+    "__std_gmtime" @817
+    "__std_gmtime_r" @818
+    "__std_hcreate" @819
+    "__std_hdestroy" @820
+    "__std_hsearch" @821
+    "__std_hypot" @822
+    "__std_hypotl" @823
+    "__std_imaxabs" @824
+    "__std_imaxdiv" @825
+    "__std_index" @826
+    "__std_insque" @827
+    "__std_ioctl" @828
+    "__std_isatty" @829
+    "__std_jrand48" @830
+    "__std_kill" @831
+    "__std_killpg" @832
+    "__std_labs" @833
+    "__std_lchown" @834
+    "__std_lcong48" @835
+    "__std_ldexp" @836
+    "__std_ldexpl" @837
+    "__std_ldiv" @838
+    "__std_lfind" @839
+    "__std_link" @840
+    "__std_lltoa" @841
+    "__std_localeconv" @842
+    "__std_localtime" @843
+    "__std_localtime_r" @844
+    "__std_lockf" @845
+    "__std_log" @846
+    "__std_log10" @847
+    "__std_log10l" @848
+    "__std_logl" @849
+    "__std_longjmp" @850
+    "__std_lrand48" @851
+    "__std_lsearch" @852
+    "__std_lseek" @853
+    "__std_lstat" @854
+    "__std_ltoa" @855
+    "__std_malloc" @856
+    "__std_mblen" @857
+    "__std_mbstowcs" @858
+    "__std_mbtowc" @859
+    "__std_memalign" @860
+    "__std_memccpy" @861
+    "__std_memchr" @862
+    "__std_memcmp" @863
+    "__std_memcpy" @864
+    "__std_memicmp" @865
+    "__std_memmove" @866
+    "__std_memset" @867
+    "__std_mkdir" @868
+    "__std_mknod" @869
+    "__std_mkstemp" @870
+    "__std_mktemp" @871
+    "__std_mktime" @872
+    "__std_modf" @873
+    "__std_modfl" @874
+    "__std_mprotect" @875
+    "__std_mrand48" @876
+    "__std_nextafter" @877
+    "__std_nextafterf" @878
+    "__std_nextafterl" @879
+    "__std_nrand48" @880
+    "__std_open" @881
+    "__std_opendir" @882
+    "__std_pathconf" @883
+    "__std_pause" @884
+    "__std_pclose" @885
+    "__std_perror" @886
+    "__std_pipe" @887
+    "__std_popen" @888
+    "__std_posix_memalign" @889
+    "__std_pow" @890
+    "__std_powl" @891
+    "__std_printf" @892
+    "__std_psignal" @893
+    "__std_putchar" @894
+    "__std_putenv" @895
+    "__std_puts" @896
+    "__std_putw" @897
+    "__std_qsort" @898
+    "__std_qsort_r" @899
+    "__std_raise" @900
+    "__std_rand" @901
+    "__std_read" @902
+    "__std_readdir" @903
+    "__std_readdir_r" @904
+    "__std_readlink" @905
+    "__std_readv" @906
+    "__std_realloc" @907
+    "__std_realpath" @908
+    "__std_remove" @909
+    "__std_remque" @910
+    "__std_rename" @911
+    "__std_rewind" @912
+    "__std_rewinddir" @913
+    "__std_rindex" @914
+    "__std_rint" @915
+    "__std_rintl" @916
+    "__std_rmdir" @917
+    "__std_sbrk" @918
+    "__std_scanf" @919
+    "__std_seed48" @920
+    "__std_seekdir" @921
+    "__std_select" @922
+    "__std_setbuf" @923
+    "__std_setbuffer" @924
+    "__std_setegid" @925
+    "__std_setenv" @926
+    "__std_seteuid" @927
+    "__std_setgid" @928
+    "__std_setgroups" @929
+    "__std_setitimer" @930
+    "__std_setjmp" @931
+    "__std_setlocale" @932
+    "__std_setmode" @933
+    "__std_setpassent" @934
+    "__std_setpgid" @935
+    "__std_setpwent" @936
+    "__std_setregid" @937
+    "__std_setresgid" @938
+    "__std_setresuid" @939
+    "__std_setreuid" @940
+    "__std_setrgid" @941
+    "__std_setrlimit" @942
+    "__std_setruid" @943
+    "__std_setsid" @944
+    "__std_settimeofday" @945
+    "__std_setuid" @946
+    "__std_setvbuf" @947
+    "__std_sigaction" @948
+    "__std_sigaddset" @949
+    "__std_sigaltstack" @950
+    "__std_sigblock" @951
+    "__std_sigdelset" @952
+    "__std_sigemptyset" @953
+    "__std_sigfillset" @954
+    "__std_sighold" @955
+    "__std_sigignore" @956
+    "__std_siginterrupt" @957
+    "__std_sigismember" @958
+    "__std_siglongjmp" @959
+    "__std_signal" @960
+    "__std_sigpause" @961
+    "__std_sigpending" @962
+    "__std_sigprocmask" @963
+    "__std_sigqueue" @964
+    "__std_sigrelse" @965
+    "__std_sigset" @966
+    "__std_sigsetjmp" @967
+    "__std_sigsetmask" @968
+    "__std_sigsuspend" @969
+    "__std_sigtimedwait" @970
+    "__std_sigvec" @971
+    "__std_sigwait" @972
+    "__std_sigwaitinfo" @973
+    "__std_sin" @974
+    "__std_sinh" @975
+    "__std_sinhl" @976
+    "__std_sinl" @977
+    "__std_sleep" @978
+    "__std_snprintf" @979
+    "__std_sopen" @980
+    "__std_spawnl" @981
+    "__std_spawnle" @982
+    "__std_spawnlp" @983
+    "__std_spawnlpe" @984
+    "__std_spawnv" @985
+    "__std_spawnve" @986
+    "__std_spawnvp" @987
+    "__std_spawnvpe" @988
+    "__std_sprintf" @989
+    "__std_sqrt" @990
+    "__std_sqrtl" @991
+    "__std_srand" @992
+    "__std_srand48" @993
+    "__std_sscanf" @994
+    "__std_stat" @995
+    "__std_statfs" @996
+    "__std_statvfs" @997
+    "__std_strcat" @998
+    "__std_strchr" @999
+    "__std_strcmp" @1000
+    "__std_strcoll" @1001
+    "__std_strcpy" @1002
+    "__std_strcspn" @1003
+    "__std_strdup" @1004
+    "__std_strerror" @1005
+    "__std_strerror_r" @1006
+    "__std_strftime" @1007
+    "__std_stricmp" @1008
+    "__std_strlen" @1009
+    "__std_strlwr" @1010
+    "__std_strncat" @1011
+    "__std_strncmp" @1012
+    "__std_strncpy" @1013
+    "__std_strnicmp" @1014
+    "__std_strnset" @1015
+    "__std_strpbrk" @1016
+    "__std_strptime" @1017
+    "__std_strrchr" @1018
+    "__std_strrev" @1019
+    "__std_strset" @1020
+    "__std_strspn" @1021
+    "__std_strstr" @1022
+    "__std_strtod" @1023
+    "__std_strtof" @1024
+    "__std_strtoimax" @1025
+    "__std_strtok" @1026
+    "__std_strtok_r" @1027
+    "__std_strtol" @1028
+    "__std_strtold" @1029
+    "__std_strtoll" @1030
+    "__std_strtoul" @1031
+    "__std_strtoull" @1032
+    "__std_strtoumax" @1033
+    "__std_strupr" @1034
+    "__std_strxfrm" @1035
+    "__std_swab" @1036
+    "__std_symlink" @1037
+    "__std_sync" @1038
+    "__std_sys_errlist" @1039
+    "__std_sys_nerr" @1040
+    "__std_sysconf" @1041
+    "__std_system" @1042
+    "__std_tan" @1043
+    "__std_tanh" @1044
+    "__std_tanhl" @1045
+    "__std_tanl" @1046
+    "__std_tcdrain" @1047
+    "__std_tcflow" @1048
+    "__std_tcflush" @1049
+    "__std_tcgetattr" @1050
+    "__std_tcgetpgrp" @1051
+    "__std_tcsendbreak" @1052
+    "__std_tcsetattr" @1053
+    "__std_tcsetpgrp" @1054
+    "__std_tdelete" @1055
+    "__std_tell" @1056
+    "__std_telldir" @1057
+    "__std_tempnam" @1058
+    "__std_tfind" @1059
+    "__std_time" @1060
+    "__std_times" @1061
+    "__std_tmpfile" @1062
+    "__std_tmpnam" @1063
+    "__std_trunc" @1064
+    "__std_truncate" @1065
+    "__std_truncl" @1066
+    "__std_tsearch" @1067
+    "__std_ttyname" @1068
+    "__std_twalk" @1069
+    "__std_tzset" @1070
+    "__std_ualarm" @1071
+    "__std_ulimit" @1072
+    "__std_ulltoa" @1073
+    "__std_ultoa" @1074
+    "__std_umask" @1075
+    "__std_uname" @1076
+    "__std_ungetc" @1077
+    "__std_unlink" @1078
+    "__std_unsetenv" @1079
+    "__std_usleep" @1080
+    "__std_utime" @1081
+    "__std_utimes" @1082
+    "__std_valloc" @1083
+    "__std_vfprintf" @1084
+    "__std_vfscanf" @1085
+    "__std_vprintf" @1086
+    "__std_vscanf" @1087
+    "__std_vsnprintf" @1088
+    "__std_vsprintf" @1089
+    "__std_vsscanf" @1090
+    "__std_wait" @1091
+    "__std_wait3" @1092
+    "__std_wait4" @1093
+    "__std_waitid" @1094
+    "__std_waitpid" @1095
+    "__std_wcstombs" @1096
+    "__std_wctomb" @1097
+    "__std_write" @1098
+    "__std_writev" @1099
+    "__stream_read" @1100
+    "__stream_write" @1101
+    "__strncpy" @1102
+    "__swchar" @1103
+    "__sys_dump_heap_objs" @1104
+    "__tcalloc" @1105
+    "__tfree" @1106
+    "__theapmin" @1107
+    "__threadstore" @1108
+    "__tmalloc" @1109
+    "__tmpbuf1" @1110
+    "__tmpidx_lock" @1111
+    "__tmpidx_unlock" @1112
+    "__tmpidxnam" @1113
+    "__trealloc" @1114
+    "__trslash" @1115
+    "__uaddmem" @1116
+    "__ucalloc" @1117
+    "__uclose" @1118
+    "__ucreate" @1119
+    "__ucreate2" @1120
+    "__udefault" @1121
+    "__udestroy" @1122
+    "__uflags" @1123
+    "__uheap_type" @1124
+    "__uheap_walk" @1125
+    "__uheap_walk2" @1126
+    "__uheapchk" @1127
+    "__uheapmin" @1128
+    "__uheapset" @1129
+    "__uldiv" @1130
+    "__um_addmem_nolock" @1131
+    "__um_alloc_no_lock" @1132
+    "__um_crumb_free_maybe_lock" @1133
+    "__um_default_alloc" @1134
+    "__um_default_expand" @1135
+    "__um_default_release" @1136
+    "__um_default_shrink" @1137
+    "__um_find_bucket" @1138
+    "__um_free_maybe_lock" @1139
+    "__um_init_default_regular_heap" @1140
+    "__um_init_default_tiled_heap" @1141
+    "__um_lump_alloc" @1142
+    "__um_lump_coalesce_free" @1143
+    "__um_lump_free_maybe_lock" @1144
+    "__um_lump_link_heap" @1145
+    "__um_lump_make_free" @1146
+    "__um_lump_unlink_bucket" @1147
+    "__um_lump_unlink_heap" @1148
+    "__um_realloc" @1149
+    "__um_seg_addmem" @1150
+    "__um_seg_setmem" @1151
+    "__um_walk_error" @1152
+    "__um_walk_no_lock" @1153
+    "__umalloc" @1154
+    "__ungetc_nolock" @1155
+    "__uopen" @1156
+    "__ustats" @1157
+    "__utcalloc" @1158
+    "__utdefault" @1159
+    "__utmalloc" @1160
+    "__vsopen" @1161
+    "__warn" @1162
+    "__wildcard" @1163
+    "__year_day" @1164
+    "_argz_delete" @1165
+    "_catclose" @1166
+    "_catgets" @1167
+    "_catopen" @1168
+    "_dbm_clearerr" @1169
+    "_dbm_close" @1170
+    "_dbm_delete" @1171
+    "_dbm_dirfno" @1172
+    "_dbm_error" @1173
+    "_dbm_fetch" @1174
+    "_dbm_firstkey" @1175
+    "_dbm_nextkey" @1176
+    "_dbm_open" @1177
+    "_dbm_store" @1178
+    "_dbopen" @1179
+    "_endgrent" @1180
+    "_endnetgrent" @1181
+    "_endusershell" @1182
+    "_err_set_exit" @1183
+    "_err_set_file" @1184
+    "_errc" @1185
+    "_errx" @1186
+    "_getgrent" @1187
+    "_getgrent_r" @1188
+    "_getgrgid" @1189
+    "_getgrgid_r" @1190
+    "_getgrnam_r" @1191
+    "_getgrouplist" @1192
+    "_getmntinfo" @1193
+    "_getnetgrent" @1194
+    "_getpwent_r" @1195
+    "_getpwnam" @1196
+    "_getpwnam_r" @1197
+    "_getpwuid" @1198
+    "_getpwuid_r" @1199
+    "_getusershell" @1200
+    "_heapsort" @1201
+    "_initgroups" @1202
+    "_initstate" @1203
+    "_innetgr" @1204
+    "_isalnum" @1205
+    "_isalpha" @1206
+    "_isascii" @1207
+    "_isblank" @1208
+    "_iscntrl" @1209
+    "_isdigit" @1210
+    "_isgraph" @1211
+    "_ishexnumber" @1212
+    "_islower" @1213
+    "_isnumber" @1214
+    "_isprint" @1215
+    "_ispunct" @1216
+    "_isspace" @1217
+    "_isupper" @1218
+    "_isxdigit" @1219
+    "_lchmod" @1220
+    "_mergesort" @1221
+    "_mpool_close" @1222
+    "_mpool_filter" @1223
+    "_mpool_get" @1224
+    "_mpool_new" @1225
+    "_mpool_open" @1226
+    "_mpool_put" @1227
+    "_mpool_sync" @1228
+    "_posix_spawn" @1229
+    "_posix_spawn_file_actions_addclose" @1230
+    "_posix_spawn_file_actions_adddup2" @1231
+    "_posix_spawn_file_actions_addopen" @1232
+    "_posix_spawn_file_actions_destroy" @1233
+    "_posix_spawn_file_actions_init" @1234
+    "_posix_spawnattr_destroy" @1235
+    "_posix_spawnattr_getflags" @1236
+    "_posix_spawnattr_getpgroup" @1237
+    "_posix_spawnattr_getschedparam" @1238
+    "_posix_spawnattr_getschedpolicy" @1239
+    "_posix_spawnattr_getsigdefault" @1240
+    "_posix_spawnattr_getsigmask" @1241
+    "_posix_spawnattr_init" @1242
+    "_posix_spawnattr_setflags" @1243
+    "_posix_spawnattr_setpgroup" @1244
+    "_posix_spawnattr_setschedparam" @1245
+    "_posix_spawnattr_setschedpolicy" @1246
+    "_posix_spawnattr_setsigdefault" @1247
+    "_posix_spawnattr_setsigmask" @1248
+    "_posix_spawnp" @1249
+    "_warnx" @1250
+    "_radixsort" @1251
+    "_random" @1252
+    "_reallocf" @1253
+    "_regcomp" @1254
+    "_regerror" @1255
+    "_regexec" @1256
+    "_regfree" @1257
+    "_setgrent" @1258
+    "_setgroupent" @1259
+    "_setnetgrent" @1260
+    "_setprogname" @1261
+    "_setstate" @1262
+    "_setusershell" @1263
+    "_sl_add" @1264
+    "_sl_find" @1265
+    "_sl_free" @1266
+    "_sl_init" @1267
+    "_sradixsort" @1268
+    "_srandom" @1269
+    "_srandomdev" @1270
+    "_stpcpy" @1271
+    "_strcasestr" @1272
+    "_strlcat" @1273
+    "_strlcpy" @1274
+    "_strmode" @1275
+    "_strnstr" @1276
+    "_strsep" @1277
+    "_strsignal" @1278
+    "_sys_nsig" @1279
+    "_sys_siglist" @1280
+    "_sys_signame" @1281
+    "_toascii" @1282
+    "_tolower" @1283
+    "_toupper" @1284
+    "_verr" @1285
+    "_verrc" @1286
+    "_verrx" @1287
+    "_vwarn" @1288
+    "_vwarnc" @1289
+    "_vwarnx" @1290
+    "_warnc" @1291
+    ; new stuff

trunk/src/emx/src/lib/libc.smak

@@ -74 +74 @@
         $.omf/src/lib/sys/__initdll.obj \
         $.omf/src/lib/malloc/_heapvoting.obj \
+        $.omf/src/lib/sys/FastInfoBlocks.obj \
         $.omf/src/lib/process/fmutex.obj \
         $.omf/src/lib/sys/DosCreateEventSemEx.obj \

trunk/src/emx/src/lib/malloc/ucreate2.c

@@ -80 +80 @@
 
   /* Initialize the mutex semaphore. */
-  if (_fmutex_create (&h->fsem, (type & _HEAP_SHARED) ? _FMC_SHARED : 0) != 0)
+  if (_fmutex_create2 (&h->fsem, (type & _HEAP_SHARED) ? _FMC_SHARED : 0, "LIBC Heap") != 0)
     return NULL;
 

trunk/src/emx/src/lib/process/fmutex.c

@@ -5 +5 @@
 #define INCL_DOSPROCESS
 #define INCL_DOSERRORS
+#define INCL_DOSEXCEPTIONS
 #define INCL_FSMACROS
 #define INCL_EXAPIS
 #include <os2.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/builtin.h>
 #include <sys/fmutex.h>
 #include <sys/smutex.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MUTEX
 #include <InnoTekLIBC/logstrict.h>
 
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static void __fmutex_deadlock(_fmutex *pSem, const char *pszMsg);
+
 
 /* These functions are available even in single-thread libraries. */
@@ -22 +30 @@
 {
     LIBCLOG_ENTER("sem=%p flags=%#x\n", (void *)sem, flags);
+    unsigned rc = _fmutex_create2(sem, flags, NULL);
+    LIBCLOG_RETURN_UINT(rc);
+}
+
+
+unsigned _fmutex_create2(_fmutex *sem, unsigned flags, const char *pszDesc)
+{
+    LIBCLOG_ENTER("sem=%p flags=%#x pszDesc=%s\n", (void *)sem, flags, pszDesc);
     unsigned rc;
 
+    sem->hev        = 0;
+    sem->Owner      = 0;
     sem->fs         = _FMS_AVAILABLE;
     sem->flags      = flags;
     sem->padding[0] = 'f';
-    sem->padding[1] = 'm';
+    sem->padding[0] = 'm';
+    sem->pszDesc    = pszDesc;
     rc = DosCreateEventSemEx(NULL, (PHEV)&sem->hev,
                              (flags & _FMC_SHARED) ? DC_SEM_SHARED : 0,
                              FALSE);
-
     LIBCLOG_RETURN_UINT(rc);
 }
@@ -38 +56 @@
 unsigned _fmutex_open(_fmutex *sem)
 {
-    LIBCLOG_ENTER("sem=%p\n", (void *)sem);
+    LIBCLOG_ENTER("sem=%p{.pszDesc=%s}\n", (void *)sem, sem->pszDesc);
     unsigned rc = DosOpenEventSemEx(NULL, (PHEV)&sem->hev);
     LIBCLOG_RETURN_UINT(rc);
@@ -46 +64 @@
 unsigned _fmutex_close(_fmutex *sem)
 {
-    LIBCLOG_ENTER("sem=%p\n", (void *)sem);
+    LIBCLOG_ENTER("sem=%p{.pszDesc=%s}\n", (void *)sem, sem->pszDesc);
     unsigned rc = DosCloseEventSemEx(sem->hev);
     LIBCLOG_RETURN_UINT(rc);
@@ -54 +72 @@
 unsigned __fmutex_request_internal(_fmutex *sem, unsigned flags, signed char fs)
 {
-    LIBCLOG_ENTER("sem=%p flags=%#x fs=%#x\n", (void *)sem, flags, (int)fs);
+    LIBCLOG_ENTER("sem=%p{.pszDesc=%s} flags=%#x fs=%#x\n", (void *)sem, sem->pszDesc, flags, (int)fs);
     int     rc;
-    PTIB    pTib;
-    PPIB    pPib;
 
     if (fs == _FMS_UNINIT)
@@ -70 +86 @@
         {
             if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
+            {
+                __atomic_xchg(&sem->Owner, fibGetTidPid());
                 LIBCLOG_RETURN_UINT(0);
+            }
         }
         LIBCLOG_RETURN_UINT(ERROR_MUTEX_OWNED);
@@ -85 +104 @@
             LIBCLOG_RETURN_UINT(rc);
         if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
+        {
+            __atomic_xchg(&sem->Owner, fibGetTidPid());
             LIBCLOG_RETURN_UINT(0);
+        }
+        if (sem->Owner == fibGetTidPid())
+        {
+            __fmutex_deadlock(sem, "Recursive mutex!");
+            LIBCLOG_RETURN_UINT(-1);
+        }
+
         FS_SAVE_LOAD();
 
-        do
+        for (;;)
         {
             rc = DosWaitEventSem(sem->hev, sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000);
@@ -101 +129 @@
                 if (!(flags & _FMR_IGNINT))
                     break;
-                DosGetInfoBlocks(&pTib, &pPib);
-                if (pPib->pib_flstatus & (0x40/*dying*/ | 0x04/*exiting all*/ | 0x02/*Exiting Thread 1*/ | 0x01/* ExitList */))
+                if (fibIsInExit())
                     break;
                 rc = ERROR_TIMEOUT;
             }
-            if (rc == ERROR_TIMEOUT && !(sem->flags & _FMC_SHARED))
-            {
-                /*
-                 * Deadlock detection - if this is the only thread of the
-                 * process we should just kill our selves.
-                 * ASSUME thread ids are reused and upper thread limit or 4k.
-                 */
-                int iThread;
-                DosGetInfoBlocks(&pTib, &pPib);
-                for (iThread = 1; iThread < 4096; iThread++)
-                {
-                    if (iThread != pTib->tib_ptib2->tib2_ultid
-                        && !DosVerifyPidTid(pPib->pib_ulpid, iThread))
-                        break;
-                }
-                if (iThread >= 4096)
-                { /* No other threads! */
-                    ULONG ul;
-                    DosWrite((HFILE)2/*stderr*/, "\r\n!!!deadlock!!!\r\r", 18, &ul);
-                    __asm__ __volatile__("movl $0xdead10cc, %%eax; movl $0xdead10cc, %%edx; movl %0, %%ecx; int $3" : : "m" (sem) : "%eax", "%edx", "%ecx");
-                    rc = ERROR_SEM_OWNER_DIED;
-                    break;
-                }
-            }
-        } while (rc == ERROR_TIMEOUT);
+            if (rc != ERROR_TIMEOUT)
+                break;
+            /*
+             * Deadlock detection - check if owner is around.
+             */
+            unsigned Owner = sem->Owner;
+            if (!Owner)
+                break;
+            rc = DosVerifyPidTid(Owner & 0xffff, Owner >> 16);
+            if (rc)
+            {
+                __fmutex_deadlock(sem, "Owner died!");
+                rc = ERROR_SEM_OWNER_DIED;
+                break;
+            }
+        }
         FS_RESTORE();
         if (rc != 0)
@@ -137 +155 @@
 }
 
+unsigned __fmutex_request_internal_must_complete(_fmutex *sem, unsigned flags)
+{
+    LIBCLOG_ENTER("sem=%p{.pszDesc=%s} flags=%#x\n", (void *)sem, sem->pszDesc, flags);
+    int     rc;
+    ULONG   ulNesting = 0;
+    FS_VAR();
+
+    if (sem->fs == _FMS_UNINIT)
+    {
+        LIBC_ASSERTM_FAILED("Invalid handle, fs == _FMS_UNINIT\n");
+        LIBCLOG_RETURN_UINT(ERROR_INVALID_HANDLE);
+    }
+
+    FS_SAVE_LOAD();
+    DosEnterMustComplete(&ulNesting);
+    if (flags & _FMR_NOWAIT)
+    {
+        if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
+        {
+            __atomic_xchg(&sem->Owner, fibGetTidPid());
+            FS_RESTORE();
+            LIBCLOG_RETURN_UINT(0);
+        }
+        DosExitMustComplete(&ulNesting);
+        FS_RESTORE();
+        LIBCLOG_RETURN_UINT(ERROR_MUTEX_OWNED);
+    }
+
+    for (;;)
+    {
+        ULONG ulCount;
+        rc = DosResetEventSem(sem->hev, &ulCount);
+        if (rc != 0 && rc != ERROR_ALREADY_RESET)
+        {
+            DosExitMustComplete(&ulNesting);
+            FS_RESTORE();
+            LIBCLOG_RETURN_UINT(rc);
+        }
+        if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
+        {
+            __atomic_xchg(&sem->Owner, fibGetTidPid());
+            FS_RESTORE();
+            LIBCLOG_RETURN_UINT(0);
+        }
+        if (sem->Owner == fibGetTidPid())
+        {
+            DosExitMustComplete(&ulNesting);
+            __fmutex_deadlock(sem, "Recursive mutex!");
+            FS_RESTORE();
+            LIBCLOG_RETURN_UINT(-1);
+        }
+
+        for (;;)
+        {
+            DosExitMustComplete(&ulNesting);
+            rc = DosWaitEventSem(sem->hev, sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000);
+            DosEnterMustComplete(&ulNesting);
+            if (rc == ERROR_INTERRUPT)
+            {
+                /*
+                 * An interrupt occured, this might be a bug in the wait, or
+                 * more likely someone is killing us. If we're dying/exiting or
+                 * something along those lines, we return to the caller no matter
+                 * what flags it specified.
+                 */
+                if (!(flags & _FMR_IGNINT))
+                    break;
+                if (fibIsInExit())
+                    break;
+                rc = ERROR_TIMEOUT;
+            }
+            if (rc != ERROR_TIMEOUT)
+                break;
+            /*
+             * Deadlock detection - check if owner is around.
+             */
+            unsigned Owner = sem->Owner;
+            if (!Owner)
+                break;
+            rc = DosVerifyPidTid(Owner & 0xffff, Owner >> 16);
+            if (rc)
+            {
+                DosExitMustComplete(&ulNesting);
+                __fmutex_deadlock(sem, "Owner died!");
+                rc = ERROR_SEM_OWNER_DIED;
+                DosEnterMustComplete(&ulNesting);
+                break;
+            }
+        }
+        FS_RESTORE();
+        if (rc != 0)
+        {
+            DosExitMustComplete(&ulNesting);
+            FS_RESTORE();
+            LIBCLOG_RETURN_UINT(rc);
+        }
+    }
+}
+
+
+static void __fmutex_deadlock(_fmutex *pSem, const char *pszMsg)
+{
+    ULONG ul;
+    static const char szMsg[] = "\r\n!!!deadlock!!! ";
+    DosWrite(2, szMsg, sizeof(szMsg), &ul);
+    if (pSem->pszDesc)
+    {
+        DosWrite(2, pSem->pszDesc, strlen(pSem->pszDesc), &ul);
+        DosWrite(2, " ", 1, &ul);
+    }
+    if (pszMsg)
+        DosWrite(2, pszMsg, strlen(pszMsg), &ul);
+    static const char szNewLine[] = "\r\n";
+    DosWrite(2, szNewLine, sizeof(szNewLine), &ul);
+    __asm__ __volatile__("movl $0xdead10cc, %%eax; movl $0xdead10cc, %%edx; movl %0, %%ecx; int $3" : : "m" (pSem) : "%eax", "%edx", "%ecx");
+}
+
+unsigned __fmutex_release_internal_must_complete(_fmutex *sem)
+{
+    ULONG ulNesting;
+    __atomic_xchg(&sem->Owner, 0);
+    signed char fs = __cxchg(&sem->fs, _FMS_AVAILABLE);
+    if (fs != _FMS_OWNED_HARD)
+    {
+        FS_VAR_SAVE_LOAD();
+        DosExitMustComplete(&ulNesting);
+        FS_RESTORE();
+        return 0;
+    }
+    else
+    {
+        int rc = __fmutex_release_internal (sem);
+        FS_VAR_SAVE_LOAD();
+        DosExitMustComplete(&ulNesting);
+        FS_RESTORE();
+        return rc;
+    }
+}
 
 unsigned __fmutex_release_internal(_fmutex *sem)
 {
-    LIBCLOG_ENTER("sem=%p\n", (void *)sem);
+    LIBCLOG_ENTER("sem=%p{.pszDesc=%s}\n", (void *)sem, sem->pszDesc);
     unsigned rc;
     FS_VAR();
@@ -204 +360 @@
 {
     LIBCLOG_ENTER("sem=%p\n", (void *)sem);
-    sem->fs  = _FMS_AVAILABLE;
     sem->hev = 0;
+    sem->fs = _FMS_AVAILABLE;
+    sem->flags = _FMC_DUMMY;
+    sem->Owner = 0;
+    sem->pszDesc = "dummy";
     LIBCLOG_RETURN_VOID();
 }
+

trunk/src/emx/src/lib/process/fmutex2.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
+#include <os2emx.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/builtin.h>
 #include <sys/fmutex.h>
@@ -17 +19 @@
     {
         LIBC_ASSERT_FAILED();
-        abort();
+        _fmutex_abort(NULL, "checked close");
     }
     LIBCLOG_RETURN_VOID();
@@ -29 +31 @@
     {
         LIBC_ASSERT_FAILED();
-        abort();
+        _fmutex_abort(NULL, "checked create");
+    }
+    LIBCLOG_RETURN_VOID();
+}
+
+void _fmutex_checked_create2(_fmutex *sem, unsigned flags, const char *pszDesc)
+{
+    LIBCLOG_ENTER("sem=%p flags=%#x pszDesc=%s\n", sem, flags, pszDesc);
+    if (_fmutex_create2(sem, flags, pszDesc) != 0)
+    {
+        LIBC_ASSERT_FAILED();
+        _fmutex_abort(NULL, "checked create2");
     }
     LIBCLOG_RETURN_VOID();
@@ -41 +54 @@
     {
         LIBC_ASSERT_FAILED();
-        abort();
+        _fmutex_abort(sem, "open");
     }
     LIBCLOG_RETURN_VOID();
 }
+
+void _fmutex_abort(_fmutex *pSem, const char *pszMsg)
+{
+    ULONG ul;
+    static const char szMsg1[] = "\r\n_fmutex operation failed: ";
+    DosWrite(2, szMsg1, sizeof(szMsg1), &ul);
+    if (pSem && pSem->pszDesc)
+    {
+        DosWrite(2, pSem->pszDesc, strlen(pSem->pszDesc), &ul);
+        DosWrite(2, " ", 1, &ul);
+    }
+    if (pszMsg)
+        DosWrite(2, pszMsg, strlen(pszMsg), &ul);
+
+    static const char szMsg2[] = "\r\n";
+    DosWrite(2, szMsg2, sizeof(szMsg2), &ul);
+
+    abort();
+}
+

trunk/src/emx/src/lib/sys/DosEx.c

@@ -725 +725 @@
 
     /*
-     * Figure out the curren tid.
+     * Figure out the current tid.
      */
     FS_SAVE_LOAD();

trunk/src/emx/src/lib/sys/__init.c

@@ -29 +29 @@
 #include <InnoTekLIBC/sharedpm.h>
 #include <InnoTekLIBC/backend.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 #define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_INITTERM
 #include <InnoTekLIBC/logstrict.h>
@@ -177 +178 @@
     } * pStackFrame;
     int       rc;
-    PTIB      ptib;
-    PPIB      ppib;
     int       cb;
 
@@ -189 +188 @@
 
     __libc_HeapEndVoting();
-
-
-    /*
-     * Get ptib and ppib again, in case __init() has already been called for a DLL.
-     */
-    /** @todo replace by fast info block code. */
-    rc = DosGetInfoBlocks(&ptib, &ppib);
-    if (rc != 0)
-        goto failure;
 
     /*
@@ -205 +195 @@
      *    Redo the parsing, but setup argv now.
      */
-    cb = parse_args(ppib->pib_pchcmd, NULL, NULL);
+    cb = parse_args(fibGetCmdLine(), NULL, NULL);
     cb += (argc + 1) * sizeof (char *) + sizeof (struct stackframe);
     cb = (cb + 15) & ~15;
@@ -215 +205 @@
     pStackFrame->argc = argc;
     pStackFrame->argv = &pStackFrame->apszArg[0];
-    parse_args(ppib->pib_pchcmd, pStackFrame->argv, (char*)&pStackFrame->argv[argc + 1]);
+    parse_args(fibGetCmdLine(), pStackFrame->argv, (char*)&pStackFrame->argv[argc + 1]);
     pStackFrame->argv[argc] = NULL;
 

trunk/src/emx/src/lib/sys/__initdll.c

@@ -39 +39 @@
 #include <InnoTekLIBC/libc.h>
 #include <InnoTekLIBC/backend.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 #define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_INITTERM
 #include <InnoTekLIBC/logstrict.h>
@@ -93 +94 @@
     ULONG               aul[2];
     int                 rc;
-    PTIB                ptib;
-    PPIB                ppib;
     __LIBC_PSPMPROCESS  pSelf;
 
@@ -113 +112 @@
         return 0;
     fInitialized = 1;
+
+    /*
+     * Init fast infoblocks.
+     */
+    rc = __libc_back_fibInit(0);
+    if (rc)
+        return -1;
 
     /*
@@ -136 +142 @@
      * and ppib.
      */
-    /** @todo This must be replaced by the fast info block code from Odin/kLib. */
-    rc = DosGetInfoBlocks(&ptib, &ppib);
-    if (rc != 0)
-        return -1;
-    _sys_pid = ppib->pib_ulpid;
-    _sys_ppid = ppib->pib_ulppid;
+    _sys_pid = fibGetPid();
+    _sys_ppid = fibGetPPid();
 
     /*
      * Initialize the heap semaphores.
      */
-    if (_fmutex_create(&_sys_heap_fmutex, 0) != 0)
-        return -1;
-    if (_fmutex_create(&_sys_gmtxHimem, 0) != 0)
-        return -1;
-    if (_fmutex_create(&__libc_gmtxExec, 0) != 0)
+    if (_fmutex_create2(&_sys_heap_fmutex, 0, "LIBC SYS Heap Mutex") != 0)
+        return -1;
+    if (_fmutex_create2(&_sys_gmtxHimem,   0, "LIBC SYS Highmem Mutex") != 0)
+        return -1;
+    if (_fmutex_create2(&__libc_gmtxExec,  0, "LIBC SYS Exec Mutex") != 0)
         return -1;
 
@@ -166 +168 @@
      * Setup environment (org_environ and _STD(environ))
      */
-    rc = _sys_init_environ(ppib->pib_pchenv);
+    rc = _sys_init_environ(fibGetEnv());
     if (rc)
     {
@@ -215 +217 @@
      * Get current time for clock() for use as process startup time.
      */
-    _sys_get_clock(&_sys_clock0_ms);
+    _sys_clock0_ms = fibGetMsCount();
     return 0;
 }
@@ -226 +228 @@
 void _sys_get_clock(unsigned long *pms)
 {
-    ULONG val_ms;
-    FS_VAR();
-
-    FS_SAVE_LOAD();
-    DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &val_ms, sizeof(val_ms));
-    FS_RESTORE();
-    *pms = val_ms;
+    *pms = fibGetMsCount();
 }
 
@@ -298 +294 @@
             _sys_pid = pForkHandle->pidChild;
             _sys_ppid = pForkHandle->pidParent;
+            __libc_back_fibInit(1);
+            _sys_clock0_ms = fibGetMsCount();
             rc = 0;
             break;

trunk/src/emx/src/lib/sys/b_processWait.c

@@ -48 +48 @@
 #include <InnoTekLIBC/sharedpm.h>
 #include <InnoTekLIBC/backend.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_PROCESS
 #include <InnoTekLIBC/logstrict.h>
@@ -758 +759 @@
     FS_VAR();
     FS_SAVE_LOAD();
-    PPIB        pPib;
-    PTIB        pTib;
-    DosGetInfoBlocks(&pTib, &pPib);
     int rc = waitSemRequest(0);
     if (rc)
@@ -920 +918 @@
          */
         if (    cIterations >= 1
-            &&  (pPib->pib_flstatus & (0x40/*dying*/ | 0x04/*exiting all*/ | 0x02/*Exiting Thread 1*/ | 0x01/*ExitList */))
-            )
-            LIBCLOG_RETURN_MSG(-EDEADLK, "%d (-EDEADLK) pib_flstatus=%#lx\n", -EDEADLK, pPib->pib_flstatus);
+            &&  fibIsInExit())
+            LIBCLOG_RETURN_MSG(-EDEADLK, "%d (-EDEADLK) pib_flstatus=%#x\n", -EDEADLK, (unsigned)fibGetProcessStatus());
         rc = DosWaitEventSem(ghevWait, 30*1000);
         if (rc == ERROR_INTERRUPT)

trunk/src/emx/src/lib/sys/b_threadInit.c

@@ -29 +29 @@
 *******************************************************************************/
 #include "libc-alias.h"
+#define INCL_DOSEXCEPTIONS
+#define INCL_FSMACROS
 #include <os2emx.h>
 #include <sys/signal.h>
@@ -43 +45 @@
     pThrd->b.sys.fd.cFiles = 0;
 
-    /*
-     * Gain exclusive access to the signal stuff.
-     */
-    int rc = __libc_back_signalSemRequest();
+    if (pParentThrd && pParentThrd->tid)
+    {
+        /*
+         * We don't mess with the signal semaphore here because that *will*
+         * cause deadlocks. So to protect ourselves against signals
+         * we'll simply enter a must complete section while accessing the
+         * variables. This naturally assumes that WE are the parent!
+         */
+        FS_VAR_SAVE_LOAD();
+        ULONG ulNesting = 0;
+        DosEnterMustComplete(&ulNesting);
 
-    /*
-     * Copy signal stuff.
-     */
-    if (pParentThrd)
-    {
+        /*
+         * Copy signal stuff.
+         */
         pThrd->SigSetBlocked    = pParentThrd->SigSetBlocked;
         if (pParentThrd->fSigSetBlockedOld)
@@ -59 +66 @@
             pThrd->fSigSetBlockedOld    = pParentThrd->fSigSetBlockedOld;
         }
+
+        /*
+         * Exit must complete section.
+         */
+        DosExitMustComplete(&ulNesting);
+        FS_RESTORE();
     }
-
-    /*
-     * Release semaphore.
-     */
-    if (!rc)
-        __libc_back_signalSemRelease();
 }
 

trunk/src/emx/src/lib/sys/execname.c

@@ -8 +8 @@
 #include <string.h>
 #include <emx/syscalls.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 #include "syscalls.h"
 
@@ -13 +14 @@
 {
   ULONG rc;
-  PTIB ptib;
-  PPIB ppib;
   FS_VAR();
 
@@ -21 +20 @@
 
   FS_SAVE_LOAD();
-  rc = DosGetInfoBlocks (&ptib, &ppib);
-  if (rc != 0)
-    {
-      FS_RESTORE();
-      *dst = 0;
-      return -1;
-    }
-
-  rc = DosQueryModuleName (ppib->pib_hmte, size, dst);
+  rc = DosQueryModuleName (fibGetExeHandle(), size, dst);
   FS_RESTORE();
   if (rc != 0)

trunk/src/emx/src/lib/sys/filehandles.c

@@ -119 +119 @@
      * Init the mutex which should've been a read write lock.
      */
-    rc = _fmutex_create(&gmtx, 0);
+    rc = _fmutex_create2(&gmtx, 0, "LIBC SYS Filehandle Mutex");
     if (rc)
         return rc;

trunk/src/emx/src/lib/sys/fs.c

@@ -211 +211 @@
      * Create the mutex.
      */
-    int rc = _fmutex_create(&__libc_gmtxFS, 0);
+    int rc = _fmutex_create2(&__libc_gmtxFS, 0, "LIBC SYS FS Mutex");
     if (rc)
         LIBCLOG_RETURN_INT(-1);

trunk/src/emx/src/lib/sys/libcfork.c

@@ -47 +47 @@
 #include <InnoTekLIBC/fork.h>
 #include <InnoTekLIBC/sharedpm.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 #define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_FORK
 #include <InnoTekLIBC/logstrict.h>
@@ -779 +780 @@
     LIBCLOG_ENTER("pForkHandle=%p ppid=%p\n", (void *)pForkHandle, (void *)ppid);
     __LIBC_PSPMPROCESS  pProcessChild;
-    PTIB                pTib;
-    PPIB                pPib;
     char                szPgm[CCHMAXPATH];
     int                 rc;
@@ -807 +806 @@
      */
     pForkHandle->enmStage = __LIBC_FORK_STAGE_EXEC;
-    DosGetInfoBlocks(&pTib, &pPib);
-    rc = DosQueryModuleName(pPib->pib_hmte, sizeof(szPgm), &szPgm[0]);
+    rc = DosQueryModuleName(fibGetExeHandle(), sizeof(szPgm), &szPgm[0]);
     if (!rc)
     {
@@ -814 +812 @@
         RESULTCODES rsc = {0,0};
         #if 1
-        rc = DosExecPgm(szErr, sizeof(szErr), EXEC_ASYNCRESULT, (PCSZ)pPib->pib_pchcmd, NULL, &rsc, (PCSZ)&szPgm[0]);
+        rc = DosExecPgm(szErr, sizeof(szErr), EXEC_ASYNCRESULT, (PCSZ)fibGetCmdLine(), NULL, &rsc, (PCSZ)&szPgm[0]);
         #else /* debugging checks */
         rc = DosExecPgm(szErr, sizeof(szErr), EXEC_ASYNCRESULT, (PCSZ)"forking\0forking\0", NULL, &rsc, (PCSZ)&szPgm[0]);
@@ -842 +840 @@
         else
         {
-            LIBC_ASSERTM_FAILED("DosExecPgm(,,,%s,,,%s..) failed with rc=%d, szErr=%s\n", szPgm, pPib->pib_pchcmd, rc, szErr);
+            LIBC_ASSERTM_FAILED("DosExecPgm(,,,%s,,,%s..) failed with rc=%d, szErr=%s\n", szPgm, fibGetCmdLine(), rc, szErr);
             rc = -__libc_native2errno(rc);
         }
@@ -848 +846 @@
     else
     {
-        LIBC_ASSERTM_FAILED("DosQueryModuleName(%lx,,) failed with rc=%d\n", pPib->pib_hmte, rc);
+        LIBC_ASSERTM_FAILED("DosQueryModuleName(%lx,,) failed with rc=%d\n", fibGetExeHandle(), rc);
         rc = -__libc_native2errno(rc);
     }

trunk/src/emx/src/lib/sys/signals.c

@@ -82 +82 @@
 #include <InnoTekLIBC/fork.h>
 #include <InnoTekLIBC/backend.h>
+#include <InnoTekLIBC/FastInfoBlocks.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_SIGNAL
 #include <InnoTekLIBC/logstrict.h>
@@ -701 +702 @@
     LIBCLOG_ENTER("\n");
     int     rc;
-    PPIB    pPib;
-    PTIB    pTib;
     ULONG   cNesting;
     FS_VAR();
@@ -710 +709 @@
     {
         HMTX    hmtx = ghmtxSignals;
-        rc = DosRequestMutexSem(hmtx, SEM_INDEFINITE_WAIT);
+        rc = DosRequestMutexSem(hmtx, 3000);
         if (!rc)
             break;
-        if (rc == ERROR_INTERRUPT)
+        if (rc == ERROR_INTERRUPT || rc == ERROR_SEM_TIMEOUT || rc == ERROR_TIMEOUT)
         {
             /*
@@ -723 +722 @@
              * lead to bad deadlocks.
              */
-            DosGetInfoBlocks(&pTib, &pPib);
-            if (pPib->pib_flstatus & (0x40/*dying*/ | 0x04/*exiting all*/ | 0x02/*Exiting Thread 1*/ | 0x01/* ExitList */))
+            if (fibIsInExit())
             {
                 /* we're terminating, don't give a shit about signals now, just hurry up and die! */

trunk/src/emx/src/lib/sys/timebomb.c

@@ -33 +33 @@
 
 #ifdef TIMEBOMB
-
 _CRT_INIT1(__libc_Timebomb)
+#endif
 
 void __libc_Timebomb(void)
@@ -65 +65 @@
 }
 
-#endif