sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version 0.1.8 from FTP 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer 2001-04-30 17:39:02 +00:00
parent d6cb5495fa
commit fb7bdf8ae0
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
logger.c
View File

@ -17,6 +17,7 @@
#include <time.h> #include <time.h>
#include <asterisk/logger.h> #include <asterisk/logger.h>
#include <asterisk/options.h> #include <asterisk/options.h>
#include <asterisk/channel.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
@ -76,7 +77,9 @@ extern void ast_log(int level, char *file, int line, char *function, char *fmt,
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
pthread_mutex_lock(&loglock); if (!option_verbose && !option_debug && (!level))
return;
ast_pthread_mutex_lock(&loglock);
if (level == 1 /* Event */) { if (level == 1 /* Event */) {
time(&t); time(&t);
tm = localtime(&t); tm = localtime(&t);
@ -93,7 +96,7 @@ extern void ast_log(int level, char *file, int line, char *function, char *fmt,
vfprintf(stdout, fmt, ap); vfprintf(stdout, fmt, ap);
fflush(stdout); fflush(stdout);
} }
pthread_mutex_unlock(&loglock); ast_pthread_mutex_unlock(&loglock);
va_end(ap); va_end(ap);
} }
@ -106,7 +109,7 @@ extern void ast_verbose(char *fmt, ...)
struct verb *v; struct verb *v;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
pthread_mutex_lock(&msglist_lock); ast_pthread_mutex_lock(&msglist_lock);
vsnprintf(stuff + pos, sizeof(stuff) - pos, fmt, ap); vsnprintf(stuff + pos, sizeof(stuff) - pos, fmt, ap);
opos = pos; opos = pos;
pos = strlen(stuff); pos = strlen(stuff);
@ -141,25 +144,36 @@ extern void ast_verbose(char *fmt, ...)
} }
} }
} }
pthread_mutex_lock(&loglock);
if (verboser) { if (verboser) {
v = verboser; v = verboser;
while(v) { while(v) {
v->verboser(stuff, opos, replacelast, complete); v->verboser(stuff, opos, replacelast, complete);
v = v->next; v = v->next;
} }
} else } /* else
fprintf(stdout, stuff + opos); fprintf(stdout, stuff + opos); */
if (fmt[strlen(fmt)-1] != '\n') if (fmt[strlen(fmt)-1] != '\n')
replacelast = 1; replacelast = 1;
else else
replacelast = pos = 0; replacelast = pos = 0;
pthread_mutex_unlock(&loglock);
va_end(ap); va_end(ap);
pthread_mutex_unlock(&msglist_lock); ast_pthread_mutex_unlock(&msglist_lock);
} }
int ast_verbose_dmesg(void (*v)(char *string, int opos, int replacelast, int complete))
{
struct msglist *m;
m = list;
ast_pthread_mutex_lock(&msglist_lock);
while(m) {
/* Send all the existing entries that we have queued (i.e. they're likely to have missed) */
v(m->msg, 0, 0, 1);
m = m->next;
}
ast_pthread_mutex_unlock(&msglist_lock);
return 0;
}
int ast_register_verbose(void (*v)(char *string, int opos, int replacelast, int complete)) int ast_register_verbose(void (*v)(char *string, int opos, int replacelast, int complete))
{ {
@ -168,7 +182,7 @@ int ast_register_verbose(void (*v)(char *string, int opos, int replacelast, int
/* XXX Should be more flexible here, taking > 1 verboser XXX */ /* XXX Should be more flexible here, taking > 1 verboser XXX */
if ((tmp = malloc(sizeof (struct verb)))) { if ((tmp = malloc(sizeof (struct verb)))) {
tmp->verboser = v; tmp->verboser = v;
pthread_mutex_lock(&msglist_lock); ast_pthread_mutex_lock(&msglist_lock);
tmp->next = verboser; tmp->next = verboser;
verboser = tmp; verboser = tmp;
m = list; m = list;
@ -177,7 +191,7 @@ int ast_register_verbose(void (*v)(char *string, int opos, int replacelast, int
v(m->msg, 0, 0, 1); v(m->msg, 0, 0, 1);
m = m->next; m = m->next;
} }
pthread_mutex_unlock(&msglist_lock); ast_pthread_mutex_unlock(&msglist_lock);
return 0; return 0;
} }
return -1; return -1;
@ -187,7 +201,7 @@ int ast_unregister_verbose(void (*v)(char *string, int opos, int replacelast, in
{ {
int res = -1; int res = -1;
struct verb *tmp, *tmpl=NULL; struct verb *tmp, *tmpl=NULL;
pthread_mutex_lock(&msglist_lock); ast_pthread_mutex_lock(&msglist_lock);
tmp = verboser; tmp = verboser;
while(tmp) { while(tmp) {
if (tmp->verboser == v) { if (tmp->verboser == v) {
@ -195,6 +209,7 @@ int ast_unregister_verbose(void (*v)(char *string, int opos, int replacelast, in
tmpl->next = tmp->next; tmpl->next = tmp->next;
else else
verboser = tmp->next; verboser = tmp->next;
free(tmp);
break; break;
} }
tmpl = tmp; tmpl = tmp;
@ -202,6 +217,6 @@ int ast_unregister_verbose(void (*v)(char *string, int opos, int replacelast, in
} }
if (tmp) if (tmp)
res = 0; res = 0;
pthread_mutex_unlock(&msglist_lock); ast_pthread_mutex_unlock(&msglist_lock);
return res; return res;
} }