1 files changed, 43 insertions, 26 deletions

diff --git a/server.rkt b/server.rkt
index 5322a3d..d1f5a98 100644
--- a/server.rkt
+++ b/server.rkt
@@ -11,26 +11,13 @@
 ;; every 5 seconds run to broadcast top message in list
 ;; and remove it from list
 (define messages-s (make-semaphore 1))  ;; control access to messages
-(define messages '())  ;; stores a list of messages(strings) from currents
+(define messages '("hello, world!"))  ;; stores a list of messages(strings) from currents
 
 (define threads-s (make-semaphore 1))  ;; control access to threads
 ;; lets keep thread descriptor values
 (define threads '())  ;; stores a list of client serving threads as thread descriptor values
 
-;; define a broadcast function
-(define broadcast
-  (lambda ()
-    (semaphore-wait messages-s)
-    (semaphore-wait threads-s)
-    (if (not (null? messages))
-        (begin (map (lambda (thread-descriptor)
-            (thread-send thread-descriptor (first messages))))
-               (set! messages (rest messages))
-        )
-      (display "No message to display\n") ; for later create file port for errors and save error messages to that file
-      )
-    (semaphore-post threads-s)
-    (semaphore-post messages-s)))
+
 
 ;;
 
@@ -52,7 +39,8 @@
     ;; Create a thread whose job is to simply call broadcast iteratively
     (thread (lambda ()
               (let loopb []
-                broadcast
+                (sleep 30)  ;; wait 30 secs before beginning to broadcast
+                (broadcast)
                 (sleep 10) ;; sleep for 10 seconds between broadcasts
                 (loopb)))))
   (lambda ()
@@ -63,22 +51,26 @@
   (define cust (make-custodian))
   (parameterize ([current-custodian cust])
     (define-values (in out) (tcp-accept listener))
+    ; discard request header
+    ; Discard the request header (up to blank line):
+    (regexp-match #rx"(\r\n|^)\r\n" in)
     (semaphore-wait connections-s)
     ;; keep track of open ports
-    (append connections (list (list in out)))
-    (semaphore-wait connections-s)
+    (set! connections (append connections (list (list in out))))
+    (semaphore-post connections-s)
 
     ; start a thread to deal with specific client and add descriptor value to the list of threads
-    (append threads (list (thread (lambda ()
+    (set! threads (append threads (list (thread (lambda ()
               (handle in out) ;; this handles connection with that specific client
               (close-input-port in)
               (close-output-port out))))
             )
+    ) 
   ;; Watcher thread:
   ;; kills current thread for waiting too long for connection from
   ;; clients
   (thread (lambda ()
-            (sleep 120)
+            (sleep 360)
             (custodian-shutdown-all cust)))))
 
 ; (define (handle connections)
@@ -87,14 +79,19 @@
 (define (handle in out) 
   ; define function to deal with incoming messages from client
   (define (something-to-say in)
-    (define evt-t0 (sync/timeout 120  (read-line-evt in 'linefeed)))
-    (cond [(not evt-t0)
-           (displayln "Nothing received from " (current-thread) "exiting")]
+    (define evt-t0 (sync/timeout 30  (read-line-evt in 'linefeed)))
+    (cond [(eof-object? evt-t0)
+           (displayln (string-append "Connection closed " (current-thread) "exiting"))
+           (exit)
+           ]
           [(string? evt-t0)
            (semaphore-wait messages-s)
            ; append the message to list of messages
-           (append messages (list evt-t0))
-           (semaphore-post messages-s)]))
+           (display (string-append evt-t0 "\n"))
+           (set! messages (append messages (list evt-t0)))
+           (semaphore-post messages-s)]
+          [else
+           (displayln (string-append "Nothing received from " (current-thread)))]))
 
 
   ; define function to deal with out
@@ -111,13 +108,33 @@
   (thread (lambda ()
             (let loop []
               (something-to-say in)
+              (sleep 1)
               (loop))))
 
   (thread (lambda ()
             (let loop []
-              (something-to-say out)
+              (something-to-send out)
+              (sleep 1)
               (loop))))
   ; (server-loop in out)
   ; (sleep 5) ;; wait 5 seconds to guarantee client has already send message
   'ok
  )
+
+;; define a broadcast function
+(define broadcast
+  (lambda ()
+    (semaphore-wait messages-s)
+    (semaphore-wait threads-s)
+    (if (not (null? messages))
+        (begin (map (lambda (thread-descriptor)
+            (thread-send thread-descriptor (first messages)))
+                    threads)
+               (set! messages (rest messages))
+        )
+      (display "No message to display\n") ; for later create file port for errors and save error messages to that file
+      )
+    (semaphore-post threads-s)
+    (semaphore-post messages-s)))
+
+(define stop (serve 4321)) ;; start server then close with stop
\ No newline at end of file