Changeset 7512


Ignore:
Timestamp:
06/28/18 19:47:17 (5 months ago)
Author:
baker
Message:

put threading API prototypes back into earthworm_complex_funcs.h (delete ew_threads.h)

Location:
trunk
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/earthworm_complex_funcs.h

    r7507 r7512  
    2222   ********************************/ 
    2323#include "platform.h" 
    24 #include "ew_threads.h"                 /* Earthworm threads API */ 
    2524 
    2625#if 0 /* OBSOLETE */ 
     
    104103int sendall( SOCKET, const char *, long, int ); /* socket_ew.c  system-dependent */ 
    105104 
    106 #if 0 /* OBSOLETE - use #include "ew_threads.h" for the Earthworm threads API */ 
    107 int  WaitThread( unsigned * );              /* threads_ew.c system-dependent */ 
    108 int  KillThread( unsigned int );            /* threads_ew.c system-dependent */ 
    109 int  KillSelfThread( void );                /* threads_ew.c system-dependent */ 
    110 int  StartThread( thr_ret fun(void *), unsigned stack_size, unsigned *thread_id ); 
    111 int  StartThreadWithArg( thr_ret fun(void *), void *arg, unsigned stack_size, unsigned *thread_id ); 
    112 #endif 
     105/****************************************************************************** 
     106 *                                                                            * 
     107 *             Function prototypes for the Earthworm threads API              * 
     108 *   Platform-specific data types (thr_ret, ew_thread_t) are in platform.h    * 
     109 *   Implementations are in src/libsrc/{solaris,unix,windows}/threads_ew.c    * 
     110 *                                                                            * 
     111 ******************************************************************************/ 
     112 
     113int WaitThread( unsigned int * ); 
     114int KillThread( unsigned int ); 
     115int KillSelfThread( void ); 
     116int StartThread( thr_ret (*fun)( void * ), unsigned int, unsigned int * ); 
     117int StartThreadWithArg( thr_ret (*fun)( void * ), void *, unsigned int, unsigned int * ); 
    113118 
    114119#endif /* EARTHWORM_COMPLEX_FUNCS_H */ 
  • trunk/src/libsrc/solaris/threads_ew.c

    r7509 r7512  
    1  
    21              /*********************************************** 
    32               *                threads_ew.c                 * 
     
    1615#include <thread.h> 
    1716 
    18 #include "ew_threads.h"                 /* Earthworm threads API */ 
     17#include "earthworm_complex_funcs.h"    /* Earthworm threads API */ 
    1918 
    2019void SignalHandle( int ); 
     
    5958      return( -1 ); 
    6059 
    61    *thread_id = (unsigned) tid; 
     60   *thread_id = (unsigned int) tid; 
    6261 
    6362   assert( *thread_id == tid );         /* Critical on 64-bit systems */ 
     
    107106      return( -1 ); 
    108107 
    109    *thread_id = (unsigned) tid; 
     108   *thread_id = (unsigned int) tid; 
    110109 
    111110   assert( *thread_id == tid );         /* Critical on 64-bit systems */ 
  • trunk/src/libsrc/unix/threads_ew.c

    r7509 r7512  
    2828#endif 
    2929 
    30 #include "ew_threads.h"                 /* Earthworm threads API */ 
     30#include "earthworm_complex_funcs.h"    /* Earthworm threads API */ 
    3131 
    3232#ifdef _USE_POSIX_SIGNALS 
     
    129129#endif 
    130130 
    131    *thread_id = (unsigned) tid; 
     131   *thread_id = (unsigned int) tid; 
    132132 
    133133   assert( *thread_id == tid );         /* Critical on 64-bit systems */ 
     
    223223#endif 
    224224 
    225    *thread_id = (unsigned) tid; 
     225   *thread_id = (unsigned int) tid; 
    226226 
    227227   assert( *thread_id == tid );         /* Critical on 64-bit systems */ 
  • trunk/src/libsrc/winnt/threads_ew.c

    r7509 r7512  
    1  
    21              /******************************************** 
    32              *               threads_ew.c                * 
     
    1211#include <process.h> 
    1312 
    14 #include "ew_threads.h"                 /* Earthworm threads API */ 
     13#include "earthworm_complex_funcs.h"    /* Earthworm threads API */ 
    1514 
    1615   /******************************************************************** 
     
    4746      return -1; 
    4847 
    49    *thread_id = (unsigned) tid;         /* Return the thread id */ 
     48   *thread_id = (unsigned int) tid; 
    5049 
    5150   assert( *thread_id == tid );         /* Critical on 64-bit systems */ 
     
    8786      return -1; 
    8887 
    89    *thread_id = (unsigned) tid;         /* Return the thread id */ 
     88   *thread_id = (unsigned int) tid; 
    9089 
    9190   assert( *thread_id == tid );         /* Critical on 64-bit systems */ 
Note: See TracChangeset for help on using the changeset viewer.