prepare for merge

README.md

@@ -16,9 +16,9 @@ Obviously the core implementation is not portable, but the python interface does
 
 ### Versions
 - - -
-- v0.3 (branch v0.3) : 'stable' version  **contains binaries/signatures**
+- v0.3 (branch v0.3) : 'stable' version  **contains up-to-date binaries/signatures**
 
-- v0.4 (branch master) : currently undergoing a major refactoring - **interface is subject to slight change.**
+- v0.4 (branch master) : currently undergoing a major refactoring - interface is subject to slight change. **may contain some binaries**
 
     ##### What's new:
     - merge 'static' and 'shared' backend libs into a single dll (don't move to C:/Windows in tosdb-setup.bat)
@@ -37,8 +37,8 @@ Obviously the core implementation is not portable, but the python interface does
     - consider an 'intermediate' API between client lib and engine, allowing users to inject their own callbacks/hooks for handling raw data from the engine
 
     ##### Other Stuff
-    - If you simply want the core functionality and/or pre-compiled binaries - with the small(est) chance of running into bugs - use v0.3. 
-    - If you want the latest-and-greatest features, improvements etc. - don't mind building your own and a bit of real-time 'grimey-ness' - go w/ master. 
+    - If you simply want the core functionality and/or need the most up-to-date pre-compiled binaries - with the small(est) chance of running into bugs - use v0.3. 
+    - If you want the latest-and-greatest features, improvements etc. - don't mind building your own and dealing with more bugs - go w/ master. 
     - Major changes will generally lead to a new version/branch, but not necessarily the label of 'stable'. Minor changes may or may not use a seperate branch that will be merged back into master.
     - Contributions - testing, bug fixes, suggestions, extensions, whatever - are always welcome. 
 
@@ -102,7 +102,7 @@ Obviously the core implementation is not portable, but the python interface does
 
 - **/bin** 
    
-     (Pre-)Compiled binaries by build type. (No debug builds) **all branches EXCEPT master**
+     (Pre-)Compiled binaries by build type. (No debug builds) **master branch may or may not contain all, or any**
 
     - ***tos-databridge-serv-[x86|x64].exe*** : The service process that spawns and controls the main engine described below. This program is run as a typical windows service with SYSTEM privileges; as such its intended role is very limited. (For debugging) pass the --noservice arg to run as a pure executable. 
 
@@ -126,7 +126,7 @@ Obviously the core implementation is not portable, but the python interface does
 
 - **/sigs** 
 
-    The detached signature for each binary; sha256 checksums for binaries, signatures, and the jeog.dev public key **all branches EXCEPT master**
+    The detached signature for each binary; sha256 checksums for binaries, signatures, and the jeog.dev public key; **master branch may or may not contain all, or any**
 
 - **/res** 
 

include/ipc.hpp

@@ -163,7 +163,7 @@ class DynamicIPCBase {
     bool   
     _deallocate(void* start) const;
 
-protected:    
+protected:        
     static const unsigned long MAX_SZ = LONG_MAX;
     static const unsigned int ALLOC = 1;
     static const unsigned int DEALLOC = 2;
@@ -178,13 +178,13 @@ class DynamicIPCBase {
 
     DynamicIPCBase(std::string name, size_t sz = 0)
         :
-#ifdef KGBLNS_
-            _shem_str(std::string("Global\\").append(std::string(name).append("_shem"))),
-#else
+#ifdef NO_KGBLNS
             _shem_str(std::string(name).append("_shem")),
+#else
+            _shem_str(std::string("Global\\").append(name).append("_shem")),            
 #endif
-            _xtrnl_pipe_str(std::string("\\\\.\\pipe\\").append(std::string(name).append("_pipe"))),
-            _intrnl_pipe_str(std::string("\\\\.\\pipe\\").append(std::string(name).append("pipe_intrnl"))), 
+            _xtrnl_pipe_str(std::string("\\\\.\\pipe\\").append(name).append("_pipe")),
+            _intrnl_pipe_str(std::string("\\\\.\\pipe\\").append(name).append("_pipe_intrnl")), 
             _fmap_hndl(NULL),
             _mmap_addr(NULL),
             _xtrnl_pipe_hndl(INVALID_HANDLE_VALUE),
@@ -213,7 +213,7 @@ class DynamicIPCBase {
         if(!blk || memcpy_s(blk, sz, data, sz))
             return shem_chunk(0,0);
 
-		/* cast to long OK; blk can't be > LONG_MAX from _mmap_addr */
+		    /* cast to long OK; blk can't be > LONG_MAX from _mmap_addr */
         return shem_chunk((long)((size_t)blk - (size_t)_mmap_addr), sz);        
     }
 

include/tos_databridge.h

@@ -84,14 +84,16 @@ along with this program.  If not, see http://www.gnu.org/licenses.
 #endif /* __cplusplus */
 
 
-#if !defined(_DEBUG) || defined(KERNEL_GLOBAL_NAMESPACE)
+#ifdef NO_KERNEL_GLOBAL_NAMESPACE
 /* because the service operates in session #0 and the engine/client code 
-   will run in session #1 (or higher) we need to use the global namespace 
-   for mutexes and file-mapping kernel objects (not the case during debug) */
-#define KGBLNS_
+   will run in session #1 (or higher) we, in most cases, need to use the 
+   global namespace for mutexes and file-mapping kernel objects  
+   
+   In rare cases(debugging service in same session) we should
+   define NO_KERNEL_GLOBAL_NAMESPACE to use the local namespace        */
+#define NO_KGBLNS
 #endif
 
-
 /* the core types implemented by the data engine: engine-core.cpp 
 
    when using large blocks the size difference between