Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
/**
|
||||
* @file OS_NS_Thread.h
|
||||
*
|
||||
* $Id: OS_NS_Thread.h 91210 2010-07-26 20:31:30Z shuston $
|
||||
* $Id: OS_NS_Thread.h 91693 2010-09-09 12:57:54Z johnnyw $
|
||||
*
|
||||
* @author Douglas C. Schmidt <[email protected]>
|
||||
* @author Jesper S. M|ller<[email protected]>
|
||||
@@ -527,7 +527,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
/**
|
||||
* @class ACE_recursive_thread_mutex_t
|
||||
*
|
||||
* @brief Implement a thin C++ wrapper that allows nested acquisition
|
||||
* @brief
|
||||
* Implement a thin C++ wrapper that allows nested acquisition
|
||||
* and release of a mutex that occurs in the same thread.
|
||||
*
|
||||
* This implementation is based on an algorithm sketched by Dave
|
||||
@@ -551,8 +552,8 @@ public:
|
||||
ACE_thread_t owner_id_;
|
||||
};
|
||||
|
||||
// Since recursive mutex is emulated, the state saving needs to be handled
|
||||
// in ACE as well. These members save those from ACE_recursive_thread_mutex_t.
|
||||
/// Since recursive mutex is emulated, the state saving needs to be handled
|
||||
/// in ACE as well. These members save those from ACE_recursive_thread_mutex_t.
|
||||
struct ACE_recursive_mutex_state
|
||||
{
|
||||
int nesting_level_;
|
||||
@@ -679,9 +680,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
/**
|
||||
* @class ACE_Thread_ID
|
||||
*
|
||||
* @brief Defines a platform-independent thread ID class. Note that
|
||||
* this class should be defined within the scope of a thread, rather
|
||||
* than at global scope!
|
||||
* @brief
|
||||
* Defines a platform-independent thread ID class. Note that
|
||||
* this class should be defined within the scope of a thread, rather
|
||||
* than at global scope!
|
||||
*/
|
||||
class ACE_Export ACE_Thread_ID
|
||||
{
|
||||
@@ -695,7 +697,10 @@ public:
|
||||
ACE_Thread_ID (void);
|
||||
|
||||
/// Copy constructor.
|
||||
ACE_Thread_ID (const ACE_Thread_ID &rhs);
|
||||
ACE_Thread_ID (const ACE_Thread_ID &id);
|
||||
|
||||
/// Assignment operator
|
||||
ACE_Thread_ID& operator= (const ACE_Thread_ID&id);
|
||||
|
||||
/// Get the thread id.
|
||||
ACE_thread_t id (void) const;
|
||||
@@ -757,18 +762,18 @@ typedef int ACE_pri_t;
|
||||
# else
|
||||
typedef int ACE_idtype_t;
|
||||
# endif /* ACE_HAS_IDTYPE_T */
|
||||
# if defined (ACE_HAS_STHREADS) || defined (DIGITAL_UNIX)
|
||||
# if defined (ACE_HAS_STHREADS)
|
||||
# if defined (ACE_LACKS_PRI_T)
|
||||
typedef int pri_t;
|
||||
# endif /* ACE_LACKS_PRI_T */
|
||||
typedef id_t ACE_id_t;
|
||||
# define ACE_SELF P_MYID
|
||||
typedef pri_t ACE_pri_t;
|
||||
# else /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */
|
||||
# else /* ! ACE_HAS_STHREADS */
|
||||
typedef long ACE_id_t;
|
||||
# define ACE_SELF (-1)
|
||||
typedef short ACE_pri_t;
|
||||
# endif /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */
|
||||
# endif /* ! ACE_HAS_STHREADS */
|
||||
#endif /* !defined (ACE_WIN32) */
|
||||
|
||||
# if defined (ACE_HAS_TSS_EMULATION)
|
||||
@@ -1551,8 +1556,7 @@ namespace ACE_OS {
|
||||
const char** thr_name = 0);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_equal (ACE_thread_t t1,
|
||||
ACE_thread_t t2);
|
||||
int thr_equal (ACE_thread_t t1, ACE_thread_t t2);
|
||||
|
||||
extern ACE_Export
|
||||
void thr_exit (ACE_THR_FUNC_RETURN status = 0);
|
||||
@@ -1572,21 +1576,18 @@ namespace ACE_OS {
|
||||
# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
/// for internal use only. Applications should call thr_getspecific
|
||||
int thr_getspecific_native (ACE_OS_thread_key_t key,
|
||||
void **data);
|
||||
int thr_getspecific_native (ACE_OS_thread_key_t key, void **data);
|
||||
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_getspecific (ACE_thread_key_t key,
|
||||
void **data);
|
||||
int thr_getspecific (ACE_thread_key_t key, void **data);
|
||||
|
||||
#if defined (ACE_HAS_VXTHREADS)
|
||||
extern ACE_Export
|
||||
#else
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
#endif /* ACE_HAS_VXTHREADS */
|
||||
int thr_join (ACE_hthread_t waiter_id,
|
||||
ACE_THR_FUNC_RETURN *status);
|
||||
int thr_join (ACE_hthread_t waiter_id, ACE_THR_FUNC_RETURN *status);
|
||||
|
||||
#if defined (ACE_HAS_VXTHREADS)
|
||||
extern ACE_Export
|
||||
@@ -1630,11 +1631,8 @@ namespace ACE_OS {
|
||||
size_t cpu_set_size,
|
||||
const cpu_set_t * cpu_mask);
|
||||
|
||||
/**
|
||||
* @note the "inst" arg is deprecated. It will be ignored.
|
||||
*/
|
||||
extern ACE_Export
|
||||
int thr_key_detach (ACE_thread_key_t key, void * inst);
|
||||
int thr_key_detach (ACE_thread_key_t key);
|
||||
|
||||
extern ACE_Export
|
||||
int thr_key_used (ACE_thread_key_t key);
|
||||
@@ -1643,17 +1641,12 @@ namespace ACE_OS {
|
||||
# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
|
||||
/// @internal Applications should call thr_keycreate
|
||||
extern ACE_Export
|
||||
int thr_keycreate_native (ACE_OS_thread_key_t *key,
|
||||
ACE_THR_C_DEST);
|
||||
int thr_keycreate_native (ACE_OS_thread_key_t *key, ACE_THR_C_DEST);
|
||||
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
|
||||
|
||||
/**
|
||||
* @note the "inst" arge is deprecated. It will be ignored.
|
||||
*/
|
||||
extern ACE_Export
|
||||
int thr_keycreate (ACE_thread_key_t *key,
|
||||
ACE_THR_C_DEST,
|
||||
void *inst = 0);
|
||||
int thr_keycreate (ACE_thread_key_t *key, ACE_THR_C_DEST);
|
||||
|
||||
# else
|
||||
# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
|
||||
/// @internal Applications should call thr_keycreate instead
|
||||
@@ -1661,13 +1654,9 @@ namespace ACE_OS {
|
||||
int thr_keycreate_native (ACE_OS_thread_key_t *key,
|
||||
ACE_THR_DEST);
|
||||
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
|
||||
/**
|
||||
* @note the "inst" arge is deprecated. It will be ignored.
|
||||
*/
|
||||
|
||||
extern ACE_Export
|
||||
int thr_keycreate (ACE_thread_key_t *key,
|
||||
ACE_THR_DEST,
|
||||
void *inst = 0);
|
||||
int thr_keycreate (ACE_thread_key_t *key, ACE_THR_DEST);
|
||||
|
||||
# endif /* ACE_HAS_THR_C_DEST */
|
||||
|
||||
@@ -1681,8 +1670,7 @@ namespace ACE_OS {
|
||||
int thr_keyfree (ACE_thread_key_t key);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_kill (ACE_thread_t thr_id,
|
||||
int signum);
|
||||
int thr_kill (ACE_thread_t thr_id, int signum);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
size_t thr_min_stack (void);
|
||||
@@ -1697,20 +1685,16 @@ namespace ACE_OS {
|
||||
const char* thr_name (void);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_setcancelstate (int new_state,
|
||||
int *old_state);
|
||||
int thr_setcancelstate (int new_state, int *old_state);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_setcanceltype (int new_type,
|
||||
int *old_type);
|
||||
int thr_setcanceltype (int new_type, int *old_type);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_setconcurrency (int hint);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_setprio (ACE_hthread_t ht_id,
|
||||
int priority,
|
||||
int policy = -1);
|
||||
int thr_setprio (ACE_hthread_t ht_id, int priority, int policy = -1);
|
||||
|
||||
extern ACE_Export
|
||||
int thr_setprio (const ACE_Sched_Priority prio);
|
||||
@@ -1718,18 +1702,14 @@ namespace ACE_OS {
|
||||
# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
|
||||
/// @internal Applications should call thr_setspecific
|
||||
extern ACE_Export
|
||||
int thr_setspecific_native (ACE_OS_thread_key_t key,
|
||||
void *data);
|
||||
int thr_setspecific_native (ACE_OS_thread_key_t key, void *data);
|
||||
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
|
||||
|
||||
extern ACE_Export
|
||||
int thr_setspecific (ACE_thread_key_t key,
|
||||
void *data);
|
||||
int thr_setspecific (ACE_thread_key_t key, void *data);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_sigsetmask (int how,
|
||||
const sigset_t *nsm,
|
||||
sigset_t *osm);
|
||||
int thr_sigsetmask (int how, const sigset_t *nsm, sigset_t *osm);
|
||||
|
||||
ACE_NAMESPACE_INLINE_FUNCTION
|
||||
int thr_suspend (ACE_hthread_t target_thread);
|
||||
|
||||
Reference in New Issue
Block a user