[Boost-commit] svn:boost r82865 - in sandbox-branches/geometry/index: doc/src/examples/rtree tests

Subject: [Boost-commit] svn:boost r82865 - in sandbox-branches/geometry/index: doc/src/examples/rtree tests
From: adam.wulkiewicz_at_[hidden]
Date: 2013-02-13 22:11:56

Author: awulkiew
Date: 2013-02-13 22:11:55 EST (Wed, 13 Feb 2013)
New Revision: 82865
URL: http://svn.boost.org/trac/boost/changeset/82865

Log:
Added rtree interprocess example, fixed compilation error in glut vis
Added:
   sandbox-branches/geometry/index/doc/src/examples/rtree/interprocess.cpp   (contents, props changed)
Text files modified: 
   sandbox-branches/geometry/index/doc/src/examples/rtree/Jamfile.v2 |    15 +++++++++++----                         
   sandbox-branches/geometry/index/tests/additional_glut_vis.cpp     |     2 +-                                      
   2 files changed, 12 insertions(+), 5 deletions(-)

Modified: sandbox-branches/geometry/index/doc/src/examples/rtree/Jamfile.v2
==============================================================================
--- sandbox-branches/geometry/index/doc/src/examples/rtree/Jamfile.v2	(original)
+++ sandbox-branches/geometry/index/doc/src/examples/rtree/Jamfile.v2	2013-02-13 22:11:55 EST (Wed, 13 Feb 2013)
@@ -6,9 +6,16 @@
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-project boost-geometry-index-doc-src-examples-rtree
-    : # requirements
+exe quick_start : quick_start.cpp
     ;
 
-exe quick_start : quick_start.cpp ;
-
+exe interprocess : interprocess.cpp /boost/thread//boost_thread
+        :
+        <toolset>acc:<linkflags>-lrt
+        <toolset>acc-pa_risc:<linkflags>-lrt
+        <toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
+        <host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
+        :
+        <threading>multi
+        :  # requirements
+    ;

Added: sandbox-branches/geometry/index/doc/src/examples/rtree/interprocess.cpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index/doc/src/examples/rtree/interprocess.cpp	2013-02-13 22:11:55 EST (Wed, 13 Feb 2013)
@@ -0,0 +1,105 @@
+// Boost.Geometry.Index Rtree interprocess example
+
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+#include <boost/geometry/index/rtree.hpp>
+
+#include <boost/foreach.hpp>
+
+#include <boost/interprocess/managed_shared_memory.hpp>
+#include <boost/interprocess/allocators/allocator.hpp>
+
+#include <vector>
+#include <string>
+#include <cstdlib> //std::system
+
+//For parent process argc == 1, for child process argc > 1
+int main(int argc, char *argv[])
+{
+    using namespace boost::interprocess;
+    namespace bg = boost::geometry;
+    namespace bgm = bg::model;
+    namespace bgi = bg::index;
+
+    typedef bgm::point<float, 2, bg::cs::cartesian> P;
+    typedef bgm::box<P> B;
+
+    typedef bgi::linear<32, 8> Par;
+    typedef bgi::translator::def<B> Tr;
+    typedef allocator<B, managed_shared_memory::segment_manager> Alloc;
+    typedef bgi::rtree<B, Par, Tr, Alloc> Rtree;
+
+    //Parent process
+    if ( argc == 1 )
+    {
+        struct shm_remove
+        {
+            shm_remove() { shared_memory_object::remove("MySharedMemory"); }
+            ~shm_remove(){ shared_memory_object::remove("MySharedMemory"); }
+        } remover;
+
+        managed_shared_memory segment(create_only, "MySharedMemory", 65536);
+
+        std::cout << "Parent: Constructing container\n";
+
+        Rtree * tree = segment.construct<Rtree>("Rtree")(Par(), Tr(), Alloc(segment.get_segment_manager()));
+
+        std::cout << "Parent: Filling container with 100 boxes\n";
+
+        for ( float i = 0 ; i < 100 ; i += 1 )
+            tree->insert(B(P(i, i), P(i+0.5f, i+0.5f)));
+
+        std::cout << "Parent: Tree content\n";
+        Rtree::bounds_type bb = tree->bounds();
+        std::cout << "[(" << bg::get<0>(bb.min_corner()) << ", " << bg::get<1>(bb.min_corner())
+                  << ")(" << bg::get<0>(bb.max_corner()) << ", " << bg::get<1>(bb.max_corner()) << ")]\n";
+
+        std::cout << "Parent: Running child process\n";
+
+        std::string s(argv[0]); s += " child ";
+        if ( 0 != std::system(s.c_str()) )
+            return 1;
+
+        if ( segment.find<Rtree>("Rtree").first )
+            return 1;
+
+        std::cout << "Parent: Container was properly destroyed by the child process\n";
+   }
+   //Child process
+   else
+   {
+      managed_shared_memory segment(open_only, "MySharedMemory");
+
+      std::cout << "Child: Searching of the container in shared memory\n";
+
+      Rtree * tree = segment.find<Rtree>("Rtree").first;
+
+      std::cout << "Child: Querying for objects intersecting box = [(45, 45)(55, 55)]\n";
+
+      std::vector<B> result;
+      unsigned k = tree->query(B(P(45, 45), P(55, 55)), std::back_inserter(result));
+
+      std::cout << "Child: Found objects:\n";
+      std::cout << k << "\n";
+      BOOST_FOREACH(B const& b, result)
+      {
+        std::cout << "[(" << bg::get<0>(b.min_corner()) << ", " << bg::get<1>(b.min_corner())
+                  << ")(" << bg::get<0>(b.max_corner()) << ", " << bg::get<1>(b.max_corner()) << ")]\n";
+      }
+      std::cout << "\n";
+
+      std::cout << "Child: Destroying container\n";
+
+      segment.destroy<Rtree>("Rtree");
+   }
+
+   return 0;
+};

Modified: sandbox-branches/geometry/index/tests/additional_glut_vis.cpp
==============================================================================
--- sandbox-branches/geometry/index/tests/additional_glut_vis.cpp	(original)
+++ sandbox-branches/geometry/index/tests/additional_glut_vis.cpp	2013-02-13 22:11:55 EST (Wed, 13 Feb 2013)
@@ -7,7 +7,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <gl/glut.h>
+#include <GL/glut.h>
 
 #define BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE