mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-23 13:09:00 +00:00
Code formatting cleanups in utils.c and include/asterisk/lock.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -354,7 +354,6 @@ static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
|
||||
#define AST_MUTEX_DEFINE_STATIC(mutex) __AST_MUTEX_DEFINE(static,mutex)
|
||||
#define AST_MUTEX_DEFINE_EXPORTED(mutex) __AST_MUTEX_DEFINE(/**/,mutex)
|
||||
|
||||
|
||||
#define AST_MUTEX_INITIALIZER __use_AST_MUTEX_DEFINE_STATIC_rather_than_AST_MUTEX_INITIALIZER__
|
||||
|
||||
#define gethostbyname __gethostbyname__is__not__reentrant__use__ast_gethostbyname__instead__
|
||||
|
24
utils.c
24
utils.c
@@ -160,18 +160,22 @@ static void *test_thread_body(void *data)
|
||||
{
|
||||
ast_mutex_lock(&test_lock);
|
||||
lock_count += 10;
|
||||
if(lock_count != 10) test_errors++;
|
||||
if (lock_count != 10)
|
||||
test_errors++;
|
||||
ast_mutex_lock(&test_lock);
|
||||
lock_count += 10;
|
||||
if(lock_count != 20) test_errors++;
|
||||
if (lock_count != 20)
|
||||
test_errors++;
|
||||
ast_mutex_lock(&test_lock2);
|
||||
ast_mutex_unlock(&test_lock);
|
||||
lock_count -= 10;
|
||||
if(lock_count != 10) test_errors++;
|
||||
if (lock_count != 10)
|
||||
test_errors++;
|
||||
ast_mutex_unlock(&test_lock);
|
||||
lock_count -= 10;
|
||||
ast_mutex_unlock(&test_lock2);
|
||||
if(lock_count != 0) test_errors++;
|
||||
if (lock_count != 0)
|
||||
test_errors++;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -185,19 +189,23 @@ int test_for_thread_safety(void)
|
||||
pthread_create(&test_thread, NULL, test_thread_body, NULL);
|
||||
pthread_yield();
|
||||
usleep(100);
|
||||
if(lock_count != 2) test_errors++;
|
||||
if (lock_count != 2)
|
||||
test_errors++;
|
||||
ast_mutex_unlock(&test_lock);
|
||||
lock_count -= 1;
|
||||
pthread_yield();
|
||||
usleep(100);
|
||||
if(lock_count != 1) test_errors++;
|
||||
if (lock_count != 1)
|
||||
test_errors++;
|
||||
ast_mutex_unlock(&test_lock);
|
||||
lock_count -= 1;
|
||||
if(lock_count != 0) test_errors++;
|
||||
if (lock_count != 0)
|
||||
test_errors++;
|
||||
ast_mutex_unlock(&test_lock2);
|
||||
pthread_yield();
|
||||
usleep(100);
|
||||
if(lock_count != 0) test_errors++;
|
||||
if (lock_count != 0)
|
||||
test_errors++;
|
||||
pthread_join(test_thread, NULL);
|
||||
return(test_errors); /* return 0 on success. */
|
||||
}
|
||||
|
Reference in New Issue
Block a user