C++17 filesystem and chrono alternative implementations

Author: boberfly

lib/common/grid_util/DebugConsoleDriver.cc

@@ -5,8 +5,8 @@
 //
 #include "DebugConsoleDriver.h"
 
+#include <chrono>
 #include <iostream>
-#include <unistd.h>
 
 namespace scene_rdl2 {
 namespace grid_util {
@@ -89,7 +89,7 @@ DebugConsoleDriver::threadMain(DebugConsoleDriver *driver)
         if (recvByte == 0 || recvByte == -1) {
             // empty or EOF
             driver->mThreadState = ThreadState::IDLE;
-            usleep(10000); // 10000us = 10ms : wake up every 10ms and check TlSvr
+            std::this_thread::sleep_for(std::chrono::microseconds(10000)); // 10000us = 10ms : wake up every 10ms and check TlSvr
 
         } else if (recvByte < -1) { // error
             std::cerr << "telnet server failed\n";

lib/common/grid_util/LatencyLog.h

@@ -16,11 +16,10 @@
 #include <scene_rdl2/scene/rdl2/ValueContainerDeq.h>
 #include <scene_rdl2/scene/rdl2/ValueContainerEnq.h>
 
+#include <chrono>
 #include <string>
 #include <vector>
 
-#include <sys/time.h>
-
 //
 // We should always use variable length coding.
 // This directive is designed for performance comparison purpose.
@@ -196,9 +195,10 @@ class LatencyItem
 finline uint64_t
 LatencyItem::getCurrentMicroSec()
 {
-    struct timeval tv;
-    gettimeofday(&tv, 0x0);
-    uint64_t microSec = static_cast<uint64_t>(tv.tv_sec) * 1000 * 1000 + static_cast<uint64_t>(tv.tv_usec);
+    const auto tnow = std::chrono::high_resolution_clock::now().time_since_epoch();
+    const auto cTime = std::chrono::duration_cast<std::chrono::microseconds>(tnow);
+    uint64_t microSec = (uint64_t)(int64_t)cTime.count();
+
     if (LatencyClockOffset::getInstance().isPositive()) {
         microSec += LatencyClockOffset::getInstance().getAbsOffsetMicroSec();
     } else {

lib/common/rec_time/RecTime.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include <chrono>
 #include <sstream>
 
-#include <sys/time.h>
 #include <stdint.h>
 
 namespace scene_rdl2 {
@@ -26,10 +26,9 @@ class RecTime
     inline float end() const { return (float)(getCurrentMicroSec() - mStartTime) * 0.000001f; } // return sec
 
     static long long getCurrentMicroSec() {
-        struct timeval tv;
-        gettimeofday(&tv, 0x0);
-        long long cTime = (long long)tv.tv_sec * 1000 * 1000 + (long long)tv.tv_usec;
-        return cTime;
+        const auto tnow = std::chrono::high_resolution_clock::now().time_since_epoch();
+        const auto cTime = std::chrono::duration_cast<std::chrono::microseconds>(tnow);
+        return cTime.count();
     }
 
 protected:

lib/render/util/Files.cc

@@ -34,6 +34,9 @@
 #endif
 #include <unistd.h>
 
+#include <filesystem>
+namespace fs = std::filesystem;
+
 namespace scene_rdl2 {
 namespace util {
 
@@ -49,12 +52,9 @@ struct FreeDeleter
 std::pair<std::string, std::string>
 splitPath(const std::string& filePath)
 {
-    const char* path = filePath.c_str();
-    std::unique_ptr<char, FreeDeleter> dirStr(strdup(path));
-    std::unique_ptr<char, FreeDeleter> baseStr(strdup(path));
-
-    std::string directory(dirname(dirStr.get()));
-    std::string filename(basename(baseStr.get()));
+    fs::path p(filePath);
+    std::string directory(p.parent_path().string());
+    std::string filename(p.filename().string());
 
     return std::make_pair(std::move(directory), std::move(filename));
 }

lib/render/util/ThreadPoolExecutor.cc

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <pthread.h> // pthread_setaffinity_np
 #include <sstream>
-#include <unistd.h> // usleep
+#include <chrono>
 
 //#define DEBUG_MSG_THREAD
 //#define DEBUG_MSG_THREAD_CPUAFFINITY
@@ -325,10 +325,7 @@ ThreadPoolExecutor::testBootShutdown()
                 // This simulates MoonRay's MCRT thread boot logic
                 ++bootedThreadTotal;
                 while (bootedThreadTotal < threadTotal) {
-                    struct timespec tm;
-                    tm.tv_sec = 0;
-                    tm.tv_nsec = 1000; // 0.001ms
-                    nanosleep(&tm, NULL); // yield CPU resources
+                    std::this_thread::sleep_for(std::chrono::nanoseconds(1000)); // yield CPU resources
                 }
 
                 sum += threadId;

lib/scene/rdl2/Dso.cc

@@ -23,6 +23,8 @@
 #include <dlfcn.h>
 #include <libgen.h>
 #include <unistd.h>
+#include <filesystem>
+namespace fs = std::filesystem;
 
 namespace scene_rdl2 {
 namespace rdl2 {
@@ -56,12 +58,9 @@ classNameFromFileName(const std::string& baseName,
 std::string
 Dso::classNameFromFileName(const std::string& filePath)
 {
-    char* dirStr = strdup(filePath.c_str());
-    std::string directory(dirname(dirStr));
-    free(dirStr);
-    char* baseStr = strdup(filePath.c_str());
-    std::string baseName(basename(baseStr));
-    free(baseStr);
+    fs::path p(filePath);
+    std::string directory(p.parent_path().string());
+    std::string baseName(p.stem().string());
 
     // Bail early if we can't determine the class name.
 
@@ -228,15 +227,10 @@ Dso::getDestroy()
 bool
 Dso::isValidDso(const std::string& filePath, bool proxyModeEnabled)
 {
-    // Break the path into directory and basename components. Painfully, both
-    // dirname() and basename() may do just about anything with your pointers,
-    // so its safest to make a copy first.
-    char* dirStr = strdup(filePath.c_str());
-    std::string directory(dirname(dirStr));
-    free(dirStr);
-    char* baseStr = strdup(filePath.c_str());
-    std::string baseName(basename(baseStr));
-    free(baseStr);
+    // Break the path into directory and basename components.
+    fs::path p = filePath;
+    std::string directory(p.parent_path().string());
+    std::string baseName(p.stem().string());
 
     // Bail early if we can't determine the class name.
     const char* extension = (proxyModeEnabled) ? ".so.proxy" : ".so";

lib/scene/rdl2/DsoFinder.cc

@@ -9,74 +9,65 @@
 
 #include <cstdlib>
 #include <vector>
-#include <dirent.h>
-#include <libgen.h>
+
+#include <filesystem>
+namespace fs = std::filesystem;
 
 namespace scene_rdl2 {
 namespace rdl2 {
 
-using util::Args;
+const std::string g_raasRender("raas_render");
+const std::string g_osPathSep(":");
 
-int isMatching(const dirent* entry) {
-    std::string name = "raas_render";
-    if (name == std::string(entry->d_name)) {
-        return 1;
-    }
-    
-    return 0;
-}
+using util::Args;
 
 std::string
 DsoFinder::guessDsoPath()
 {
     std::string dsoPath = "";
-    dirent** nameList;
-    
+
     // First, search PATH for raas_render executable
     const std::string pathEnv = util::getenv<std::string>("PATH");
     if (pathEnv.empty()) {
         return "";
     }
-    
-    size_t found = pathEnv.find(':');
-    int numFound;
-    std::string path;
+    size_t found = pathEnv.find(g_osPathSep);
+    fs::path path;
     if (found == std::string::npos) { // single path
-        path = pathEnv;
-        numFound = scandir(path.c_str(), &nameList, isMatching, alphasort);
+        path = fs::path(pathEnv).make_preferred();
+
+        if (fs::exists(path)) {
+            for (auto const& dirEntry : std::filesystem::directory_iterator(path)) {
+                if (dirEntry.path().filename().string() == g_raasRender) {
+                    break;
+                }
+            }
+        }
     } else {
         int counter = 0;
+        bool pathFound = false;
         while (found != std::string::npos) {
-            path = pathEnv.substr(counter, found - counter);
-            numFound = scandir(path.c_str(), &nameList, isMatching, alphasort);
-            if (numFound > 0) {
+            path = fs::path(pathEnv.substr(counter, found - counter)).make_preferred();
+            if (fs::exists(path)) {
+                for ( const auto & dirEntry : std::filesystem::directory_iterator(path)) {
+                    std::string file = dirEntry.path().stem().string();
+                    if (file == g_raasRender) {
+                        pathFound = true;
+                        break;
+                    }
+                }
+            }
+            if (pathFound) {
                 break;
             }
             counter = found + 1;
-            found = pathEnv.find(':', found + 1);
-        }
-        
-        if (numFound <= 0) { // Haven't found raas_render yet
-            // Process last path
-            path = pathEnv.substr(counter);
-            numFound = scandir(path.c_str(), &nameList, isMatching, alphasort);
+            found = pathEnv.find(g_osPathSep, found + 1);
         }
     }
-    
-    if (numFound > 0) {
-        // We found raas_render, now construct path to rdl2dso
-        // This assumes that the immediate parent directory is /bin
-        char* buf = realpath(path.c_str(), NULL); // Resolve any relative links
-        dsoPath = std::string(dirname(buf)) + "/" + "rdl2dso";
-        free(buf);
-    }
-    
-    // clean up
-    /*while (numFound--) {
-        free(nameList[numFound]);
-    }*/
-    free(nameList);
 
+    if (!path.empty()) {
+        dsoPath = fs::path(fs::absolute(path.parent_path()) / "rdl2dso").make_preferred().string();
+    }
     return dsoPath;
 }
 
@@ -85,14 +76,14 @@ std::string DsoFinder::find() {
     std::string dsoPathString = "."; // Search '.' path first
     if (const char* const dsoPathEnvVar = util::getenv<const char*>("RDL2_DSO_PATH")) {
         // append dso path as sourced from RDL2_DSO_PATH
-        dsoPathString += ":" + std::string(dsoPathEnvVar);
+        dsoPathString += g_osPathSep + std::string(dsoPathEnvVar);
     }
 
     // finally, guess dso path based on location of raas_render
     std::string guessedDsoPath = guessDsoPath();
     if (!guessedDsoPath.empty()) {
         // append dso path as sourced from location of raas_render executable
-        dsoPathString += ":" + guessedDsoPath;   
+        dsoPathString += g_osPathSep + guessedDsoPath;   
     }
 
     return dsoPathString;
@@ -125,7 +116,7 @@ std::string DsoFinder::parseDsoPath(int argc, char* argv[]) {
 
     if (!dsoPath.empty()) {
         // prepend dso path as sourced from command line
-        return dsoPath + ":" + findPath; 
+        return dsoPath + g_osPathSep + findPath; 
     }
 
     return findPath; 

lib/scene/rdl2/SceneContext.cc

@@ -49,6 +49,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <filesystem>
+namespace fs = std::filesystem;
+
 namespace scene_rdl2 {
 
 using logging::Logger;
@@ -725,23 +728,18 @@ SceneContext::loadAllSceneClasses()
         // Grab the next path entry.
         std::size_t colonPos = remaining.find_first_of(':');
         std::string directory = remaining.substr(0, colonPos);
-
-        // Grab the contents of each directory.
-        DIR* directoryPtr = opendir(directory.c_str());
-        if (directoryPtr != nullptr) {
-            struct dirent* entryPtr;
-            while ((entryPtr = readdir(directoryPtr))) {
-                std::string fileName(entryPtr->d_name);
-
+        fs::path p(directory);
+        if (fs::exists(p)) {
+            for (auto const& dirEntry : std::filesystem::directory_iterator(p)) {
                 // If the file is a valid DSO, then create a SceneClass from it.
-                if (Dso::isValidDso(directory + '/' + fileName, mProxyModeEnabled)) {
+                if (Dso::isValidDso(dirEntry.path().string(), mProxyModeEnabled)) {
                     // Class name is the file name without ".so" (or
                     // ".so.proxy" in proxy mode).
                     std::string className;
                     if (mProxyModeEnabled) {
-                        className = fileName.substr(0, fileName.size() - 9);
+                        className = dirEntry.path().stem().stem().string();
                     } else {
-                        className = fileName.substr(0, fileName.size() - 3);
+                        className = dirEntry.path().stem().string();
                     }
 
                     try {
@@ -754,7 +752,6 @@ SceneContext::loadAllSceneClasses()
                 }
             }
         }
-        closedir(directoryPtr);
 
         // Move to the next path entry.
         if (colonPos != std::string::npos) {

tests/lib/render/util/TestThreadPoolExecutor.cc

@@ -4,7 +4,7 @@
 
 #include <scene_rdl2/common/rec_time/RecTime.h>
 
-#include <unistd.h>
+#include <chrono>
 
 // This directive should not commented out for the release version.
 // This is only used for local debugging purposes.
@@ -98,7 +98,7 @@ TestThreadPoolExecutor::watcherThreadMain(const float maxTestDurationSec)
                       << " duration:" << maxTestDurationSec << " sec\n";
             exit(1);
         }
-        usleep(10000);
+        std::this_thread::sleep_for(std::chrono::microseconds(10000));
     }
 
     std::cerr << ">> Watcher thread shutdown <<\n";