weejobs - integrate as new job scheduling subsystem

CMakeLists.txt

@@ -20,7 +20,7 @@ set(OSGEARTH_PATCH_VERSION 0)
 set(OSGEARTH_VERSION ${OSGEARTH_MAJOR_VERSION}.${OSGEARTH_MINOR_VERSION}.${OSGEARTH_PATCH_VERSION})
 
 # Increment this each time the ABI changes
-set(OSGEARTH_SOVERSION 149)
+set(OSGEARTH_SOVERSION 150)
 
 # Require C++11
 set_property(GLOBAL PROPERTY CXX_STANDARD 11)

CMakeModules/oe_unix.cmake

@@ -6,4 +6,6 @@ IF(UNIX AND NOT ANDROID)
     FIND_PACKAGE(X11)
     # Some Unicies need explicit linkage to the Math library or the build fails.
     FIND_LIBRARY(MATH_LIBRARY m)
+    # for ptheads in linux
+    find_package(Threads REQUIRED)
 ENDIF(UNIX AND NOT ANDROID)

src/applications/osgearth_bakefeaturetiles/osgearth_bakefeaturetiles.cpp

@@ -339,7 +339,7 @@ struct ProgressReporter : public osgEarth::ProgressCallback
         unsigned           totalStages,
         const std::string& msg)
     {
-        ScopedMutexLock lock(_mutex);
+        std::lock_guard<std::mutex> lock(_mutex);
 
         if (_first)
         {
@@ -388,7 +388,7 @@ struct ProgressReporter : public osgEarth::ProgressCallback
         return false;
     }
 
-    Threading::Mutex _mutex;
+    std::mutex _mutex;
     bool _first;
     osg::Timer_t _start;
 };

src/applications/osgearth_clamp/osgearth_clamp.cpp

@@ -56,7 +56,6 @@ struct App
     osg::ref_ptr<OGRFeatureSource> input;
     osg::ref_ptr<OGRFeatureSource> output;
     Threading::Mutexed<std::queue<FeatureList*> > outputQueue;
-    Threading::Event gate;
     std::string attrName;
     bool verbose;
 

src/applications/osgearth_collecttriangles/osgearth_collecttriangles.cpp

@@ -485,11 +485,12 @@ void computeIntersectionsThreaded(osg::Node* node, std::vector< IntersectionQuer
             }
         }
     }
-
-    JobArena::get("oe.intersections")->setConcurrency(num_threads);
+
+    auto pool = jobs::get_pool("oe.intersections");
+    pool->set_concurrency(num_threads);
 
     // Poor man's parallel for
-    JobGroup intersections;
+    jobs::jobgroup intersections;
 
     //unsigned int workSize = 500;
     // Try to split the jobs evenly among the threads
@@ -505,12 +506,16 @@ void computeIntersectionsThreaded(osg::Node* node, std::vector< IntersectionQuer
         unsigned int curSize = curStart + workSize <= queries.size() ? workSize : queries.size() - curStart;
         if (curSize > 0)
         {
-            Job job;
-            job.setArena("oe.intersections");
-            job.setGroup(&intersections);
-            job.dispatch_and_forget([node, curStart, curSize, &queries](Cancelable*) {
+            jobs::context context;
+            context.pool = pool;
+            context.group = &intersections;
+
+            jobs::dispatch([node, curStart, curSize, &queries](Cancelable&) {
                 computeIntersections(node, queries, curStart, curSize);
-            });
+                return true;
+                },
+                context
+            );
             ++numJobs;
         }
         start += workSize;

src/applications/osgearth_conv/osgearth_conv.cpp

@@ -213,7 +213,7 @@ struct ProgressReporter : public osgEarth::ProgressCallback
                         unsigned           totalStages,
                         const std::string& msg )
     {
-        ScopedMutexLock lock(_mutex);
+        std::lock_guard<std::mutex> lock(_mutex);
 
         if (_first)
         {
@@ -278,7 +278,7 @@ struct ProgressReporter : public osgEarth::ProgressCallback
         return false;
     }
 
-    Threading::Mutex _mutex;
+    std::mutex _mutex;
     bool _first;
     osg::Timer_t _start;
 };

src/applications/osgearth_exportvegetation/osgearth_exportvegetation.cpp

@@ -172,17 +172,11 @@ main(int argc, char** argv)
     if (keys.empty())
         return usage(argv[0], "No data in extent");
 
