mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
Readability patch: ERRVAL() macro for pthreads < 7 vs. >= 7 return values.
This commit is contained in:
parent
73aaead5bd
commit
6f3cf907b8
@ -55,6 +55,12 @@ static pthread_mutexattr_t mutex_attr;
|
|||||||
# define LDAP_INT_THREAD_MUTEXATTR_DEFAULT &mutex_attr
|
# define LDAP_INT_THREAD_MUTEXATTR_DEFAULT &mutex_attr
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if HAVE_PTHREADS < 7
|
||||||
|
#define ERRVAL(val) ((val) < 0 ? errno : 0)
|
||||||
|
#else
|
||||||
|
#define ERRVAL(val) (val)
|
||||||
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_int_thread_initialize( void )
|
ldap_int_thread_initialize( void )
|
||||||
{
|
{
|
||||||
@ -157,6 +163,7 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
|
|||||||
#else
|
#else
|
||||||
rtn = pthread_create( thread, &attr, start_routine, arg );
|
rtn = pthread_create( thread, &attr, start_routine, arg );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_PTHREADS > 5
|
#if HAVE_PTHREADS > 5
|
||||||
pthread_attr_destroy(&attr);
|
pthread_attr_destroy(&attr);
|
||||||
#else
|
#else
|
||||||
@ -183,26 +190,18 @@ ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
|
|||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
#if HAVE_PTHREADS < 7
|
||||||
void *dummy;
|
void *dummy;
|
||||||
|
|
||||||
if (thread_return==NULL)
|
if (thread_return==NULL)
|
||||||
thread_return=&dummy;
|
thread_return=&dummy;
|
||||||
|
|
||||||
if ( pthread_join( thread, thread_return ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_join( thread, thread_return );
|
|
||||||
#endif
|
#endif
|
||||||
|
return ERRVAL( pthread_join( thread, thread_return ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
|
ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
|
||||||
{
|
{
|
||||||
#if defined(HAVE_PTHREAD_KILL) && HAVE_PTHREADS > 6
|
#if defined(HAVE_PTHREAD_KILL) && HAVE_PTHREADS > 4
|
||||||
/* MacOS 10.1 is detected as v10 but has no pthread_kill() */
|
/* MacOS 10.1 is detected as v10 but has no pthread_kill() */
|
||||||
return pthread_kill( thread, signo );
|
return ERRVAL( pthread_kill( thread, signo ) );
|
||||||
#elif defined(HAVE_PTHREAD_KILL) && HAVE_PTHREADS > 4
|
|
||||||
if ( pthread_kill( thread, signo ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
#else
|
||||||
/* pthread package with DCE */
|
/* pthread package with DCE */
|
||||||
if (kill( getpid(), signo )<0)
|
if (kill( getpid(), signo )<0)
|
||||||
@ -223,6 +222,7 @@ ldap_pvt_thread_yield( void )
|
|||||||
select( 0, NULL, NULL, NULL, &tv );
|
select( 0, NULL, NULL, NULL, &tv );
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#elif defined(HAVE_THR_YIELD)
|
#elif defined(HAVE_THR_YIELD)
|
||||||
thr_yield();
|
thr_yield();
|
||||||
return 0;
|
return 0;
|
||||||
@ -237,6 +237,7 @@ ldap_pvt_thread_yield( void )
|
|||||||
#elif HAVE_PTHREADS == 6
|
#elif HAVE_PTHREADS == 6
|
||||||
pthread_yield(NULL);
|
pthread_yield(NULL);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
pthread_yield();
|
pthread_yield();
|
||||||
return 0;
|
return 0;
|
||||||
@ -246,114 +247,64 @@ ldap_pvt_thread_yield( void )
|
|||||||
int
|
int
|
||||||
ldap_pvt_thread_cond_init( ldap_pvt_thread_cond_t *cond )
|
ldap_pvt_thread_cond_init( ldap_pvt_thread_cond_t *cond )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_cond_init(
|
||||||
if ( pthread_cond_init( cond, LDAP_INT_THREAD_CONDATTR_DEFAULT ) < 0 )
|
cond, LDAP_INT_THREAD_CONDATTR_DEFAULT ) );
|
||||||
return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_cond_init( cond, LDAP_INT_THREAD_CONDATTR_DEFAULT );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_cond_destroy( ldap_pvt_thread_cond_t *cond )
|
ldap_pvt_thread_cond_destroy( ldap_pvt_thread_cond_t *cond )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_cond_destroy( cond ) );
|
||||||
if ( pthread_cond_destroy( cond ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_cond_destroy( cond );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
|
ldap_pvt_thread_cond_signal( ldap_pvt_thread_cond_t *cond )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_cond_signal( cond ) );
|
||||||
if ( pthread_cond_signal( cond ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_cond_signal( cond );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
|
ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_cond_broadcast( cond ) );
|
||||||
if ( pthread_cond_broadcast( cond ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_cond_broadcast( cond );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond,
|
ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond,
|
||||||
ldap_pvt_thread_mutex_t *mutex )
|
ldap_pvt_thread_mutex_t *mutex )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_cond_wait( cond, mutex ) );
|
||||||
if ( pthread_cond_wait( cond, mutex ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_cond_wait( cond, mutex );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
|
ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_mutex_init(
|
||||||
if ( pthread_mutex_init( mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT )<0)
|
mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT ) );
|
||||||
return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_mutex_init( mutex, LDAP_INT_THREAD_MUTEXATTR_DEFAULT );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
|
ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_mutex_destroy( mutex ) );
|
||||||
if ( pthread_mutex_destroy( mutex ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_mutex_destroy( mutex );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_mutex_lock( ldap_pvt_thread_mutex_t *mutex )
|
ldap_pvt_thread_mutex_lock( ldap_pvt_thread_mutex_t *mutex )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_mutex_lock( mutex ) );
|
||||||
if ( pthread_mutex_lock( mutex ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_mutex_lock( mutex );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mutex )
|
ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mutex )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_mutex_trylock( mutex ) );
|
||||||
if ( pthread_mutex_trylock( mutex ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_mutex_trylock( mutex );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
|
ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_mutex_unlock( mutex ) );
|
||||||
if ( pthread_mutex_unlock( mutex ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_mutex_unlock( mutex );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ldap_pvt_thread_t ldap_pvt_thread_self( void )
|
ldap_pvt_thread_t ldap_pvt_thread_self( void )
|
||||||
@ -366,83 +317,43 @@ ldap_pvt_thread_t ldap_pvt_thread_self( void )
|
|||||||
int
|
int
|
||||||
ldap_pvt_thread_rdwr_init( ldap_pvt_thread_rdwr_t *rw )
|
ldap_pvt_thread_rdwr_init( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_init( rw, NULL ) );
|
||||||
if ( pthread_rwlock_init( rw, NULL ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_init( rw, NULL );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
|
ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_destroy( rw ) );
|
||||||
if ( pthread_rwlock_destroy( rw ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_destroy( rw );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
|
int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_rdlock( rw ) );
|
||||||
if ( pthread_rwlock_rdlock( rw ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_rdlock( rw );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ldap_pvt_thread_rdwr_rtrylock( ldap_pvt_thread_rdwr_t *rw )
|
int ldap_pvt_thread_rdwr_rtrylock( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_tryrdlock( rw ) );
|
||||||
if ( pthread_rwlock_tryrdlock( rw ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_tryrdlock( rw );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ldap_pvt_thread_rdwr_runlock( ldap_pvt_thread_rdwr_t *rw )
|
int ldap_pvt_thread_rdwr_runlock( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_unlock( rw ) );
|
||||||
if ( pthread_rwlock_unlock( rw ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_unlock( rw );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ldap_pvt_thread_rdwr_wlock( ldap_pvt_thread_rdwr_t *rw )
|
int ldap_pvt_thread_rdwr_wlock( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_wrlock( rw ) );
|
||||||
if ( pthread_rwlock_wrlock( rw ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_wrlock( rw );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ldap_pvt_thread_rdwr_wtrylock( ldap_pvt_thread_rdwr_t *rw )
|
int ldap_pvt_thread_rdwr_wtrylock( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_trywrlock( rw ) );
|
||||||
if ( pthread_rwlock_trywrlock( rw ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_trywrlock( rw );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
|
int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
|
||||||
{
|
{
|
||||||
#if HAVE_PTHREADS < 7
|
return ERRVAL( pthread_rwlock_unlock( rw ) );
|
||||||
if ( pthread_rwlock_unlock( rw ) < 0 ) return errno;
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return pthread_rwlock_unlock( rw );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* HAVE_PTHREAD_RWLOCK_DESTROY */
|
#endif /* HAVE_PTHREAD_RWLOCK_DESTROY */
|
||||||
|
Loading…
Reference in New Issue
Block a user