attempt fix macos schedulerschanzen/macos_scheduler

1 files changed, 34 insertions, 5 deletions

diff --git a/groupchat.nim b/groupchat.nim
index f035033..665f1c2 100644
--- a/groupchat.nim
+++ b/groupchat.nim
@@ -1,5 +1,6 @@
 import gnunet_nim
 import gnunet_nim/cadet
+import logging
 
 import asyncdispatch, asyncfile, parseopt, strutils, sequtils, times, os
 
@@ -31,20 +32,43 @@ proc processServerMessages(channel: ref CadetChannel) {.async.} =
     echo getDateStr()," ",getClockStr()," ",message
 
 proc processInput(inputFile: AsyncFile, channel: ref CadetChannel) {.async.} =
-  while true:
-    let input = await inputFile.readline()
-    channel.sendMessage(input)
+  let input = await inputFile.readline()
+  channel.sendMessage(input)
 
 proc firstTask(gnunetApp: ref GnunetApplication,
                server: string,
                port: string) {.async.} =
   let cadet = await gnunetApp.initCadet()
+  var inputFile = openAsync("/dev/stdin", fmRead)
+  debug("First Task!")
   var chat = new(Chat)
   chat.channels = newSeq[ref CadetChannel]()
   if server != "":
-    let inputFile = openAsync("/dev/stdin", fmRead)
+    debug("Opening stdin")
+    debug("Opened")
     let channel = cadet.createChannel(server, port)
-    await processServerMessages(channel) or processInput(inputFile, channel)
+    debug("Awaiting IO")
+    var messagesFuture = channel.messages.read()
+    var inputFuture = inputFile.readline()
+    while true:
+      var hasData = false
+      var message = ""
+      debug("Awaiting events")
+      await messagesFuture or inputFuture
+      if inputFuture.finished():
+        debug("Got input")
+        channel.sendMessage(inputFuture.read())
+        inputFuture = inputFile.readline()
+      elif messagesFuture.finished():
+        debug("Got message")
+        (hasData, message) = messagesFuture.read()
+        if hasData:
+          chat.publish(message = message, sender = channel)
+        messagesFuture = channel.messages.read()
+      else:
+        debug("Fin")
+        break
+      debug("While true")
     inputFile.close()
   else:
     let cadetPort = cadet.openPort(port)
@@ -69,6 +93,8 @@ proc firstTask(gnunetApp: ref GnunetApplication,
 proc main() =
   var server, port, configfile: string
   var optParser = initOptParser()
+  var consoleLog = newConsoleLogger()
+  addHandler(consoleLog)
   for kind, key, value in optParser.getopt():
     case kind
     of cmdLongOption, cmdShortOption:
@@ -91,8 +117,11 @@ proc main() =
   var gnunetApp = initGnunetApplication(configfile)
   asyncCheck firstTask(gnunetApp, server, port)
   while hasPendingOperations():
+    debug("Processing OPs")
     poll(gnunetApp.millisecondsUntilTimeout())
+    debug("polled, start working")
     gnunetApp.doWork()
+    debug("done")
   echo "Quitting."
 
 main()