-    JobArena arena("Vegetation Export", 1u);
-
     std::cout << "Exporting " << keys.size() << " keys.." << std::endl;
 
     for(const auto key : keys)
     {
-        Job(&arena).dispatch_and_forget([&app, key](Cancelable*)
-            {
-                app.exportKey(key);
-            }
-        );
+        jobs::dispatch([&app, key]() { app.exportKey(key); });
     }
 
 

src/applications/osgearth_features/osgearth_features.cpp

@@ -41,7 +41,7 @@ using namespace osgEarth::Util;
 
 int usage( const std::string& app )
 {
-    OE_NOTICE "\n" << app << "\n"
+    OE_NOTICE << "\n" << app << "\n"
         << "  --rasterize           : draw features as rasterized image tiles \n"
         << "  --drape               : draw features as projected texture \n"
         << "  --clamp               : draw features using shader clamping \n"

src/applications/osgearth_imposterbaker/osgearth_imposterbaker.cpp

@@ -41,8 +41,8 @@ using namespace osgEarth;
 int
 fail(const std::string& msg, char** argv)
 {
-    OE_WARN LC << msg << std::endl;
-    OE_WARN LC << argv[0]
+    OE_WARN << LC << msg << std::endl;
+    OE_WARN << LC << argv[0]
         << "\n    --in <filename>               ; model to process"
         << "\n    --out <filename>              ; output texture filename"
         << "\n    --size <n>                    ; dimension of texture"

src/osgEarth/AnnotationRegistry.cpp

@@ -62,12 +62,12 @@ AnnotationRegistry::instance()
 {
     // OK to be in the local scope since this gets called at static init time
     // by the OSGEARTH_REGISTER_ANNOTATION macro
-    static AnnotationRegistry* s_singleton =0L;
-    static Threading::Mutex    s_singletonMutex(OE_MUTEX_NAME);
+    static AnnotationRegistry* s_singleton = nullptr;
+    static std::mutex    s_singletonMutex;
 
     if ( !s_singleton )
     {
-        Threading::ScopedMutexLock lock(s_singletonMutex);
+        std::lock_guard<std::mutex> lock(s_singletonMutex);
         if ( !s_singleton )
         {
             s_singleton = new AnnotationRegistry();

src/osgEarth/CMakeLists.txt

@@ -456,12 +456,11 @@ SET(LIB_PUBLIC_HEADERS
     TrackNode
     WindLayer
     TerrainLayer
+    SDF
 
     rtree.h
-
-    FileGDBFeatureSource
-
-    SDF
+    weemesh.h
+    weejobs.h
 
     ${OSGEARTH_VERSION_HEADER}
 )
@@ -495,7 +494,6 @@ IF (NOT TINYXML_FOUND)
         ${LIB_PUBLIC_HEADERS}
         tinystr.h
         tinyxml.h
-        weemesh.h
     )
 ENDIF (NOT TINYXML_FOUND)
 
@@ -859,7 +857,7 @@ set(TARGET_SRC
     SDF.cpp
 
     FileGDBFeatureSource.cpp
-
+    
     ${SHADERS_CPP}
 )
 
@@ -978,6 +976,10 @@ IF (TRACY_FOUND)
     LINK_WITH_VARIABLES(${LIB_NAME} TRACY_LIBRARY)
 ENDIF(TRACY_FOUND)
 
+if(UNIX)
+    target_link_libraries(${LIB_NAME} PUBLIC Threads::Threads)
+endif()
+
 OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
 if(NOT NRL_STATIC_LIBRARIES)
   LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY)

src/osgEarth/Cache.cpp

@@ -129,9 +129,8 @@ CacheSettings::toString() const
 
 //------------------------------------------------------------------------
 
-Cache::Cache( const CacheOptions& options ) :
-_options( options ),
-_bins("OE.Cache.bins")
+Cache::Cache(const CacheOptions& options) :
+    _options(options)
 {
     //nop
 }
@@ -140,9 +139,8 @@ Cache::~Cache()
 {
 }
 
-Cache::Cache( const Cache& rhs, const osg::CopyOp& op ) :
-osg::Object( rhs, op ),
-_bins("OE.Cache.bins")
+Cache::Cache(const Cache& rhs, const osg::CopyOp& op) :
+    osg::Object(rhs, op)
 {
     _status = rhs._status;
 }

src/osgEarth/CacheBin.cpp

@@ -247,7 +247,7 @@ namespace
     };
 
 
-    Threading::Gate<osg::Image*> WriteExternalReferencesToCache::_imageGate(OE_MUTEX_NAME);
+    Threading::Gate<osg::Image*> WriteExternalReferencesToCache::_imageGate;
 }
 
 

src/osgEarth/CascadeDrapingDecorator.cpp

@@ -324,8 +324,8 @@ CascadeDrapingDecorator::reserveTextureImageUnit()
 {
     if (_unit < 0)
     {
-        static Threading::Mutex mutex(OE_MUTEX_NAME);
-        Threading::ScopedMutexLock lock(mutex);
+        static std::mutex mutex;
+        std::lock_guard<std::mutex> lock(mutex);
 
         osg::ref_ptr<TerrainResources> tr;
         if (_unit < 0 && _resources.lock(tr))

src/osgEarth/Chonk.cpp

@@ -800,7 +800,7 @@ ChonkDrawable::installRenderBin(ChonkDrawable* d)
     static osg::ref_ptr<VirtualProgram> s_vp;
 
     static Mutex s_mutex;
-    ScopedMutexLock lock(s_mutex);
+    std::lock_guard<std::mutex> lock(s_mutex);
 
     auto& ss = s_stateSets[d->getRenderBinNumber()];
     if (!ss.valid())
@@ -860,7 +860,7 @@ ChonkDrawable::add(Chonk::Ptr chonk, const osg::Matrixf& xform, const osg::Vec2f
 {
     if (chonk)
     {
-        ScopedMutexLock lock(_m);
+        std::lock_guard<std::mutex> lock(_m);
 
         Instance instance;
         instance.xform = xform;
@@ -896,7 +896,7 @@ ChonkDrawable::update_and_cull_batches(osg::State& state) const
     // if something changed, we need to refresh the GPU tables.
     if (globjects._dirty)
     {
-        ScopedMutexLock lock(_m);
+        std::lock_guard<std::mutex> lock(_m);
         globjects._gpucull = _gpucull;
         globjects.update(_batches, this, _fadeNear, _fadeFar, _birthday, _alphaCutoff, state);
     }
@@ -918,7 +918,7 @@ ChonkDrawable::draw_batches(osg::State& state) const
 osg::BoundingBox
 ChonkDrawable::computeBoundingBox() const
 {
-    ScopedMutexLock lock(_m);
+    std::lock_guard<std::mutex> lock(_m);
 
     osg::BoundingBox result;
 
@@ -974,7 +974,7 @@ ChonkDrawable::refreshProxy() const
 {
     if (_proxy_dirty)
     {
-        ScopedMutexLock lock(_m);
+        std::lock_guard<std::mutex> lock(_m);
 
         _proxy_verts.clear();
         _proxy_indices.clear();
@@ -1354,7 +1354,7 @@ ChonkRenderBin::ChonkRenderBin(const ChonkRenderBin& rhs, const osg::CopyOp& op)
     if (!_cullSS.valid())
     {
         static Mutex m;
-        ScopedMutexLock lock(m);
+        std::lock_guard<std::mutex> lock(m);
 
         auto proto = static_cast<ChonkRenderBin*>(getRenderBinPrototype("ChonkBin"));
         if (!proto->_cullSS.valid())

src/osgEarth/Clamping.cpp

@@ -268,8 +268,7 @@ ClampingCullSet::accept(osg::NodeVisitor& nv)
     }
 }
 
-ClampingManager::ClampingManager() :
-    _sets(OE_MUTEX_NAME)
+ClampingManager::ClampingManager()
 {
     //nop
 }

src/osgEarth/ColorFilter.cpp

@@ -26,12 +26,12 @@ ColorFilterRegistry::instance()
 {
     // OK to be in the local scope since this gets called at static init time
     // by the OSGEARTH_REGISTER_COLORFILTER macro
-    static ColorFilterRegistry* s_singleton =0L;
-    static Threading::Mutex     s_singletonMutex(OE_MUTEX_NAME);
+    static ColorFilterRegistry* s_singleton = nullptr;
+    static std::mutex     s_singletonMutex;
 
     if ( !s_singleton )
     {
-        Threading::ScopedMutexLock lock(s_singletonMutex);
+        std::lock_guard<std::mutex> lock(s_singletonMutex);
         if ( !s_singleton )
         {
             s_singleton = new ColorFilterRegistry();

src/osgEarth/Common

@@ -20,6 +20,7 @@
 #define OSGEARTH_COMMON_H 1
 
 #include <osgEarth/Export>
+#include <osgEarth/Notify>
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 #include <memory>