external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'srs.master'

Browse source
This commit is contained in:
winlin 2014-11-05 17:43:25 +08:00
commit eeec9c185f
3 changed files with 606 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

69
trunk/research/st/common.h
View file

@ -50,7 +50,7 @@
/* Enable assertions only if DEBUG is defined */ /* Enable assertions only if DEBUG is defined */
#ifndef DEBUG #ifndef DEBUG
#define NDEBUG #define NDEBUG
#endif #endif
#include <assert.h> #include <assert.h>
#define ST_ASSERT(expr) assert(expr) #define ST_ASSERT(expr) assert(expr)
@ -59,15 +59,14 @@
#define ST_END_MACRO } #define ST_END_MACRO }
#ifdef DEBUG #ifdef DEBUG
#define ST_HIDDEN /*nothing*/ #define ST_HIDDEN /*nothing*/
#else #else
#define ST_HIDDEN static #define ST_HIDDEN static
#endif #endif
#include "public.h" #include "public.h"
#include "md.h" #include "md.h"
/***************************************** /*****************************************
* Circular linked list definitions * Circular linked list definitions
*/ */
@ -137,7 +136,6 @@ typedef struct _st_clist {
typedef void (*_st_destructor_t)(void *); typedef void (*_st_destructor_t)(void *);
typedef struct _st_stack { typedef struct _st_stack {
_st_clist_t links; _st_clist_t links;
char *vaddr; /* Base of stack's allocated memory */ char *vaddr; /* Base of stack's allocated memory */
@ -146,9 +144,9 @@ typedef struct _st_stack {
char *stk_bottom; /* Lowest address of stack's usable portion */ char *stk_bottom; /* Lowest address of stack's usable portion */
char *stk_top; /* Highest address of stack's usable portion */ char *stk_top; /* Highest address of stack's usable portion */
void *sp; /* Stack pointer from C's point of view */ void *sp; /* Stack pointer from C's point of view */
#ifdef __ia64__ #ifdef __ia64__
void *bsp; /* Register stack backing store pointer */ void *bsp; /* Register stack backing store pointer */
#endif #endif
} _st_stack_t; } _st_stack_t;
@ -171,9 +169,9 @@ struct _st_thread {
_st_clist_t links; /* For putting on run/sleep/zombie queue */ _st_clist_t links; /* For putting on run/sleep/zombie queue */
_st_clist_t wait_links; /* For putting on mutex/condvar wait queue */ _st_clist_t wait_links; /* For putting on mutex/condvar wait queue */
#ifdef DEBUG #ifdef DEBUG
_st_clist_t tlink; /* For putting on thread queue */ _st_clist_t tlink; /* For putting on thread queue */
#endif #endif
st_utime_t due; /* Wakeup time when thread is sleeping */ st_utime_t due; /* Wakeup time when thread is sleeping */
_st_thread_t *left; /* For putting in timeout heap */ _st_thread_t *left; /* For putting in timeout heap */
@ -223,18 +221,18 @@ typedef struct _st_vp {
_st_clist_t run_q; /* run queue for this vp */ _st_clist_t run_q; /* run queue for this vp */
_st_clist_t io_q; /* io queue for this vp */ _st_clist_t io_q; /* io queue for this vp */
_st_clist_t zombie_q; /* zombie queue for this vp */ _st_clist_t zombie_q; /* zombie queue for this vp */
#ifdef DEBUG #ifdef DEBUG
_st_clist_t thread_q; /* all threads of this vp */ _st_clist_t thread_q; /* all threads of this vp */
#endif #endif
int pagesize; int pagesize;
_st_thread_t *sleep_q; /* sleep queue for this vp */ _st_thread_t *sleep_q; /* sleep queue for this vp */
int sleepq_size; /* number of threads on sleep queue */ int sleepq_size; /* number of threads on sleep queue */
#ifdef ST_SWITCH_CB #ifdef ST_SWITCH_CB
st_switch_cb_t switch_out_cb; /* called when a thread is switched out */ st_switch_cb_t switch_out_cb; /* called when a thread is switched out */
st_switch_cb_t switch_in_cb; /* called when a thread is switched in */ st_switch_cb_t switch_in_cb; /* called when a thread is switched in */
#endif #endif
} _st_vp_t; } _st_vp_t;
@ -265,7 +263,7 @@ extern _st_eventsys_t *_st_eventsys;
#define _ST_IOQ (_st_this_vp.io_q) #define _ST_IOQ (_st_this_vp.io_q)
#define _ST_ZOMBIEQ (_st_this_vp.zombie_q) #define _ST_ZOMBIEQ (_st_this_vp.zombie_q)
#ifdef DEBUG #ifdef DEBUG
#define _ST_THREADQ (_st_this_vp.thread_q) #define _ST_THREADQ (_st_this_vp.thread_q)
#endif #endif
#define _ST_PAGE_SIZE (_st_this_vp.pagesize) #define _ST_PAGE_SIZE (_st_this_vp.pagesize)
@ -293,8 +291,8 @@ extern _st_eventsys_t *_st_eventsys;
#define _ST_DEL_ZOMBIEQ(_thr) ST_REMOVE_LINK(&(_thr)->links) #define _ST_DEL_ZOMBIEQ(_thr) ST_REMOVE_LINK(&(_thr)->links)
#ifdef DEBUG #ifdef DEBUG
#define _ST_ADD_THREADQ(_thr) ST_APPEND_LINK(&(_thr)->tlink, &_ST_THREADQ) #define _ST_ADD_THREADQ(_thr) ST_APPEND_LINK(&(_thr)->tlink, &_ST_THREADQ)
#define _ST_DEL_THREADQ(_thr) ST_REMOVE_LINK(&(_thr)->tlink) #define _ST_DEL_THREADQ(_thr) ST_REMOVE_LINK(&(_thr)->tlink)
#endif #endif
@ -317,13 +315,12 @@ extern _st_eventsys_t *_st_eventsys;
#define _ST_FL_INTERRUPT 0x08 #define _ST_FL_INTERRUPT 0x08
#define _ST_FL_TIMEDOUT 0x10 #define _ST_FL_TIMEDOUT 0x10
/***************************************** /*****************************************
* Pointer conversion * Pointer conversion
*/ */
#ifndef offsetof #ifndef offsetof
#define offsetof(type, identifier) ((size_t)&(((type *)0)->identifier)) #define offsetof(type, identifier) ((size_t)&(((type *)0)->identifier))
#endif #endif
#define _ST_THREAD_PTR(_qp) \ #define _ST_THREAD_PTR(_qp) \
@ -339,7 +336,7 @@ extern _st_eventsys_t *_st_eventsys;
((_st_pollq_t *)((char *)(_qp) - offsetof(_st_pollq_t, links))) ((_st_pollq_t *)((char *)(_qp) - offsetof(_st_pollq_t, links)))
#ifdef DEBUG #ifdef DEBUG
#define _ST_THREAD_THREADQ_PTR(_qp) \ #define _ST_THREAD_THREADQ_PTR(_qp) \
((_st_thread_t *)((char *)(_qp) - offsetof(_st_thread_t, tlink))) ((_st_thread_t *)((char *)(_qp) - offsetof(_st_thread_t, tlink)))
#endif #endif
@ -349,21 +346,21 @@ extern _st_eventsys_t *_st_eventsys;
*/ */
#ifndef ST_UTIME_NO_TIMEOUT #ifndef ST_UTIME_NO_TIMEOUT
#define ST_UTIME_NO_TIMEOUT ((st_utime_t) -1LL) #define ST_UTIME_NO_TIMEOUT ((st_utime_t) -1LL)
#endif #endif
#ifndef __ia64__ #ifndef __ia64__
#define ST_DEFAULT_STACK_SIZE (64*1024) #define ST_DEFAULT_STACK_SIZE (64*1024)
#else #else
#define ST_DEFAULT_STACK_SIZE (128*1024) /* Includes register stack size */ #define ST_DEFAULT_STACK_SIZE (128*1024) /* Includes register stack size */
#endif #endif
#ifndef ST_KEYS_MAX #ifndef ST_KEYS_MAX
#define ST_KEYS_MAX 16 #define ST_KEYS_MAX 16
#endif #endif
#ifndef ST_MIN_POLLFDS_SIZE #ifndef ST_MIN_POLLFDS_SIZE
#define ST_MIN_POLLFDS_SIZE 64 #define ST_MIN_POLLFDS_SIZE 64
#endif #endif
@ -372,28 +369,28 @@ extern _st_eventsys_t *_st_eventsys;
*/ */
#ifdef DEBUG #ifdef DEBUG
void _st_iterate_threads(void); void _st_iterate_threads(void);
#define ST_DEBUG_ITERATE_THREADS() _st_iterate_threads() #define ST_DEBUG_ITERATE_THREADS() _st_iterate_threads()
#else #else
#define ST_DEBUG_ITERATE_THREADS() #define ST_DEBUG_ITERATE_THREADS()
#endif #endif
#ifdef ST_SWITCH_CB #ifdef ST_SWITCH_CB
#define ST_SWITCH_OUT_CB(_thread) \ #define ST_SWITCH_OUT_CB(_thread) \
if (_st_this_vp.switch_out_cb != NULL && \ if (_st_this_vp.switch_out_cb != NULL && \
_thread != _st_this_vp.idle_thread && \ _thread != _st_this_vp.idle_thread && \
_thread->state != _ST_ST_ZOMBIE) { \ _thread->state != _ST_ST_ZOMBIE) { \
_st_this_vp.switch_out_cb(); \ _st_this_vp.switch_out_cb(); \
} }
#define ST_SWITCH_IN_CB(_thread) \ #define ST_SWITCH_IN_CB(_thread) \
if (_st_this_vp.switch_in_cb != NULL && \ if (_st_this_vp.switch_in_cb != NULL && \
_thread != _st_this_vp.idle_thread && \ _thread != _st_this_vp.idle_thread && \
_thread->state != _ST_ST_ZOMBIE) { \ _thread->state != _ST_ST_ZOMBIE) { \
_st_this_vp.switch_in_cb(); \ _st_this_vp.switch_in_cb(); \
} }
#else #else
#define ST_SWITCH_OUT_CB(_thread) #define ST_SWITCH_OUT_CB(_thread)
#define ST_SWITCH_IN_CB(_thread) #define ST_SWITCH_IN_CB(_thread)
#endif #endif
/* /*
@ -424,9 +421,9 @@ void _st_iterate_threads(void);
* Initialize the thread context preparing it to execute _main * Initialize the thread context preparing it to execute _main
*/ */
#ifdef MD_INIT_CONTEXT #ifdef MD_INIT_CONTEXT
#define _ST_INIT_CONTEXT MD_INIT_CONTEXT #define _ST_INIT_CONTEXT MD_INIT_CONTEXT
#else #else
#error Unknown OS #error Unknown OS
#endif #endif
/* /*
@ -456,11 +453,9 @@ int st_cond_destroy(_st_cond_t *cvar);
int st_cond_timedwait(_st_cond_t *cvar, st_utime_t timeout); int st_cond_timedwait(_st_cond_t *cvar, st_utime_t timeout);
int st_cond_signal(_st_cond_t *cvar); int st_cond_signal(_st_cond_t *cvar);
ssize_t st_read(_st_netfd_t *fd, void *buf, size_t nbyte, st_utime_t timeout); ssize_t st_read(_st_netfd_t *fd, void *buf, size_t nbyte, st_utime_t timeout);
ssize_t st_write(_st_netfd_t *fd, const void *buf, size_t nbyte, ssize_t st_write(_st_netfd_t *fd, const void *buf, size_t nbyte, st_utime_t timeout);
st_utime_t timeout);
int st_poll(struct pollfd *pds, int npds, st_utime_t timeout); int st_poll(struct pollfd *pds, int npds, st_utime_t timeout);
_st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinable, int stk_size);
int joinable, int stk_size);
#endif /* !__ST_COMMON_H__ */ #endif /* !__ST_COMMON_H__ */

580
trunk/research/st/md.h
View file

@ -43,163 +43,157 @@
#define __ST_MD_H__ #define __ST_MD_H__
#if defined(ETIMEDOUT) && !defined(ETIME) #if defined(ETIMEDOUT) && !defined(ETIME)
#define ETIME ETIMEDOUT #define ETIME ETIMEDOUT
#endif #endif
#if defined(MAP_ANONYMOUS) && !defined(MAP_ANON) #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
#define MAP_ANON MAP_ANONYMOUS #define MAP_ANON MAP_ANONYMOUS
#endif #endif
#ifndef MAP_FAILED #ifndef MAP_FAILED
#define MAP_FAILED -1 #define MAP_FAILED -1
#endif #endif
/***************************************** /*****************************************
* Platform specifics * Platform specifics
*/ */
#if defined (AIX) #if defined (AIX)
#define MD_STACK_GROWS_DOWN
#define MD_USE_SYSV_ANON_MMAP
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_STACK_GROWS_DOWN #ifndef MD_HAVE_SOCKLEN_T
#define MD_USE_SYSV_ANON_MMAP #define MD_HAVE_SOCKLEN_T
#define MD_ACCEPT_NB_INHERITED #define socklen_t unsigned long
#define MD_ALWAYS_UNSERIALIZED_ACCEPT #endif
#ifndef MD_HAVE_SOCKLEN_T #define MD_SETJMP(env) _setjmp(env)
#define MD_HAVE_SOCKLEN_T #define MD_LONGJMP(env, val) _longjmp(env, val)
#define socklen_t unsigned long
#endif
#define MD_SETJMP(env) _setjmp(env) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
(_thread)->context[3] = (long) (_sp); \ (_thread)->context[3] = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
timebasestruct_t rt; \ timebasestruct_t rt; \
(void) read_real_time(&rt, TIMEBASE_SZ); \ (void) read_real_time(&rt, TIMEBASE_SZ); \
(void) time_base_to_time(&rt, TIMEBASE_SZ); \ (void) time_base_to_time(&rt, TIMEBASE_SZ); \
return (rt.tb_high * 1000000LL + rt.tb_low / 1000) return (rt.tb_high * 1000000LL + rt.tb_low / 1000)
#elif defined (CYGWIN) #elif defined (CYGWIN)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BSD_ANON_MMAP
#define MD_ACCEPT_NB_NOT_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) setjmp(env)
#define MD_USE_BSD_ANON_MMAP #define MD_LONGJMP(env, val) longjmp(env, val)
#define MD_ACCEPT_NB_NOT_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_SETJMP(env) setjmp(env) #define MD_JB_SP 7
#define MD_LONGJMP(env, val) longjmp(env, val)
#define MD_JB_SP 7 #define MD_GET_SP(_t) (_t)->context[MD_JB_SP]
#define MD_GET_SP(_t) (_t)->context[MD_JB_SP] #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
MD_GET_SP(_thread) = (long) (_sp); \ MD_GET_SP(_thread) = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#elif defined (DARWIN) #elif defined (DARWIN)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BSD_ANON_MMAP
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_HAVE_SOCKLEN_T
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) _setjmp(env)
#define MD_USE_BSD_ANON_MMAP #define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_HAVE_SOCKLEN_T
#define MD_SETJMP(env) _setjmp(env) #if defined(__ppc__)
#define MD_LONGJMP(env, val) _longjmp(env, val) #define MD_JB_SP 0
#elif defined(__i386__)
#define MD_JB_SP 9
#elif defined(__x86_64__)
#define MD_JB_SP 4
#else
#error Unknown CPU architecture
#endif
#if defined(__ppc__) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_JB_SP 0
#elif defined(__i386__)
#define MD_JB_SP 9
#elif defined(__x86_64__)
#define MD_JB_SP 4
#else
#error Unknown CPU architecture
#endif
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
*((long *)&((_thread)->context[MD_JB_SP])) = (long) (_sp); \ *((long *)&((_thread)->context[MD_JB_SP])) = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#elif defined (FREEBSD) #elif defined (FREEBSD)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BSD_ANON_MMAP
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) _setjmp(env)
#define MD_USE_BSD_ANON_MMAP #define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_SETJMP(env) _setjmp(env) #if defined(__i386__)
#define MD_LONGJMP(env, val) _longjmp(env, val) #define MD_JB_SP 2
#elif defined(__alpha__)
#define MD_JB_SP 34
#elif defined(__amd64__)
#define MD_JB_SP 2
#else
#error Unknown CPU architecture
#endif
#if defined(__i386__) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_JB_SP 2
#elif defined(__alpha__)
#define MD_JB_SP 34
#elif defined(__amd64__)
#define MD_JB_SP 2
#else
#error Unknown CPU architecture
#endif
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
(_thread)->context[0]._jb[MD_JB_SP] = (long) (_sp); \ (_thread)->context[0]._jb[MD_JB_SP] = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#elif defined (HPUX) #elif defined (HPUX)
#define MD_STACK_GROWS_UP
#define MD_USE_BSD_ANON_MMAP
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_STACK_GROWS_UP #define MD_SETJMP(env) _setjmp(env)
#define MD_USE_BSD_ANON_MMAP #define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_SETJMP(env) _setjmp(env) #ifndef __LP64__
#define MD_LONGJMP(env, val) _longjmp(env, val) /* 32-bit mode (ILP32 data model) */
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
#ifndef __LP64__
/* 32-bit mode (ILP32 data model) */
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
((long *)((_thread)->context))[1] = (long) (_sp); \ ((long *)((_thread)->context))[1] = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#else #else
/* 64-bit mode (LP64 data model) */ /* 64-bit mode (LP64 data model) */
#define MD_STACK_PAD_SIZE 256 #define MD_STACK_PAD_SIZE 256
/* Last stack frame must be preserved */ /* Last stack frame must be preserved */
#define MD_INIT_CONTEXT(_thread, _sp, _main) \ #define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
@ -208,33 +202,32 @@
MD_STACK_PAD_SIZE); \ MD_STACK_PAD_SIZE); \
((long *)((_thread)->context))[1] = (long) (_sp); \ ((long *)((_thread)->context))[1] = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#endif /* !__LP64__ */ #endif /* !__LP64__ */
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#elif defined (IRIX) #elif defined (IRIX)
#include <sys/syssgi.h>
#include <sys/syssgi.h> #define MD_STACK_GROWS_DOWN
#define MD_USE_SYSV_ANON_MMAP
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) setjmp(env)
#define MD_USE_SYSV_ANON_MMAP #define MD_LONGJMP(env, val) longjmp(env, val)
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_SETJMP(env) setjmp(env) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_LONGJMP(env, val) longjmp(env, val)
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
(void) MD_SETJMP((_thread)->context); \ (void) MD_SETJMP((_thread)->context); \
(_thread)->context[JB_SP] = (long) (_sp); \ (_thread)->context[JB_SP] = (long) (_sp); \
(_thread)->context[JB_PC] = (long) _main; \ (_thread)->context[JB_PC] = (long) _main; \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
static int inited = 0; \ static int inited = 0; \
static clockid_t clock_id = CLOCK_SGI_CYCLE; \ static clockid_t clock_id = CLOCK_SGI_CYCLE; \
struct timespec ts; \ struct timespec ts; \
@ -246,7 +239,7 @@
(void) clock_gettime(clock_id, &ts); \ (void) clock_gettime(clock_id, &ts); \
return (ts.tv_sec * 1000000LL + ts.tv_nsec / 1000) return (ts.tv_sec * 1000000LL + ts.tv_nsec / 1000)
/* /*
* Cap the stack by zeroing out the saved return address register * Cap the stack by zeroing out the saved return address register
* value. This allows libexc, used by SpeedShop, to know when to stop * value. This allows libexc, used by SpeedShop, to know when to stop
* backtracing since it won't find main, start, or any other known * backtracing since it won't find main, start, or any other known
@ -257,38 +250,37 @@
* automatic variables are added to the _st_thread_main() routine, because * automatic variables are added to the _st_thread_main() routine, because
* the address where ra is stored will change. * the address where ra is stored will change.
*/ */
#if !defined(__GNUC__) && defined(_MIPS_SIM) && _MIPS_SIM != _ABIO32 #if !defined(__GNUC__) && defined(_MIPS_SIM) && _MIPS_SIM != _ABIO32
#define MD_CAP_STACK(var_addr) \ #define MD_CAP_STACK(var_addr) \
(((volatile __uint64_t *)(var_addr))[1] = 0) (((volatile __uint64_t *)(var_addr))[1] = 0)
#endif #endif
#elif defined (LINUX) #elif defined (LINUX)
/*
/*
* These are properties of the linux kernel and are the same on every * These are properties of the linux kernel and are the same on every
* flavor and architecture. * flavor and architecture.
*/ */
#define MD_USE_BSD_ANON_MMAP #define MD_USE_BSD_ANON_MMAP
#define MD_ACCEPT_NB_NOT_INHERITED #define MD_ACCEPT_NB_NOT_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT #define MD_ALWAYS_UNSERIALIZED_ACCEPT
/* /*
* Modern GNU/Linux is Posix.1g compliant. * Modern GNU/Linux is Posix.1g compliant.
*/ */
#define MD_HAVE_SOCKLEN_T #define MD_HAVE_SOCKLEN_T
/* /*
* All architectures and flavors of linux have the gettimeofday * All architectures and flavors of linux have the gettimeofday
* function but if you know of a faster way, use it. * function but if you know of a faster way, use it.
*/ */
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#if defined(__ia64__) #if defined(__ia64__)
#define MD_STACK_GROWS_DOWN #define MD_STACK_GROWS_DOWN
/* /*
* IA-64 architecture. Besides traditional memory call stack, IA-64 * IA-64 architecture. Besides traditional memory call stack, IA-64
* uses general register stack. Thus each thread needs a backing store * uses general register stack. Thus each thread needs a backing store
* for register stack in addition to memory stack. Standard * for register stack in addition to memory stack. Standard
@ -296,14 +288,14 @@
* because their implementation implicitly assumes that only one * because their implementation implicitly assumes that only one
* register stack exists. * register stack exists.
*/ */
#ifdef USE_LIBC_SETJMP #ifdef USE_LIBC_SETJMP
#undef USE_LIBC_SETJMP #undef USE_LIBC_SETJMP
#endif #endif
#define MD_USE_BUILTIN_SETJMP #define MD_USE_BUILTIN_SETJMP
#define MD_STACK_PAD_SIZE 128 #define MD_STACK_PAD_SIZE 128
/* Last register stack frame must be preserved */ /* Last register stack frame must be preserved */
#define MD_INIT_CONTEXT(_thread, _sp, _bsp, _main) \ #define MD_INIT_CONTEXT(_thread, _sp, _bsp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
@ -313,28 +305,24 @@
(_thread)->context[0].__jmpbuf[0] = (long) (_sp); \ (_thread)->context[0].__jmpbuf[0] = (long) (_sp); \
(_thread)->context[0].__jmpbuf[17] = (long) (_bsp); \ (_thread)->context[0].__jmpbuf[17] = (long) (_bsp); \
ST_END_MACRO ST_END_MACRO
#elif defined(__mips__)
#define MD_STACK_GROWS_DOWN
#elif defined(__mips__) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_STACK_GROWS_DOWN
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
MD_SETJMP((_thread)->context); \ MD_SETJMP((_thread)->context); \
_thread->context[0].__jmpbuf[0].__pc = (__ptr_t) _main; \ _thread->context[0].__jmpbuf[0].__pc = (__ptr_t) _main; \
_thread->context[0].__jmpbuf[0].__sp = _sp; \ _thread->context[0].__jmpbuf[0].__sp = _sp; \
ST_END_MACRO ST_END_MACRO
#else /* Not IA-64 or mips */
#else /* Not IA-64 or mips */ /*
/*
* On linux, there are a few styles of jmpbuf format. These vary based * On linux, there are a few styles of jmpbuf format. These vary based
* on architecture/glibc combination. * on architecture/glibc combination.
* *
* Most of the glibc based toggles were lifted from: * Most of the glibc based toggles were lifted from:
* mozilla/nsprpub/pr/include/md/_linux.h * mozilla/nsprpub/pr/include/md/_linux.h
*/ */
/*
/*
* Starting with glibc 2.4, JB_SP definitions are not public anymore. * Starting with glibc 2.4, JB_SP definitions are not public anymore.
* They, however, can still be found in glibc source tree in * They, however, can still be found in glibc source tree in
* architecture-specific "jmpbuf-offsets.h" files. * architecture-specific "jmpbuf-offsets.h" files.
@ -345,282 +333,270 @@
* functions as a setjmp/longjmp replacement wherever they are available * functions as a setjmp/longjmp replacement wherever they are available
* unless USE_LIBC_SETJMP is defined. * unless USE_LIBC_SETJMP is defined.
*/ */
#if defined(__powerpc__)
#define MD_STACK_GROWS_DOWN
#if defined(__powerpc__) #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
#define MD_STACK_GROWS_DOWN #ifndef JB_GPR1
#define JB_GPR1 0
#endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_GPR1]
#else
/* not an error but certainly cause for caution */
#error "Untested use of old glibc on powerpc"
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__misc[0]
#endif /* glibc 2.1 or later */
#elif defined(__alpha)
#define MD_STACK_GROWS_DOWN
#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) #if defined(__GLIBC__) && __GLIBC__ >= 2
#ifndef JB_GPR1 #ifndef JB_SP
#define JB_GPR1 0 #define JB_SP 8
#endif #endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_GPR1] #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_SP]
#else #else
/* not an error but certainly cause for caution */ /* not an error but certainly cause for caution */
#error "Untested use of old glibc on powerpc" #error "Untested use of old glibc on alpha"
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__misc[0] #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__sp
#endif /* glibc 2.1 or later */ #endif
#elif defined(__mc68000__)
#define MD_STACK_GROWS_DOWN
#elif defined(__alpha) /* m68k still uses old style sigjmp_buf */
#define MD_STACK_GROWS_DOWN #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__sp
#elif defined(__sparc__)
#define MD_STACK_GROWS_DOWN
#if defined(__GLIBC__) && __GLIBC__ >= 2 #if defined(__GLIBC__) && __GLIBC__ >= 2
#ifndef JB_SP #ifndef JB_SP
#define JB_SP 8 #define JB_SP 0
#endif #endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_SP] #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_SP]
#else #else
/* not an error but certainly cause for caution */ /* not an error but certainly cause for caution */
#error "Untested use of old glibc on alpha" #error "Untested use of old glic on sparc -- also using odd mozilla derived __fp"
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__sp #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__fp
#endif #endif
#elif defined(__i386__)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BUILTIN_SETJMP
#elif defined(__mc68000__) #if defined(__GLIBC__) && __GLIBC__ >= 2
#define MD_STACK_GROWS_DOWN #ifndef JB_SP
#define JB_SP 4
#endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_SP]
#else
/* not an error but certainly cause for caution */
#error "Untested use of old glibc on i386"
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__sp
#endif
#elif defined(__amd64__) || defined(__x86_64__)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BUILTIN_SETJMP
/* m68k still uses old style sigjmp_buf */ #ifndef JB_RSP
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__sp #define JB_RSP 6
#endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_RSP]
#elif defined(__arm__)
#define MD_STACK_GROWS_DOWN
#elif defined(__sparc__) #if defined(__GLIBC__) && __GLIBC__ >= 2
#define MD_STACK_GROWS_DOWN #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[8]
#else
#error "ARM/Linux pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
#elif defined(__s390__)
#define MD_STACK_GROWS_DOWN
#if defined(__GLIBC__) && __GLIBC__ >= 2 /* There is no JB_SP in glibc at this time. (glibc 2.2.5)
#ifndef JB_SP
#define JB_SP 0
#endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_SP]
#else
/* not an error but certainly cause for caution */
#error "Untested use of old glic on sparc -- also using odd mozilla derived __fp"
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__fp
#endif
#elif defined(__i386__)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BUILTIN_SETJMP
#if defined(__GLIBC__) && __GLIBC__ >= 2
#ifndef JB_SP
#define JB_SP 4
#endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_SP]
#else
/* not an error but certainly cause for caution */
#error "Untested use of old glibc on i386"
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__sp
#endif
#elif defined(__amd64__) || defined(__x86_64__)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BUILTIN_SETJMP
#ifndef JB_RSP
#define JB_RSP 6
#endif
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[JB_RSP]
#elif defined(__arm__)
#define MD_STACK_GROWS_DOWN
#if defined(__GLIBC__) && __GLIBC__ >= 2
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[20]
#else
#error "ARM/Linux pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
#elif defined(__s390__)
#define MD_STACK_GROWS_DOWN
/* There is no JB_SP in glibc at this time. (glibc 2.2.5)
*/ */
#define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__gregs[9] #define MD_GET_SP(_t) (_t)->context[0].__jmpbuf[0].__gregs[9]
#elif defined(__hppa__)
#define MD_STACK_GROWS_UP
#elif defined(__hppa__) /* yes, this is gross, unfortunately at the moment (2002/08/01) there is
#define MD_STACK_GROWS_UP
/* yes, this is gross, unfortunately at the moment (2002/08/01) there is
* a bug in hppa's glibc header definition for JB_SP, so we can't * a bug in hppa's glibc header definition for JB_SP, so we can't
* use that... * use that...
*/ */
#define MD_GET_SP(_t) (*(long *)(((char *)&(_t)->context[0].__jmpbuf[0]) + 76)) #define MD_GET_SP(_t) (*(long *)(((char *)&(_t)->context[0].__jmpbuf[0]) + 76))
#else
#error "Unknown CPU architecture"
#endif /* Cases with common MD_INIT_CONTEXT and different SP locations */
#else #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#error "Unknown CPU architecture"
#endif /* Cases with common MD_INIT_CONTEXT and different SP locations */
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
MD_GET_SP(_thread) = (long) (_sp); \ MD_GET_SP(_thread) = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#endif /* Cases with different MD_INIT_CONTEXT */
#endif /* Cases with different MD_INIT_CONTEXT */ #if defined(MD_USE_BUILTIN_SETJMP) && !defined(USE_LIBC_SETJMP)
#define MD_SETJMP(env) _st_md_cxt_save(env)
#define MD_LONGJMP(env, val) _st_md_cxt_restore(env, val)
#if defined(MD_USE_BUILTIN_SETJMP) && !defined(USE_LIBC_SETJMP) extern int _st_md_cxt_save(jmp_buf env);
#define MD_SETJMP(env) _st_md_cxt_save(env) extern void _st_md_cxt_restore(jmp_buf env, int val);
#define MD_LONGJMP(env, val) _st_md_cxt_restore(env, val) #else
#define MD_SETJMP(env) setjmp(env)
extern int _st_md_cxt_save(jmp_buf env); #define MD_LONGJMP(env, val) longjmp(env, val)
extern void _st_md_cxt_restore(jmp_buf env, int val); #endif
#else
#define MD_SETJMP(env) setjmp(env)
#define MD_LONGJMP(env, val) longjmp(env, val)
#endif
#elif defined (NETBSD) #elif defined (NETBSD)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BSD_ANON_MMAP
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_HAVE_SOCKLEN_T
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) _setjmp(env)
#define MD_USE_BSD_ANON_MMAP #define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_HAVE_SOCKLEN_T
#define MD_SETJMP(env) _setjmp(env) #if defined(__i386__)
#define MD_LONGJMP(env, val) _longjmp(env, val) #define MD_JB_SP 2
#elif defined(__alpha__)
#define MD_JB_SP 34
#elif defined(__sparc__)
#define MD_JB_SP 0
#elif defined(__vax__)
#define MD_JB_SP 2
#else
#error Unknown CPU architecture
#endif
#if defined(__i386__) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_JB_SP 2
#elif defined(__alpha__)
#define MD_JB_SP 34
#elif defined(__sparc__)
#define MD_JB_SP 0
#elif defined(__vax__)
#define MD_JB_SP 2
#else
#error Unknown CPU architecture
#endif
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
(_thread)->context[MD_JB_SP] = (long) (_sp); \ (_thread)->context[MD_JB_SP] = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#elif defined (OPENBSD) #elif defined (OPENBSD)
#define MD_STACK_GROWS_DOWN
#define MD_USE_BSD_ANON_MMAP
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) _setjmp(env)
#define MD_USE_BSD_ANON_MMAP #define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_ACCEPT_NB_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_SETJMP(env) _setjmp(env) #if defined(__i386__)
#define MD_LONGJMP(env, val) _longjmp(env, val) #define MD_JB_SP 2
#elif defined(__alpha__)
#define MD_JB_SP 34
#elif defined(__sparc__)
#define MD_JB_SP 0
#elif defined(__amd64__)
#define MD_JB_SP 6
#else
#error Unknown CPU architecture
#endif
#if defined(__i386__) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_JB_SP 2
#elif defined(__alpha__)
#define MD_JB_SP 34
#elif defined(__sparc__)
#define MD_JB_SP 0
#elif defined(__amd64__)
#define MD_JB_SP 6
#else
#error Unknown CPU architecture
#endif
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
(_thread)->context[MD_JB_SP] = (long) (_sp); \ (_thread)->context[MD_JB_SP] = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#elif defined (OSF1) #elif defined (OSF1)
#include <signal.h>
#include <signal.h> #define MD_STACK_GROWS_DOWN
#define MD_USE_SYSV_ANON_MMAP
#define MD_ACCEPT_NB_NOT_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) _setjmp(env)
#define MD_USE_SYSV_ANON_MMAP #define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_ACCEPT_NB_NOT_INHERITED
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
#define MD_SETJMP(env) _setjmp(env) #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_LONGJMP(env, val) _longjmp(env, val)
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
((struct sigcontext *)((_thread)->context))->sc_sp = (long) (_sp); \ ((struct sigcontext *)((_thread)->context))->sc_sp = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
struct timeval tv; \ struct timeval tv; \
(void) gettimeofday(&tv, NULL); \ (void) gettimeofday(&tv, NULL); \
return (tv.tv_sec * 1000000LL + tv.tv_usec) return (tv.tv_sec * 1000000LL + tv.tv_usec)
#elif defined (SOLARIS) #elif defined (SOLARIS)
#include <sys/filio.h>
extern int getpagesize(void);
#include <sys/filio.h> #define MD_STACK_GROWS_DOWN
extern int getpagesize(void); #define MD_USE_SYSV_ANON_MMAP
#define MD_ACCEPT_NB_NOT_INHERITED
#define MD_STACK_GROWS_DOWN #define MD_SETJMP(env) setjmp(env)
#define MD_USE_SYSV_ANON_MMAP #define MD_LONGJMP(env, val) longjmp(env, val)
#define MD_ACCEPT_NB_NOT_INHERITED
#define MD_SETJMP(env) setjmp(env) #if defined(sparc) || defined(__sparc)
#define MD_LONGJMP(env, val) longjmp(env, val) #ifdef _LP64
#define MD_STACK_PAD_SIZE 4095
#if defined(sparc) || defined(__sparc) #endif
#ifdef _LP64 #define MD_INIT_CONTEXT(_thread, _sp, _main) \
#define MD_STACK_PAD_SIZE 4095
#endif
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
(void) MD_SETJMP((_thread)->context); \ (void) MD_SETJMP((_thread)->context); \
(_thread)->context[1] = (long) (_sp); \ (_thread)->context[1] = (long) (_sp); \
(_thread)->context[2] = (long) _main; \ (_thread)->context[2] = (long) _main; \
ST_END_MACRO ST_END_MACRO
#elif defined(i386) || defined(__i386) #elif defined(i386) || defined(__i386)
#define MD_INIT_CONTEXT(_thread, _sp, _main) \ #define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
(void) MD_SETJMP((_thread)->context); \ (void) MD_SETJMP((_thread)->context); \
(_thread)->context[4] = (long) (_sp); \ (_thread)->context[4] = (long) (_sp); \
(_thread)->context[5] = (long) _main; \ (_thread)->context[5] = (long) _main; \
ST_END_MACRO ST_END_MACRO
#elif defined(__amd64__) #elif defined(__amd64__)
#define MD_INIT_CONTEXT(_thread, _sp, _main) \ #define MD_INIT_CONTEXT(_thread, _sp, _main) \
ST_BEGIN_MACRO \ ST_BEGIN_MACRO \
if (MD_SETJMP((_thread)->context)) \ if (MD_SETJMP((_thread)->context)) \
_main(); \ _main(); \
(_thread)->context[6] = (long) (_sp); \ (_thread)->context[6] = (long) (_sp); \
ST_END_MACRO ST_END_MACRO
#else #else
#error Unknown CPU architecture #error Unknown CPU architecture
#endif #endif
#define MD_GET_UTIME() \ #define MD_GET_UTIME() \
return (gethrtime() / 1000) return (gethrtime() / 1000)
#else #else
#error Unknown OS #error Unknown OS
#endif /* OS */ #endif /* OS */
/*****************************************
* Other defines
*/
#if !defined(MD_HAVE_POLL) && !defined(MD_DONT_HAVE_POLL) #if !defined(MD_HAVE_POLL) && !defined(MD_DONT_HAVE_POLL)
#define MD_HAVE_POLL #define MD_HAVE_POLL
#endif #endif
#ifndef MD_STACK_PAD_SIZE #ifndef MD_STACK_PAD_SIZE
#define MD_STACK_PAD_SIZE 128 #define MD_STACK_PAD_SIZE 128
#endif #endif
#if !defined(MD_HAVE_SOCKLEN_T) && !defined(socklen_t) #if !defined(MD_HAVE_SOCKLEN_T) && !defined(socklen_t)
#define socklen_t int #define socklen_t int
#endif #endif
#ifndef MD_CAP_STACK #ifndef MD_CAP_STACK
#define MD_CAP_STACK(var_addr) #define MD_CAP_STACK(var_addr)
#endif #endif
#endif /* !__ST_MD_H__ */ #endif /* !__ST_MD_H__ */

3
trunk/research/st/public.h
View file

@ -129,8 +129,7 @@ extern "C" {
extern void st_netfd_free(st_netfd_t fd); extern void st_netfd_free(st_netfd_t fd);
extern int st_netfd_close(st_netfd_t fd); extern int st_netfd_close(st_netfd_t fd);
extern int st_netfd_fileno(st_netfd_t fd); extern int st_netfd_fileno(st_netfd_t fd);
extern void st_netfd_setspecific(st_netfd_t fd, void *value, extern void st_netfd_setspecific(st_netfd_t fd, void *value, void (*destructor)(void *));
void (*destructor)(void *));
extern void *st_netfd_getspecific(st_netfd_t fd); extern void *st_netfd_getspecific(st_netfd_t fd);
extern int st_netfd_serialize_accept(st_netfd_t fd); extern int st_netfd_serialize_accept(st_netfd_t fd);
extern int st_netfd_poll(st_netfd_t fd, int how, st_utime_t timeout); extern int st_netfd_poll(st_netfd_t fd, int how, st_utime_t timeout);