[Asterisk-cvs] asterisk utils.c,1.9,1.10
citats at lists.digium.com
citats at lists.digium.com
Tue Jun 22 16:07:41 CDT 2004
- Previous message: [Asterisk-cvs] asterisk/apps app_adsiprog.c,1.7,1.8 app_agi.c,1.42,1.43 app_alarmreceiver.c,1.1,1.2 app_authenticate.c,1.4,1.5 app_chanisavail.c,1.7,1.8 app_controlplayback.c,1.6,1.7 app_datetime.c,1.1,1.2 app_db.c,1.4,1.5 app_dial.c,1.78,1.79 app_directory.c,1.22,1.23 app_disa.c,1.12,1.13 app_echo.c,1.9,1.10 app_enumlookup.c,1.8,1.9 app_festival.c,1.21,1.22 app_flash.c,1.2,1.3 app_getcpeid.c,1.1,1.2 app_hasnewvoicemail.c,1.5,1.6 app_ices.c,1.3,1.4 app_image.c,1.2,1.3 app_intercom.c,1.19,1.20 app_lookupblacklist.c,1.4,1.5 app_lookupcidname.c,1.2,1.3 app_macro.c,1.13,1.14 app_meetme.c,1.45,1.46 app_milliwatt.c,1.8,1.9 app_mp3.c,1.18,1.19 app_nbscat.c,1.6,1.7 app_parkandannounce.c,1.6,1.7 app_playback.c,1.12,1.13 app_privacy.c,1.5,1.6 app_qcall.c,1.10,1.11 app_queue.c,1.71,1.72 app_read.c,1.6,1.7 app_record.c,1.17,1.18 app_rpt.c,1.7,1.8 app_senddtmf.c,1.6,1.7 app_sendtext.c,1.1,1.2 app_setcallerid.c,1.2,1.3 app_setcidname.c,1.2,1.3 app_setcidnum.c,1.2,1.3 app_skel.c,1.6,1.7 app_sms.c,1.5,1.6 app_softhangup.c,1.3,1.4 app_sql_postgres.c,1.5,1.6 app_striplsd.c,1.2,1.3 app_substring.c,1.7,1.8 app_system.c,1.9,1.10 app_talkdetect.c,1.2,1.3 app_transfer.c,1.3,1.4 app_txtcidname.c,1.3,1.4 app_url.c,1.4,1.5 app_userevent.c,1.1,1.2 app_voicemail.c,1.114,1.115 app_waitforring.c,1.3,1.4 app_zapateller.c,1.4,1.5 app_zapbarge.c,1.5,1.6 app_zapras.c,1.7,1.8 app_zapscan.c,1.12,1.13
- Next message: [Asterisk-cvs] asterisk/include/asterisk lock.h,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/home/citats/cvs/asterisk
Modified Files:
utils.c
Log Message:
Code formatting cleanups in utils.c and include/asterisk/lock.h
Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- utils.c 22 Jun 2004 18:48:59 -0000 1.9
+++ utils.c 22 Jun 2004 19:53:36 -0000 1.10
@@ -158,46 +158,54 @@
static void *test_thread_body(void *data)
{
- ast_mutex_lock(&test_lock);
- lock_count += 10;
- if(lock_count != 10) test_errors++;
- ast_mutex_lock(&test_lock);
- lock_count += 10;
- 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++;
- ast_mutex_unlock(&test_lock);
- lock_count -= 10;
- ast_mutex_unlock(&test_lock2);
- if(lock_count != 0) test_errors++;
- return NULL;
+ ast_mutex_lock(&test_lock);
+ lock_count += 10;
+ if (lock_count != 10)
+ test_errors++;
+ ast_mutex_lock(&test_lock);
+ lock_count += 10;
+ 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++;
+ ast_mutex_unlock(&test_lock);
+ lock_count -= 10;
+ ast_mutex_unlock(&test_lock2);
+ if (lock_count != 0)
+ test_errors++;
+ return NULL;
}
int test_for_thread_safety(void)
{
- ast_mutex_lock(&test_lock2);
- ast_mutex_lock(&test_lock);
- lock_count += 1;
- ast_mutex_lock(&test_lock);
- lock_count += 1;
- pthread_create(&test_thread, NULL, test_thread_body, NULL);
- pthread_yield();
- usleep(100);
- if(lock_count != 2) test_errors++;
- ast_mutex_unlock(&test_lock);
- lock_count -= 1;
- pthread_yield();
- usleep(100);
- if(lock_count != 1) test_errors++;
- ast_mutex_unlock(&test_lock);
- lock_count -= 1;
- if(lock_count != 0) test_errors++;
- ast_mutex_unlock(&test_lock2);
- pthread_yield();
- usleep(100);
- if(lock_count != 0) test_errors++;
- pthread_join(test_thread, NULL);
- return(test_errors); /* return 0 on success. */
+ ast_mutex_lock(&test_lock2);
+ ast_mutex_lock(&test_lock);
+ lock_count += 1;
+ ast_mutex_lock(&test_lock);
+ lock_count += 1;
+ pthread_create(&test_thread, NULL, test_thread_body, NULL);
+ pthread_yield();
+ usleep(100);
+ if (lock_count != 2)
+ test_errors++;
+ ast_mutex_unlock(&test_lock);
+ lock_count -= 1;
+ pthread_yield();
+ usleep(100);
+ if (lock_count != 1)
+ test_errors++;
+ ast_mutex_unlock(&test_lock);
+ lock_count -= 1;
+ if (lock_count != 0)
+ test_errors++;
+ ast_mutex_unlock(&test_lock2);
+ pthread_yield();
+ usleep(100);
+ if (lock_count != 0)
+ test_errors++;
+ pthread_join(test_thread, NULL);
+ return(test_errors); /* return 0 on success. */
}
- Previous message: [Asterisk-cvs] asterisk/apps app_adsiprog.c,1.7,1.8 app_agi.c,1.42,1.43 app_alarmreceiver.c,1.1,1.2 app_authenticate.c,1.4,1.5 app_chanisavail.c,1.7,1.8 app_controlplayback.c,1.6,1.7 app_datetime.c,1.1,1.2 app_db.c,1.4,1.5 app_dial.c,1.78,1.79 app_directory.c,1.22,1.23 app_disa.c,1.12,1.13 app_echo.c,1.9,1.10 app_enumlookup.c,1.8,1.9 app_festival.c,1.21,1.22 app_flash.c,1.2,1.3 app_getcpeid.c,1.1,1.2 app_hasnewvoicemail.c,1.5,1.6 app_ices.c,1.3,1.4 app_image.c,1.2,1.3 app_intercom.c,1.19,1.20 app_lookupblacklist.c,1.4,1.5 app_lookupcidname.c,1.2,1.3 app_macro.c,1.13,1.14 app_meetme.c,1.45,1.46 app_milliwatt.c,1.8,1.9 app_mp3.c,1.18,1.19 app_nbscat.c,1.6,1.7 app_parkandannounce.c,1.6,1.7 app_playback.c,1.12,1.13 app_privacy.c,1.5,1.6 app_qcall.c,1.10,1.11 app_queue.c,1.71,1.72 app_read.c,1.6,1.7 app_record.c,1.17,1.18 app_rpt.c,1.7,1.8 app_senddtmf.c,1.6,1.7 app_sendtext.c,1.1,1.2 app_setcallerid.c,1.2,1.3 app_setcidname.c,1.2,1.3 app_setcidnum.c,1.2,1.3 app_skel.c,1.6,1.7 app_sms.c,1.5,1.6 app_softhangup.c,1.3,1.4 app_sql_postgres.c,1.5,1.6 app_striplsd.c,1.2,1.3 app_substring.c,1.7,1.8 app_system.c,1.9,1.10 app_talkdetect.c,1.2,1.3 app_transfer.c,1.3,1.4 app_txtcidname.c,1.3,1.4 app_url.c,1.4,1.5 app_userevent.c,1.1,1.2 app_voicemail.c,1.114,1.115 app_waitforring.c,1.3,1.4 app_zapateller.c,1.4,1.5 app_zapbarge.c,1.5,1.6 app_zapras.c,1.7,1.8 app_zapscan.c,1.12,1.13
- Next message: [Asterisk-cvs] asterisk/include/asterisk lock.h,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the svn-commits
mailing list