DeforaOS/libApp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly improved debugging information

Browse Source
This commit is contained in:
Pierre Pronchery 2011-10-15 14:13:45 +00:00
parent edaabda988
commit f8e508a566
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/appserver.c
View File

@ -168,7 +168,7 @@ static AppServerClient * _appserverclient_new(int fd, uint32_t addr,
asc->fd = fd; asc->fd = fd;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%d, %x, %u) => %p\n", __func__, fd, addr, fprintf(stderr, "DEBUG: %s(%d, %x, %u) => %p\n", __func__, fd, addr,
port, asc); port, (void *)asc);
#endif #endif
return asc; return asc;
} }
@ -178,7 +178,7 @@ static AppServerClient * _appserverclient_new(int fd, uint32_t addr,
static void _appserverclient_delete(AppServerClient * appserverclient) static void _appserverclient_delete(AppServerClient * appserverclient)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p)\n", __func__, appserverclient); fprintf(stderr, "DEBUG: %s(%p)\n", __func__, (void *)appserverclient);
#endif #endif
#ifdef WITH_SSL #ifdef WITH_SSL
if(appserverclient->ssl != NULL) if(appserverclient->ssl != NULL)
@ -213,7 +213,8 @@ static int _appserver_client_remove(AppServer * appserver,
unsigned int i; unsigned int i;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p, %p)\n", __func__, appserver, asc); fprintf(stderr, "DEBUG: %s(%p, %p)\n", __func__, (void *)appserver,
(void *)asc);
#endif #endif
for(i = 0; i < array_count(appserver->clients); i++) for(i = 0; i < array_count(appserver->clients); i++)
{ {
@ -291,7 +292,7 @@ static int _appserver_read(int fd, AppServer * appserver)
return _read_eof(appserver, asc); return _read_eof(appserver, asc);
asc->buf_read_cnt += len; asc->buf_read_cnt += len;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "%s%d%s%zd%s", "DEBUG: read(", fd, ") => ", len, "\n"); fprintf(stderr, "%s%d%s%ld%s", "DEBUG: read(", fd, ") => ", len, "\n");
#endif #endif
if(_read_process(appserver, asc) != 0) if(_read_process(appserver, asc) != 0)
{ {
@ -304,7 +305,8 @@ static int _appserver_read(int fd, AppServer * appserver)
static int _read_error(AppServer * appserver, AppServerClient * asc) static int _read_error(AppServer * appserver, AppServerClient * asc)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p, %p)\n", __func__, appserver, asc); fprintf(stderr, "DEBUG: %s(%p, %p)\n", __func__, (void *)appserver,
(void *)asc);
#endif #endif
#ifdef WITH_SSL #ifdef WITH_SSL
error_set_code(1, "%s", _appserver_error_ssl()); error_set_code(1, "%s", _appserver_error_ssl());
@ -322,7 +324,8 @@ static int _read_error(AppServer * appserver, AppServerClient * asc)
static int _read_eof(AppServer * appserver, AppServerClient * asc) static int _read_eof(AppServer * appserver, AppServerClient * asc)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p, %p)\n", __func__, appserver, asc); fprintf(stderr, "DEBUG: %s(%p, %p)\n", __func__, (void *)appserver,
(void *)asc);
#endif #endif
_appserver_client_remove(appserver, asc); _appserver_client_remove(appserver, asc);
return 1; return 1;
@ -390,7 +393,7 @@ static int _appserver_write(int fd, AppServer * appserver)
if((len = asc->write(asc, asc->buf_write, asc->buf_write_cnt)) <= 0) if((len = asc->write(asc, asc->buf_write, asc->buf_write_cnt)) <= 0)
return _write_error(asc); return _write_error(asc);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: write(%d, %zu) => %zd\n", fd, fprintf(stderr, "DEBUG: write(%d, %lu) => %ld\n", fd,
asc->buf_write_cnt, len); asc->buf_write_cnt, len);
#endif #endif
memmove(asc->buf_write, &asc->buf_write[len], len); memmove(asc->buf_write, &asc->buf_write[len], len);
@ -529,9 +532,9 @@ static int _new_server(AppServer * appserver, char const * app, int options)
struct sockaddr_in sa; struct sockaddr_in sa;
if((appserver->interface = appinterface_new_server(app)) == NULL) if((appserver->interface = appinterface_new_server(app)) == NULL)
return 1; return -1;
if((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) if((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
return error_set_code(1, "%s%s", "socket: ", strerror(errno)); return -error_set_code(1, "%s%s", "socket: ", strerror(errno));
sa.sin_family = AF_INET; sa.sin_family = AF_INET;
sa.sin_port = htons(appinterface_get_port(appserver->interface)); sa.sin_port = htons(appinterface_get_port(appserver->interface));
sa.sin_addr.s_addr = htonl(options & ASO_LOCAL ? INADDR_LOOPBACK sa.sin_addr.s_addr = htonl(options & ASO_LOCAL ? INADDR_LOOPBACK
@ -550,13 +553,16 @@ static int _new_server(AppServer * appserver, char const * app, int options)
else else
error_set_code(1, "%s%s", "bind: ", strerror(errno)); error_set_code(1, "%s%s", "bind: ", strerror(errno));
close(fd); close(fd);
return 1; return -1;
} }
/* appserver_delete */ /* appserver_delete */
void appserver_delete(AppServer * appserver) void appserver_delete(AppServer * appserver)
{ {
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif
if(appserver->interface != NULL) if(appserver->interface != NULL)
appinterface_delete(appserver->interface); appinterface_delete(appserver->interface);
if(appserver->event_free != 0) if(appserver->event_free != 0)
@ -582,5 +588,8 @@ void * appserver_get_client_id(AppServer * appserver)
/* appserver_loop */ /* appserver_loop */
int appserver_loop(AppServer * appserver) int appserver_loop(AppServer * appserver)
{ {
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif
return event_loop(appserver->event); return event_loop(appserver->event);
} }