#include <time.h>
#include <asterisk/logger.h>
#include <asterisk/options.h>
+#include <asterisk/channel.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
va_list ap;
va_start(ap, fmt);
- pthread_mutex_lock(&loglock);
+ if (!option_verbose && !option_debug && (!level))
+ return;
+ ast_pthread_mutex_lock(&loglock);
if (level == 1 /* Event */) {
time(&t);
tm = localtime(&t);
vfprintf(stdout, fmt, ap);
fflush(stdout);
}
- pthread_mutex_unlock(&loglock);
+ ast_pthread_mutex_unlock(&loglock);
va_end(ap);
}
struct verb *v;
va_list ap;
va_start(ap, fmt);
- pthread_mutex_lock(&msglist_lock);
+ ast_pthread_mutex_lock(&msglist_lock);
vsnprintf(stuff + pos, sizeof(stuff) - pos, fmt, ap);
opos = pos;
pos = strlen(stuff);
}
}
}
- pthread_mutex_lock(&loglock);
if (verboser) {
v = verboser;
while(v) {
v->verboser(stuff, opos, replacelast, complete);
v = v->next;
}
- } else
- fprintf(stdout, stuff + opos);
+ } /* else
+ fprintf(stdout, stuff + opos); */
if (fmt[strlen(fmt)-1] != '\n')
replacelast = 1;
else
replacelast = pos = 0;
- pthread_mutex_unlock(&loglock);
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))
{
/* XXX Should be more flexible here, taking > 1 verboser XXX */
if ((tmp = malloc(sizeof (struct verb)))) {
tmp->verboser = v;
- pthread_mutex_lock(&msglist_lock);
+ ast_pthread_mutex_lock(&msglist_lock);
tmp->next = verboser;
verboser = tmp;
m = list;
v(m->msg, 0, 0, 1);
m = m->next;
}
- pthread_mutex_unlock(&msglist_lock);
+ ast_pthread_mutex_unlock(&msglist_lock);
return 0;
}
return -1;
{
int res = -1;
struct verb *tmp, *tmpl=NULL;
- pthread_mutex_lock(&msglist_lock);
+ ast_pthread_mutex_lock(&msglist_lock);
tmp = verboser;
while(tmp) {
if (tmp->verboser == v) {
tmpl->next = tmp->next;
else
verboser = tmp->next;
+ free(tmp);
break;
}
tmpl = tmp;
}
if (tmp)
res = 0;
- pthread_mutex_unlock(&msglist_lock);
+ ast_pthread_mutex_unlock(&msglist_lock);
return res;
}