holy crap, it actually kinda works now

Previously, I had a stupid system where I would create a thread after
every accept(), and put worker descriptors in a queue. A special
"scheduler" thread would then pick them out, and give out jobs to
complete.

The problem was, of course, I couldn't conveniently poll job status from
workers. I thought about using poll(), but that turned out to be a
horribly complicated API. How do I deal with partial reads, for example?
I don't honestly know.

Then it hit me that I could just use the threads that handle accept()ed
connections as "worker threads", which would synchronously schedule jobs
and wait for them to complete. This solves every problem and removes the
need for a lot of inter-thread synchronization magic. It even works now,
holy crap! You can launch and terminate workers at will, and they will
pick up new jobs automatically.

As a side not, msg_recv_and_handle turned out to be too limiting and
complicated for me, so I got rid of that, and do normal
msg_recv/msg_send calls.

1 files changed, 0 insertions, 7 deletions

diff --git a/src/server.h b/src/server.h
index 9107b4c..ebd88a1 100644
--- a/src/server.h
+++ b/src/server.h
@@ -3,7 +3,6 @@
 
 #include "ci_queue.h"
 #include "tcp_server.h"
-#include "worker_queue.h"
 
 #include <pthread.h>
 
@@ -19,10 +18,7 @@ struct server {
 
 	struct tcp_server tcp_server;
 
-	struct worker_queue worker_queue;
 	struct ci_queue ci_queue;
-
-	pthread_t scheduler;
 };
 
 int server_create(struct server *, const struct settings *);
@@ -30,7 +26,4 @@ void server_destroy(struct server *);
 
 int server_main(struct server *);
 
-int server_new_worker(struct server *, int fd);
-int server_ci_run(struct server *, const char *url, const char *rev);
-
 #endif