[pisa-src] r1654 - in trunk: pisacd/cdmain.c pisasd/sdmain.c
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 12 Nov 2009 13:23:27 +0100
Author: tjansen
Date: Thu Nov 12 13:23:21 2009
New Revision: 1654
Log:
Moved inititalization code in pisa{c,s}d to the init functions.
Modified:
trunk/pisacd/cdmain.c
trunk/pisasd/sdmain.c
Modified: trunk/pisacd/cdmain.c
==============================================================================
--- trunk/pisacd/cdmain.c Thu Nov 12 13:08:21 2009 (r1653)
+++ trunk/pisacd/cdmain.c Thu Nov 12 13:23:21 2009 (r1654)
@@ -338,6 +338,12 @@
/* Initialize the scheduler */
pisa_sched_init(&cd_ctx.scheduler);
+
+ /* Add all servers from the config */
+ pisa_servers_add_all();
+
+ cd_ctx.flag_running = true;
+ PISA_INFO("\nEntering main loop\n");
}
static void cd_deinit(void)
@@ -381,10 +387,6 @@
/* Initialize basic settings */
cd_init(argc, argv);
- cd_ctx.flag_running = true;
-
- pisa_servers_add_all();
-
/* initialize the poll descriptors
* sockets.tunnel needs to be always included in the reading fd list
*/
@@ -396,8 +398,6 @@
for (i = 0; i < nfds; i++)
pfds[i].events = POLLIN;
-
- PISA_INFO("\nEntering main loop\n");
while (cd_ctx.flag_running || cd_ctx.flag_pending) {
Modified: trunk/pisasd/sdmain.c
==============================================================================
--- trunk/pisasd/sdmain.c Thu Nov 12 13:08:21 2009 (r1653)
+++ trunk/pisasd/sdmain.c Thu Nov 12 13:23:21 2009 (r1654)
@@ -384,6 +384,9 @@
/* Initialize the scheduler */
pisa_sched_init(&sd_ctx.scheduler);
+
+ sd_ctx.flag_running = true;
+ PISA_INFO("\nEntering main loop\n");
}
/**
@@ -453,9 +456,6 @@
for (i = 0; i < nfds; i++)
pfds[i].events = POLLIN;
- sd_ctx.flag_running = true;
- PISA_INFO("\nEntering main loop\n");
-
while (sd_ctx.flag_running) {
if (poll(pfds, nfds, -1) > 0) {
Other related posts:
- » [pisa-src] r1654 - in trunk: pisacd/cdmain.c pisasd/sdmain.c - Thomas Jansen
