debug prints and remove unnecessary threadDelay

2 files changed, 5 insertions, 1 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index c13c3b1a..a9b4f2e6 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -337,7 +337,7 @@ netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
                         if secnum < 20000000
                           then do
                             hPutStrLn stderr $ "sent handshake, now delaying " ++ show (secnum * 1.25) ++ "  second(s).."
-                            threadDelay delay
+                            -- threadDelay delay
                             -- Commenting loop for simpler debugging
                             return [] -- netCryptoWithBackoff delay tox myseckey theirpubkey -- hopefully it will find an active session this time.
                           else do
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index d3bf9606..ea70c72c 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -647,6 +647,7 @@ addSessionToMapIfNotThere sessions addrRaw netCryptoSession = do
 
 runUponHandshake :: NetCryptoSession -> SockAddr -> NetCryptoOutQueue -> IO ()
 runUponHandshake netCryptoSession0 addr pktoq = do
+    dput XNetCrypto "(((((((runUponHandshake))))))) Launching threads"
     let sessions = ncAllSessions netCryptoSession0
         pktq = ncPacketQueue netCryptoSession0
         remotePublicKey = ncTheirPublicKey netCryptoSession0
@@ -662,6 +663,7 @@ runUponHandshake netCryptoSession0 addr pktoq = do
             cd <- atomically $ PQ.dequeue pktq
             _ <- runCryptoHook (netCryptoSession0 {ncDequeueThread=Just tid}) (bufferData cd)
             loop
+    dput XNetCrypto $ "runUponHandshake: " ++ show threadid ++ " = NetCryptoDequeue." ++ show (key2id remotePublicKey)
     -- launch dequeueOutgoing thread
     threadidOutgoing <- forkIO $ do
         tid <- myThreadId
@@ -671,6 +673,7 @@ runUponHandshake netCryptoSession0 addr pktoq = do
             dput XNetCrypto "NetCryptoDequeueOutgoing thread... Sending encrypted Packet"
             sendSessionPacket sessions addr pkt
             loop
+    dput XNetCrypto $ "runUponHandshake: " ++ show threadidOutgoing ++ " = NetCryptoDequeueOutgoing." ++ show (key2id remotePublicKey)
     -- launch ping thread
     fuzz <- randomRIO (0,2000)
     pingMachine <- forkPingMachine ("NetCrypto." ++ show (key2id remotePublicKey)) (15000 + fuzz) 2000
@@ -679,6 +682,7 @@ runUponHandshake netCryptoSession0 addr pktoq = do
     -- add this session to the lookup maps
     -- atomically $ addSessionToMapIfNotThere sessions addr netCryptoSession
     -- run announceNewSessionHooks
+    dput XNetCrypto $ "runUponHandshake: Announcing new session"
     hooks <- atomically $ readTVar (announceNewSessionHooks sessions)
     flip fix (hooks,netCryptoSession) $ \loop (hooks,session) ->
         case hooks of