Changeset 1539

Timestamp:

07/20/05 05:48:14 (3 years ago)

Author:

madcat

Message:

Added WorkThread::Pauser object, which is an exception-safe wrapper around
WorkThread::pause()/WorkThread::resume methods.

Files:

• hydranode/hncore/plugins/ed2k/src/downloadlist.cpp (modified) (2 diffs)
• hydranode/hncore/src/fileslist.cpp (modified) (4 diffs)
• hydranode/hncore/src/hydranode.cpp (modified) (3 diffs)
• hydranode/include/hncore/workthread.h (modified) (3 diffs)

hydranode/hncore/plugins/ed2k/src/downloadlist.cpp

@@ -304 +304 @@
-        using namespace boost::filesystem;
-
-instance().pause()
+Pauser pauser
-
-        for (directory_iterator it(p); it != directory_iterator(); ++it) {
@@ -319 +319 @@
-                }
-        }
-
-        WorkThread::instance().resume();
-}
-

hydranode/hncore/src/fileslist.cpp

@@ -94 +94 @@
-        CHECK_THROW(!path.empty());
-        verifyPath(path);
+
+        WorkThread::Pauser pauser; // pause WorkThread while scanning
+
-        scanSharedDir(path, recurse);
+
-} catch (std::exception &e) {
-        logError(boost::format("Error scanning shared directory: %s")%e.what());
@@ -106 +110 @@
-
-        if (scan) {
+                WorkThread::Pauser pauser; // pause while scanning
-                scanTempDir(p.native_directory_string());
-        }
@@ -191 +196 @@
-
-        if (recursion == 1) {
-                WorkThread::instance().pause();
-                logMsg(
-                        boost::format("Scanning shared directory %s %s")
@@ -236 +240 @@
-        }
-        recursion--;
-        if (recursion == 0) {
-                WorkThread::instance().resume();
-        }
-} catch (std::exception &er) {
-        logError(boost::format("Scanning shared directories: %s") % er.what());
-        recursion--;
-        if (recursion == 0) {
-                WorkThread::instance().resume();
-        }
-}
-MSVC_ONLY(;)

hydranode/hncore/src/hydranode.cpp

@@ -90 +90 @@
-        initSockets();
-        Log::instance().remPreStr("     ");
+
+        // starting from here, we get to resource-intensive parts, so make sure
+        // workthread doesn't start IO things before we'r finished with startup
+        WorkThread::Pauser p;
-
-        logMsg(" * Initializing Shared Files List...");
@@ -475 +479 @@
-                return false;
-        }
-#ifndef WIN32
-        if (vm.count("background")) {
-                init(s_argc, s_argv);
-                logMsg("Backgrounding...");
-
-                // redirect stdout/stderr etc to /dev/null
-                close(0); close(1); close(2);
-                SchedBase::instance().disableStatus();
-                Log::instance().disableOutput();
-                int fd = open("/dev/null", O_RDWR);
-                dup(fd); dup(fd); dup(fd);
-
-                int pid = fork();
-                if (pid < 0) {
-                        perror("fork() failed: ");
-                        ::exit(1);
-                } else if (pid == 0) {
-                        setsid();
-                        mainLoop();
-                        cleanUp();
-                }
-
-                return false;
-        }
-#endif
-        if (vm.count("disable-status")) {
-                SchedBase::instance().disableStatus();
@@ -560 +539 @@
-#endif
-
+        // do backgrounding stuff after all other args have been processed
+#ifndef WIN32
+        if (vm.count("background")) {
+
+                int pid = fork();
+                if (pid < 0) {
+                        perror("fork() failed: ");
+                        ::exit(1);
+                } else if (pid == 0) {
+                        setsid();
+                        init(s_argc, s_argv);
+
+                        logMsg("Backgrounding...");
+
+                        // redirect stdout/stderr etc to /dev/null
+                        close(0); close(1); close(2);
+                        SchedBase::instance().disableStatus();
+                        Log::instance().disableOutput();
+                        int fd = open("/dev/null", O_RDWR);
+                        dup(fd); dup(fd); dup(fd);
+
+                        mainLoop();
+                        cleanUp();
+                }
+
+                return false;
+        }
+#endif
+
-        return true;
-} catch (std::exception &e) {

hydranode/include/hncore/workthread.h

@@ -94 +94 @@
-
-        /**
-         * Pause the thread execution
-         */
-        void pause();
-
-        /**
-         * Resume the thread execution
-         */
-        void resume();
-
-        /**
-         * Check whether the thread is running or paused
-         *
@@ -109 +99 @@
-         */
-        bool isRunning();
+
+        /**
+         * Exception-safe wrapper object for pausing/resuming WorkThread
+         */
+        struct Pauser {
+                Pauser() {
+                        instance().pause();
+                }
+                ~Pauser() {
+                        instance().resume();
+                }
+        };
+
-private:
-        /**
@@ -122 +125 @@
-        //! Main work thread loop function
-        void threadLoop();
+
-        //! Used by secondary thread, this is used to check whether the thread
-        //! should exit
-        bool checkExit();
+
-        //! Used by main thread, this signals work thread to exit ASAP
-        void exit();
+
+        //! Pause the thread execution
+        void pause();
+
+        //! Resume the thread execution
+        void resume();
+
-
-        //! Pending jobs queue, filled by postWork() and processed by