From 8d85a0550a4c0ba979dc88cc1ca8ef58c5073e8d Mon Sep 17 00:00:00 2001
From: graehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>
Date: Mon, 28 Jun 2010 01:00:52 +0000
Subject: parallelize avoid port contention

git-svn-id: https://ws10smt.googlecode.com/svn/trunk@31 ec762483-ff6d-05da-a07a-a48fb63a330f
---
 vest/sentserver.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'vest/sentserver.c')

diff --git a/vest/sentserver.c b/vest/sentserver.c
index f7458b6d..e05fe47d 100644
--- a/vest/sentserver.c
+++ b/vest/sentserver.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/time.h> 
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <sched.h>
 #include <pthread.h>
@@ -118,7 +118,7 @@ struct line * queue_get(int fid) {
 			pthread_mutex_unlock(&queue_mutex);
 			return cur;
 		}
-	} 
+	}
 
 	if (log_mutex) fprintf(stderr, "Unlocking input mutex (%d)\n", fid);
 	pthread_mutex_unlock(&input_mutex);
@@ -146,7 +146,7 @@ void queue_panic() {
 			fflush(stdout);
 		}
 		/* Write out blank line for unfinished sentences */
-		if (head->status == STATUS_ABORTED) { 
+		if (head->status == STATUS_ABORTED) {
 			fputs("\n", stdout);
 			fflush(stdout);
 		}
@@ -192,7 +192,7 @@ void queue_print() {
       fprintf(stderr, "    %d aborted  ", cur->id); break;
     case STATUS_FINISHED:
       fprintf(stderr, "    %d finished ", cur->id); break;
-      
+
     }
 	fprintf(stderr, "\n");
     //fprintf(stderr, cur->s);
@@ -221,7 +221,7 @@ void queue_finish(struct line *node, char *s, int fid) {
 
     next = head->next;
     free(head);
-    
+
     head = next;
 
     n_flushed++;
@@ -271,9 +271,9 @@ char * read_line(int fd, int multiline) {
       break;
     } else {
       if (s[i] == '\n'){
-	/* if we've reached this point, 
+	/* if we've reached this point,
 	   then multiline must be 1, and we're
-	   going to poll the fd for an additional 
+	   going to poll the fd for an additional
 	   line of data.  The basic design is to
 	   run a select on the filedescriptor fd.
 	   Select will return under two conditions:
@@ -283,7 +283,7 @@ char * read_line(int fd, int multiline) {
 	   ready, keep going; else assume there's no
 	   more and return the data we already have.
 	*/
-	
+
 	fd_set set;
 	FD_ZERO(&set);
 	FD_SET(fd, &set);
@@ -298,12 +298,12 @@ char * read_line(int fd, int multiline) {
 	}
       }
       i++;
-      
+
       if (i == size) {
 	size = size*2;
 	s = realloc(s, size+2);
       }
-    }    
+    }
 
     result = read(fd, s+i, 1);
   }
@@ -312,7 +312,7 @@ char * read_line(int fd, int multiline) {
     free(s);
     return NULL;
   }
-    
+
   s[i] = '\n';
   s[i+1] = '\0';
 
@@ -335,7 +335,7 @@ void * new_client(void *arg) {
   for (;;) {
 
     cur = queue_get(client->s);
-    
+
     if (cur) {
       /* fprintf(stderr, "Sending to client: %s", cur->s); */
       fprintf(stderr, "Sending data %d to client (fid %d)\n", cur->id, client->s);
@@ -365,7 +365,7 @@ void * new_client(void *arg) {
       fprintf(stderr, "Client dismissed (%d connected)\n", n_clients);
       pthread_exit(NULL);
     }
-    
+
     s = read_line(client->s,expect_multiline_output);
     if (s) {
       /* fprintf(stderr, "Client (fid %d) returned: %s", client->s, s); */
@@ -387,7 +387,7 @@ void * new_client(void *arg) {
     }
 
   }
-
+  return 0;
 }
 
 void done (int code) {
@@ -456,7 +456,7 @@ int main (int argc, char *argv[]) {
   len = sizeof(sin);
   getsockname(s, (struct sockaddr *) &sin, &len);
 
-  fprintf(stderr, "Listening on port %hd\n", ntohs(sin.sin_port));
+  fprintf(stderr, "Listening on port %hu\n", ntohs(sin.sin_port));
 
   while (listen(s, MAX_CLIENTS) < 0) {
 	perror("listen()");
@@ -477,7 +477,7 @@ int main (int argc, char *argv[]) {
     client = malloc(sizeof(struct clientinfo));
     client->s = g;
     bcopy(&from, &client->sin, len);
-    
+
 	if (use_key){
 		fd_set set;
 		FD_ZERO(&set);
-- 
cgit v1.2.3