[Asterisk-cvs] asterisk pbx.c,1.88,1.89 sched.c,1.8,1.9
markster at lists.digium.com
markster at lists.digium.com
Fri Nov 21 12:12:22 CST 2003
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv11652
Modified Files:
pbx.c sched.c
Log Message:
Make CALLTYPE available
Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- pbx.c 13 Nov 2003 20:42:17 -0000 1.88
+++ pbx.c 21 Nov 2003 18:38:42 -0000 1.89
@@ -2342,8 +2342,7 @@
static int handle_show_application(int fd, int argc, char *argv[])
{
struct ast_app *a;
- int n, app, no_registered_app = 1;
- char *buf;
+ int app, no_registered_app = 1;
if (argc < 3) return RESULT_SHOWUSAGE;
@@ -2360,19 +2359,46 @@
* to 'show application' command ... */
for (app = 2; app < argc; app++) {
if (!strcasecmp(a->name, argv[app])) {
+ /* Maximum number of characters added by terminal coloring is 22 */
+ char infotitle[64 + AST_MAX_APP + 22], syntitle[40], destitle[40];
+ char info[64 + AST_MAX_APP], *synopsis = NULL, *description = NULL;
+ int synopsis_size, description_size;
+
no_registered_app = 0;
- /* ... one of our applications, show info ...*/
- n = asprintf(&buf,
- "\n -= Info about application '%s' =- \n\n"
- "[Synopsis]:\n %s\n\n"
- "[Description]:\n%s\n",
- a->name,
- a->synopsis ? a->synopsis : "Not available",
- a->description ? a-> description : "Not available");
- if (n >= 0) {
- ast_cli(fd, buf);
- free(buf);
+ if (a->synopsis)
+ synopsis_size = strlen(a->synopsis) + 23;
+ else
+ synopsis_size = strlen("Not available") + 23;
+ synopsis = alloca(synopsis_size);
+
+ if (a->description)
+ description_size = strlen(a->description) + 23;
+ else
+ description_size = strlen("Not available") + 23;
+ description = alloca(description_size);
+
+ if (synopsis && description) {
+ snprintf(info, 64 + AST_MAX_APP, "\n -= Info about application '%s' =- \n\n", a->name);
+ term_color(infotitle, info, COLOR_MAGENTA, 0, 64 + AST_MAX_APP + 22);
+ term_color(syntitle, "[Synopsis]:\n", COLOR_MAGENTA, 0, 40);
+ term_color(destitle, "[Description]:\n", COLOR_MAGENTA, 0, 40);
+ term_color(synopsis,
+ a->synopsis ? a->synopsis : "Not available",
+ COLOR_CYAN, 0, synopsis_size);
+ term_color(description,
+ a->description ? a->description : "Not available",
+ COLOR_CYAN, 0, description_size);
+
+ ast_cli(fd,"%s%s%s\n\n%s%s\n", infotitle, syntitle, synopsis, destitle, description);
+ } else {
+ /* ... one of our applications, show info ...*/
+ ast_cli(fd,"\n -= Info about application '%s' =- \n\n"
+ "[Synopsis]:\n %s\n\n"
+ "[Description]:\n%s\n",
+ a->name,
+ a->synopsis ? a->synopsis : "Not available",
+ a->description ? a->description : "Not available");
}
}
}
Index: sched.c
===================================================================
RCS file: /usr/cvsroot/asterisk/sched.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sched.c 12 Nov 2003 08:57:23 -0000 1.8
+++ sched.c 21 Nov 2003 18:38:42 -0000 1.9
@@ -21,6 +21,8 @@
#include <stdlib.h>
#include <sys/time.h>
#include <unistd.h>
+#include <pthread.h>
+
#include <asterisk/sched.h>
#include <asterisk/logger.h>
#include <asterisk/channel.h>
@@ -39,6 +41,7 @@
};
struct sched_context {
+ ast_mutex_t lock;
/* Number of events processed */
int eventcnt;
@@ -60,6 +63,7 @@
struct sched_context *tmp;
tmp = malloc(sizeof(struct sched_context));
if (tmp) {
+ ast_mutex_init(&tmp->lock);
tmp->eventcnt = 1;
tmp->schedcnt = 0;
tmp->schedq = NULL;
@@ -74,6 +78,7 @@
void sched_context_destroy(struct sched_context *con)
{
struct sched *s, *sl;
+ ast_mutex_lock(&con->lock);
#ifdef SCHED_MAX_CACHE
/* Eliminate the cache */
s = con->schedc;
@@ -91,6 +96,7 @@
free(sl);
}
/* And the context */
+ ast_mutex_unlock(&con->lock);
free(con);
}
@@ -138,16 +144,19 @@
struct timeval tv;
int ms;
DEBUG(ast_log(LOG_DEBUG, "ast_sched_wait()\n"));
- if (!con->schedq)
- return -1;
- if (gettimeofday(&tv, NULL) < 0) {
+ ast_mutex_lock(&con->lock);
+ if (!con->schedq) {
+ ms = -1;
+ } else if (gettimeofday(&tv, NULL) < 0) {
/* This should never happen */
- return 0;
- };
- ms = (con->schedq->when.tv_sec - tv.tv_sec) * 1000;
- ms += (con->schedq->when.tv_usec - tv.tv_usec) / 1000;
- if (ms < 0)
ms = 0;
+ } else {
+ ms = (con->schedq->when.tv_sec - tv.tv_sec) * 1000;
+ ms += (con->schedq->when.tv_usec - tv.tv_usec) / 1000;
+ if (ms < 0)
+ ms = 0;
+ }
+ ast_mutex_unlock(&con->lock);
return ms;
}
@@ -223,11 +232,13 @@
* Schedule callback(data) to happen when ms into the future
*/
struct sched *tmp;
+ int res = -1;
DEBUG(ast_log(LOG_DEBUG, "ast_sched_add()\n"));
if (!when) {
ast_log(LOG_NOTICE, "Scheduled event in 0 ms?\n");
return -1;
}
+ ast_mutex_lock(&con->lock);
if ((tmp = sched_alloc(con))) {
tmp->id = con->eventcnt++;
tmp->callback = callback;
@@ -237,12 +248,13 @@
tmp->when.tv_usec = 0;
if (sched_settime(&tmp->when, when)) {
sched_release(con, tmp);
- return -1;
- } else
+ } else {
schedule(con, tmp);
- } else
- return -1;
- return tmp->id;
+ res = tmp->id;
+ }
+ }
+ ast_mutex_lock(&con->lock);
+ return res;
}
int ast_sched_del(struct sched_context *con, int id)
@@ -255,6 +267,7 @@
*/
struct sched *last=NULL, *s;
DEBUG(ast_log(LOG_DEBUG, "ast_sched_del()\n"));
+ ast_mutex_lock(&con->lock);
s = con->schedq;
while(s) {
if (s->id == id) {
@@ -264,16 +277,20 @@
con->schedq = s->next;
con->schedcnt--;
sched_release(con, s);
- return 0;
+ break;
}
last = s;
s = s->next;
}
- ast_log(LOG_NOTICE, "Attempted to delete non-existant schedule entry %d!\n", id);
+ ast_mutex_unlock(&con->lock);
+ if (!s) {
+ ast_log(LOG_NOTICE, "Attempted to delete non-existant schedule entry %d!\n", id);
#ifdef DO_CRASH
- CRASH;
+ CRASH;
#endif
- return -1;
+ return -1;
+ } else
+ return 0;
}
void ast_sched_dump(struct sched_context *con)
@@ -327,13 +344,14 @@
int x=0;
DEBUG(ast_log(LOG_DEBUG, "ast_sched_runq()\n"));
+ ast_mutex_lock(&con->lock);
for(;;) {
if (!con->schedq)
break;
if (gettimeofday(&tv, NULL)) {
/* This should never happen */
ast_log(LOG_NOTICE, "gettimeofday() failed!\n");
- return 0;
+ break;
}
/* We only care about millisecond accuracy anyway, so this will
help us get more than one event at one time if they are very
@@ -369,5 +387,6 @@
} else
break;
}
+ ast_mutex_unlock(&con->lock);
return x;
}
More information about the svn-commits
mailing list