Changeset 2726


Ignore:
Timestamp:
Jul 18, 2006, 12:15:11 AM (19 years ago)
Author:
bird
Message:

Fast info blocks for Nt. Updated all users of the old header to user the klibc one.

Location:
trunk/libc
Files:
3 added
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/libc/include/klibc/os2/fib.h

    r2724 r2726  
    2525 */
    2626
    27 #ifndef __InnoTekLIBC_FastInfoBlocks_h__
    28 #define __InnoTekLIBC_FastInfoBlocks_h__
     27#ifndef __klibc_os2_fib_h__
     28#define __klibc_os2_fib_h__
    2929
    3030#include <sys/cdefs.h>
  • trunk/libc/include/sys/fmutex.h

    r2723 r2726  
    1010#include <sys/cdefs.h>
    1111#include <stdlib.h> /* need abort */
    12 #include <InnoTekLIBC/FastInfoBlocks.h>
    13 #include <386/builtin.h>
     12#include <klibc/fib.h>
     13#include <sys/builtin.h>
    1414
    1515__BEGIN_DECLS
  • trunk/libc/src/kNIX.os2/FastInfoBlocks.c

    r1666 r2726  
    3434#define INCL_FSMACROS
    3535#include <os2emx.h>
    36 #include <InnoTekLIBC/FastInfoBlocks.h>
     36#include <klibc/fib.h>
    3737#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MISC
    3838#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/kNIX.os2/__init.c

    r2021 r2726  
    2929#include <InnoTekLIBC/sharedpm.h>
    3030#include <InnoTekLIBC/backend.h>
    31 #include <InnoTekLIBC/FastInfoBlocks.h>
     31#include <klibc/fib.h>
    3232#define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_INITTERM
    3333#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/kNIX.os2/__initdll.c

    r2021 r2726  
    4040#include <InnoTekLIBC/libc.h>
    4141#include <InnoTekLIBC/backend.h>
    42 #include <InnoTekLIBC/FastInfoBlocks.h>
     42#include <klibc/fib.h>
    4343#define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_INITTERM
    4444#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/kNIX.os2/b_processGetPriority.c

    r2254 r2726  
    3535#include <InnoTekLIBC/backend.h>
    3636#include <InnoTekLIBC/sharedpm.h>
    37 #include <InnoTekLIBC/FastInfoBlocks.h>
     37#include <klibc/fib.h>
    3838#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_PROCESS
    3939#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/kNIX.os2/b_processWait.c

    r2254 r2726  
    4949#include <InnoTekLIBC/sharedpm.h>
    5050#include <InnoTekLIBC/backend.h>
    51 #include <InnoTekLIBC/FastInfoBlocks.h>
     51#include <klibc/fib.h>
    5252#include <InnoTekLIBC/fork.h>
    5353#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_PROCESS
  • trunk/libc/src/kNIX.os2/b_threadSleep.c

    r2254 r2726  
    4040#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_THREAD
    4141#include <InnoTekLIBC/logstrict.h>
    42 #include <InnoTekLIBC/FastInfoBlocks.h>
     42#include <klibc/fib.h>
    4343#include "b_signal.h"
    4444
  • trunk/libc/src/kNIX.os2/execname.c

    r1661 r2726  
    88#include <string.h>
    99#include <emx/syscalls.h>
    10 #include <InnoTekLIBC/FastInfoBlocks.h>
     10#include <klibc/fib.h>
    1111#include "syscalls.h"
    1212
  • trunk/libc/src/kNIX.os2/libcfork.c

    r2289 r2726  
    4747#include <InnoTekLIBC/fork.h>
    4848#include <InnoTekLIBC/sharedpm.h>
    49 #include <InnoTekLIBC/FastInfoBlocks.h>
     49#include <klibc/fib.h>
    5050#define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_FORK
    5151#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/kNIX.os2/safesems.c

    r2307 r2726  
    3939#include "syscalls.h"
    4040#include <sys/builtin.h>
    41 #include <InnoTekLIBC/FastInfoBlocks.h>
     41#include <klibc/fib.h>
    4242#include <InnoTekLIBC/thread.h>
    4343#include <InnoTekLIBC/backend.h>
  • trunk/libc/src/kNIX.os2/signals.c

    r2672 r2726  
    8282#include <InnoTekLIBC/fork.h>
    8383#include <InnoTekLIBC/backend.h>
    84 #include <InnoTekLIBC/FastInfoBlocks.h>
     84#include <klibc/fib.h>
    8585#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_SIGNAL
    8686#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/kNIX.os2/sysv_sem.c

    r2298 r2726  
    3030#include <InnoTekLIBC/sharedpm.h>
    3131#include <InnoTekLIBC/thread.h>
    32 #include <InnoTekLIBC/FastInfoBlocks.h>
     32#include <klibc/fib.h>
    3333#include <InnoTekLIBC/libc.h>
    3434#include <InnoTekLIBC/backend.h>
     
    13291329         * having OS/2 cleanup semaphores than doing it here.
    13301330         */
    1331 dereference:                   
     1331dereference:
    13321332        __atomic_decrement_u32(&gpGlobals->cUsers);
    13331333        gpGlobals = NULL;
  • trunk/libc/src/kNIX.os2/sysv_shm.c

    r2298 r2726  
    5757#include <InnoTekLIBC/sharedpm.h>
    5858#include <InnoTekLIBC/thread.h>
    59 #include <InnoTekLIBC/FastInfoBlocks.h>
     59#include <klibc/fib.h>
    6060#include <InnoTekLIBC/libc.h>
    6161#include <InnoTekLIBC/fork.h>
     
    349349                LIBCLOG_ERROR_RETURN_INT(error);
    350350        }
    351        
     351
    352352        error = __libc_Back_safesemMtxLock(&gpGlobals->mtx);
    353353        if (error)
     
    399399        }
    400400        struct __libc_SysV_Shm *pGlobals = gpGlobals;
    401        
     401
    402402        error = __libc_Back_safesemMtxLock(&pGlobals->mtx);
    403403        if (error)
     
    434434        if (error)
    435435                goto done2;
    436        
     436
    437437        /* Find free usage struct. */
    438438        for (i = 0; i < shminfo.shmseg; i++) {
     
    483483        shmseg->shm_atime = fibGetUnixSeconds();
    484484        shmseg->shm_nattch++;
    485        
     485
    486486done2:
    487487        __libc_Back_safesemMtxUnlock(&pGlobals->mtx);
     
    521521        }
    522522        struct __libc_SysV_Shm *pGlobals = gpGlobals;
    523        
     523
    524524        error = __libc_Back_safesemMtxLock(&pGlobals->mtx);
    525525        if (error)
     
    625625        struct shmid_ds buf;
    626626        size_t bufsz;
    627        
     627
    628628        /* IPC_SET needs to copyin the buffer before calling kern_shmctl */
    629629        if (cmd == IPC_SET) {
     
    631631                        goto done;
    632632        }
    633        
     633
    634634        rval = kern_shmctl(shmid, cmd, (void *)&buf, &bufsz);
    635635        if (rval < 0)
    636636                goto done;
    637        
     637
    638638        /* Cases in which we need to copyout */
    639639        switch (cmd) {
     
    760760        }
    761761        struct __libc_SysV_Shm *pGlobals = gpGlobals;
    762        
     762
    763763        rval = __libc_Back_safesemMtxLock(&pGlobals->mtx);
    764764        if (rval)
     
    940940                LIBCLOG_ERROR_RETURN_INT(-ENOMEM);
    941941            }
    942        
     942
    943943            /* init globals */
    944944            bzero(pGlobals, cb);
     
    956956            }
    957957            pGlobals->shminfo = si;
    958        
     958
    959959            /* Set globals. */
    960960            pSPMHdr->pSysVShm = pGlobals;
  • trunk/libc/src/libc/misc/sysctl_os2.c

    r2064 r2726  
    3838#include <sys/types.h>
    3939#include <sys/time.h>
    40 #include <InnoTekLIBC/FastInfoBlocks.h>
     40#include <klibc/fib.h>
    4141#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MISC
    4242#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/libc/process/os2/fmutex-os2.c

    r2723 r2726  
    1414#include <sys/fmutex.h>
    1515#include <sys/smutex.h>
    16 #include <InnoTekLIBC/FastInfoBlocks.h>
     16#include <klibc/fib.h>
    1717#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MUTEX
    1818#include <InnoTekLIBC/logstrict.h>
  • trunk/libc/src/libc/process/os2/smutex-os2.c

    r2719 r2726  
    77#include <sys/builtin.h>
    88#include <sys/smutex.h>
    9 #include <InnoTekLIBC/FastInfoBlocks.h>
     9#include <klibc/fib.h>
    1010#include <InnoTekLIBC/backend.h>
    1111#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MUTEX
Note: See TracChangeset for help on using the changeset viewer.