kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code formatting cleanups in utils.c and include/asterisk/lock.h

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-06-22 19:53:36 +00:00
parent f5c18f62a1
commit 024f486810
2 changed files with 102 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/asterisk/lock.h
View File

@@ -76,7 +76,7 @@ static inline int __ast_pthread_mutex_init_attr(char *filename, int lineno, char
pthread_mutexattr_t *attr) pthread_mutexattr_t *attr)
{ {
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
if((t->mutex) != ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) { if ((t->mutex) != ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is already initialized.\n", fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is already initialized.\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
fprintf(stderr, "%s line %d (%s): Error: previously initialization of mutex '%s'.\n", fprintf(stderr, "%s line %d (%s): Error: previously initialization of mutex '%s'.\n",
@@ -95,7 +95,7 @@ static inline int __ast_pthread_mutex_init_attr(char *filename, int lineno, char
} }
static inline int __ast_pthread_mutex_init(char *filename, int lineno, char *func, static inline int __ast_pthread_mutex_init(char *filename, int lineno, char *func,
char* mutex_name, ast_mutex_t *t) char *mutex_name, ast_mutex_t *t)
{ {
static pthread_mutexattr_t attr; static pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr); pthread_mutexattr_init(&attr);
@@ -107,17 +107,17 @@ static inline int __ast_pthread_mutex_init(char *filename, int lineno, char *fun
#define ast_pthread_mutex_init(pmutex,attr) __ast_pthread_mutex_init_attr(__FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex, attr) #define ast_pthread_mutex_init(pmutex,attr) __ast_pthread_mutex_init_attr(__FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex, attr)
static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *func, static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *func,
char* mutex_name, ast_mutex_t *t) char *mutex_name, ast_mutex_t *t)
{ {
int res; int res;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) { if ((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n", fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
} }
#endif #endif
res = pthread_mutex_trylock(&t->mutex); res = pthread_mutex_trylock(&t->mutex);
switch( res ) { switch (res) {
case 0: case 0:
pthread_mutex_unlock(&t->mutex); pthread_mutex_unlock(&t->mutex);
break; break;
@@ -182,7 +182,7 @@ static inline int __ast_pthread_mutex_lock(char *filename, int lineno, char *fun
{ {
int res; int res;
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE) #if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE)
if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) { if ((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n", fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
@@ -195,8 +195,8 @@ static inline int __ast_pthread_mutex_lock(char *filename, int lineno, char *fun
time_t seconds seconds = time(NULL); time_t seconds seconds = time(NULL);
do { do {
res = pthread_mutex_trylock(&t->mutex); res = pthread_mutex_trylock(&t->mutex);
if(res == EBUSY) { if (res == EBUSY) {
if((time(NULL) - seconds) % 5) { if ((time(NULL) - seconds) % 5) {
fprintf(stderr, "%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n", fprintf(stderr, "%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n",
filename, lineno, func, (time(NULL) - seconds), mutex_name); filename, lineno, func, (time(NULL) - seconds), mutex_name);
fprintf(stderr, "%s line %d (%s): '%s' was locked here.\n", fprintf(stderr, "%s line %d (%s): '%s' was locked here.\n",
@@ -231,7 +231,7 @@ static inline int __ast_pthread_mutex_trylock(char *filename, int lineno, char *
{ {
int res; int res;
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE) #if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE)
if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) { if ((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n", fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
@@ -255,7 +255,7 @@ static inline int __ast_pthread_mutex_unlock(char *filename, int lineno, char *f
char* mutex_name, ast_mutex_t *t) { char* mutex_name, ast_mutex_t *t) {
int res; int res;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) { if ((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n", fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
} }
@@ -331,13 +331,13 @@ static void __attribute__ ((destructor)) fini_##mutex(void) \
static inline int ast_mutex_lock(ast_mutex_t *pmutex) static inline int ast_mutex_lock(ast_mutex_t *pmutex)
{ {
if(*pmutex == (ast_mutex_t)AST_MUTEX_KIND) if (*pmutex == (ast_mutex_t)AST_MUTEX_KIND)
ast_mutex_init(pmutex); ast_mutex_init(pmutex);
return pthread_mutex_lock(pmutex); return pthread_mutex_lock(pmutex);
} }
static inline int ast_mutex_trylock(ast_mutex_t *pmutex) static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
{ {
if(*pmutex == (ast_mutex_t)AST_MUTEX_KIND) if (*pmutex == (ast_mutex_t)AST_MUTEX_KIND)
ast_mutex_init(pmutex); ast_mutex_init(pmutex);
return pthread_mutex_trylock(pmutex); return pthread_mutex_trylock(pmutex);
} }
@@ -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_STATIC(mutex) __AST_MUTEX_DEFINE(static,mutex)
#define AST_MUTEX_DEFINE_EXPORTED(mutex) __AST_MUTEX_DEFINE(/**/,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 AST_MUTEX_INITIALIZER __use_AST_MUTEX_DEFINE_STATIC_rather_than_AST_MUTEX_INITIALIZER__
#define gethostbyname __gethostbyname__is__not__reentrant__use__ast_gethostbyname__instead__ #define gethostbyname __gethostbyname__is__not__reentrant__use__ast_gethostbyname__instead__

24
utils.c
View File

@@ -160,18 +160,22 @@ static void *test_thread_body(void *data)
{ {
ast_mutex_lock(&test_lock); ast_mutex_lock(&test_lock);
lock_count += 10; lock_count += 10;
if(lock_count != 10) test_errors++; if (lock_count != 10)
test_errors++;
ast_mutex_lock(&test_lock); ast_mutex_lock(&test_lock);
lock_count += 10; lock_count += 10;
if(lock_count != 20) test_errors++; if (lock_count != 20)
test_errors++;
ast_mutex_lock(&test_lock2); ast_mutex_lock(&test_lock2);
ast_mutex_unlock(&test_lock); ast_mutex_unlock(&test_lock);
lock_count -= 10; lock_count -= 10;
if(lock_count != 10) test_errors++; if (lock_count != 10)
test_errors++;
ast_mutex_unlock(&test_lock); ast_mutex_unlock(&test_lock);
lock_count -= 10; lock_count -= 10;
ast_mutex_unlock(&test_lock2); ast_mutex_unlock(&test_lock2);
if(lock_count != 0) test_errors++; if (lock_count != 0)
test_errors++;
return NULL; return NULL;
} }
@@ -185,19 +189,23 @@ int test_for_thread_safety(void)
pthread_create(&test_thread, NULL, test_thread_body, NULL); pthread_create(&test_thread, NULL, test_thread_body, NULL);
pthread_yield(); pthread_yield();
usleep(100); usleep(100);
if(lock_count != 2) test_errors++; if (lock_count != 2)
test_errors++;
ast_mutex_unlock(&test_lock); ast_mutex_unlock(&test_lock);
lock_count -= 1; lock_count -= 1;
pthread_yield(); pthread_yield();
usleep(100); usleep(100);
if(lock_count != 1) test_errors++; if (lock_count != 1)
test_errors++;
ast_mutex_unlock(&test_lock); ast_mutex_unlock(&test_lock);
lock_count -= 1; lock_count -= 1;
if(lock_count != 0) test_errors++; if (lock_count != 0)
test_errors++;
ast_mutex_unlock(&test_lock2); ast_mutex_unlock(&test_lock2);
pthread_yield(); pthread_yield();
usleep(100); usleep(100);
if(lock_count != 0) test_errors++; if (lock_count != 0)
test_errors++;
pthread_join(test_thread, NULL); pthread_join(test_thread, NULL);
return(test_errors); /* return 0 on success. */ return(test_errors); /* return 0 on success. */
} }