fixes for actually running

pquerna · Mar 17, 2012 · e512027 · e512027
1 parent c4cf064
commit e512027
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/spedye_main.c b/src/spedye_main.c
@@ -35,6 +35,7 @@ process_args(spedye_conf_t *conf, int argc, char *argv[])
   for (i = 0; i < argc; i++) {
     printf("[%d] =  %s\n", i, argv[i]);
   }
+  conf->worker_count = 10;
   return 0;
 }
 

diff --git a/src/spedye_master.c b/src/spedye_master.c
@@ -26,8 +26,7 @@ master_create_workers(spedye_master_t *m)
 {
   int i;
   for (i = 0; i < m->conf->worker_count; i++) {
-    spedye_worker_t *w = m->workers[i];
-    spedye_worker_create(&w, m);
+    spedye_worker_create(&m->workers[i], m);
   }
 }
 
@@ -48,6 +47,7 @@ master_destroy_workers(spedye_master_t *m)
   for (i = 0; i < m->conf->worker_count; i++) {
     spedye_worker_t *w = m->workers[i];
     spedye_worker_destroy(w);
+    m->workers[i] = NULL;
   }
 }
 
@@ -72,7 +72,7 @@ master_shutdown(uv_async_t* handle, int status)
   spedye_master_t *m = handle->data;
   m->state = SPEDYE_STOPING;
   master_destroy_workers(m);
-  uv_close((uv_handle_t*)&m->master_wakeup, master_shutdown_closecb);
+  uv_close((uv_handle_t*)handle, master_shutdown_closecb);
 }
 
 int

diff --git a/src/spedye_worker.c b/src/spedye_worker.c
@@ -29,7 +29,7 @@ worker_shutdown(uv_async_t* handle, int status)
 {
   spedye_worker_t *w = handle->data;
   w->state = SPEDYE_STOPING;
-  uv_close((uv_handle_t*)&w->worker_wakeup, worker_shutdown_closecb);
+  uv_close((uv_handle_t*)handle, worker_shutdown_closecb);
 }
 
 static void
@@ -55,7 +55,7 @@ spedye_worker_create(spedye_worker_t **w_out, spedye_master_t *m)
 
   rc = uv_async_init(w->loop, &w->worker_wakeup, worker_shutdown);
 
-  w->worker_wakeup.data = m;
+  w->worker_wakeup.data = w;
 
   *w_out = w;