Merge pull request #18437 from jakesmith/HPCC-31474-dafs-refactor-ssl…

…-read HPCC-31474 Refactor dafilesrv handling to cope with SSL/non-blocking Reviewed-by: Mark Kelly [email protected] Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Apr 11, 2024 · a782d9a · a782d9a
2 parents 6343778 + 3a5e979
commit a782d9a
Show file tree

Hide file tree

Showing 8 changed files with 443 additions and 649 deletions.
diff --git a/fs/dafsclient/rmtclient.cpp b/fs/dafsclient/rmtclient.cpp
@@ -733,7 +733,7 @@ void CRemoteBase::connectSocket(SocketEndpoint &ep, unsigned connectTimeoutMs, u
             {
                 unsigned remaining;
                 if (tm.timemon->timedout(&remaining))
-                    throwJSocketException(JSOCKERR_connection_failed);
+                    THROWJSOCKEXCEPTION(JSOCKERR_connection_failed);
                 socket.setown(ISocket::connect_timeout(ep,remaining));
             }
             else

diff --git a/fs/dafsserver/dafsserver.cpp b/fs/dafsserver/dafsserver.cpp
diff --git a/roxie/udplib/udpsha.hpp b/roxie/udplib/udpsha.hpp
@@ -344,7 +344,7 @@ class CSocketSimulator : public CInterfaceOf<ISocket>
                            unsigned timeout) override { UNIMPLEMENTED; }
     virtual void   read(void* buf, size32_t size) override { UNIMPLEMENTED; }
     virtual size32_t write(void const* buf, size32_t size) override { UNIMPLEMENTED; }
-    virtual size32_t writetms(void const* buf, size32_t size, unsigned timeoutms=WAIT_FOREVER) override { UNIMPLEMENTED; }
+    virtual size32_t writetms(void const* buf, size32_t minSize, size32_t size, unsigned timeoutms=WAIT_FOREVER) override { UNIMPLEMENTED; }
 
     virtual size32_t get_max_send_size() override { UNIMPLEMENTED; }
     virtual ISocket* accept(bool allowcancel=false, SocketEndpoint *peerEp = nullptr) override { UNIMPLEMENTED; }

diff --git a/system/jlib/jdebug.hpp b/system/jlib/jdebug.hpp
@@ -166,6 +166,15 @@ class CCycleTimer
     {
         return static_cast<unsigned>(cycle_to_millisec(elapsedCycles()));
     }
+    inline unsigned remainingMs(unsigned timeoutMs) const
+    {
+        if (INFINITE == timeoutMs)
+            return INFINITE;
+        unsigned eMs = elapsedMs();
+        if (eMs >= timeoutMs)
+            return 0;
+        return timeoutMs - eMs;
+    }
 };
 inline cycle_t queryOneSecCycles() { return oneSecInCycles; }