Changeset 1287 for trunk/src/emx/include

Timestamp:

Mar 11, 2004, 4:05:55 AM (21 years ago)

Author:

bird

Message:

#967: Initial per thread data rewrite.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (added)
• InnoTekLIBC/thread.h (added)
• emx/syscalls.h (modified) (3 diffs, 1 prop)
• emx/thread.h (modified) (1 diff, 1 prop)
• emx/umalloc.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/emx/syscalls.h

@@ -136 +136 @@
 int __dup (int handle);
 int __dup2 (int handle1, int handle2);
-int __endthread (int tid);
+int __endthread (void *pvThrd);
 int __execname (char *buf, size_t bufsize);
 void __exit (int ret) __attribute__ ((__noreturn__));
@@ -171 +171 @@
 int __imphandle (int handle);
 int __impsockhandle (int handle, int flags);
-int __initthread (void *preg);
 int __ioctl1 (int handle, int code);
 int __ioctl2 (int handle, unsigned long request, int arg);
@@ -226 +225 @@
 int __write (int handle, __const__ void *buf, size_t nbyte);
 
-
-
 #if defined (__cplusplus)
 }

trunk/src/emx/include/emx/thread.h

@@ -1 @@
-/* emx/thread.h (emx+gcc) */
-
-#ifndef _EMX_THREAD_H
-#define _EMX_THREAD_H
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#include <time.h> /* struct tm; */
-
-struct _uheap;
-
-struct _thread
-{
-  int             _th_errno;                /* comes first, cf. errnofun.s */
-  void          * _th_arg;
-  void          (*_th_start)(void *);
-  unsigned char * _th_strtok_ptr;
-  char            _th_asctime_buf[26+2];    /* 2 chars for padding */
-  char            _th_tmpnam_buf[16];       /* cf. stdio.h */
-  struct tm       _th_gmtime_buf;
-  unsigned int    _th_rand;                 /* Used by rand() */
-  void          * _th_store;                /* Pointer to user data */
-  char            _th_vollabel[12];         /* Used by _getvol() */
-  char            _th_error[28];            /* Used by strerror() */
-  struct _uheap * _th_rheap;                /* Default regular heap */
-  struct _uheap * _th_theap;                /* Default tiled heap */
-  char            _th_ttyname[32];          /* Used by ttyname() */
-  char            _th_inetntoa[16];         /* Used by inetntoa() */
-  int             _th_reserved[974];        /* 4096 bytes, total */
-};
-
-struct _thread *_thread (void);
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* not _EMX_THREAD_H */
+#error "This file is dead. use InnoTekLIBC/thread.h!"

trunk/src/emx/include/emx/umalloc.h

@@ -606 +606 @@
 /* Each thread has its own default heap. */
 
-#define _UM_DEFAULT_REGULAR_HEAP tp->_th_rheap
-#define _UM_DEFAULT_TILED_HEAP   tp->_th_theap
-#define _UM_MT_DECL              struct _thread *tp = _thread ();
+#define _UM_DEFAULT_REGULAR_HEAP pThrd->pRegularHeap
+#define _UM_DEFAULT_TILED_HEAP   pThrd->pTiledHeap
+#define _UM_MT_DECL              __LIBC_PTHREAD pThrd = __libc_threadCurrent();
 
 /* Note that _um_regular_heap is declared in <umalloc.h>.