Initial preparation for DSSContexts

Author: PMeira

+DSS_MATLAB/APIUtil.m

@@ -7,22 +7,31 @@
         CountPtr_PInteger
         CountPtr_PByte
         libname
+        dssctx
+        is_prime
     end
     methods
-        function obj = APIUtil()
+        function obj = APIUtil(create)
 
             if getenv('DSS_EXTENSIONS_DEBUG') == '1'
                 warnings.warn('Environment variable DSS_EXTENSIONS_DEBUG=1 is set: loading the debug version of the DSS C-API library')
                 obj.libname = 'dss_capid';
             else
                 obj.libname = 'dss_capi';
             end
-        
+
             MfilePath = fileparts(mfilename('fullpath'));
             DLLfilePath = fullfile(MfilePath, obj.libname);
             PropertiesMOfilePath = fullfile(MfilePath, 'messages', 'properties-en-US.mo');
             DSS_MATLAB.librefcount(1);
             if libisloaded(obj.libname)
+                if (nargin > 0) && (create ~= 0)
+                    obj.dssctx = calllib(obj.libname, 'ctx_New');
+                    obj.is_prime = 0;
+                else
+                    obj.dssctx = calllib(obj.libname, 'ctx_Get_Prime');
+                    obj.is_prime = 1;
+                end
                 return;
             end
             orig_state = warning;
@@ -36,27 +45,39 @@
             end
             calllib(obj.libname, 'DSS_Start', 0);
             calllib(obj.libname, 'DSS_SetPropertiesMO', PropertiesMOfilePath);
+            if (nargin > 0) && (create ~= 0)
+                obj.dssctx = calllib(obj.libname, 'ctx_New');
+                obj.is_prime = 0;
+            else
+                obj.dssctx = calllib(obj.libname, 'ctx_Get_Prime');
+                obj.is_prime = 1;
+            end
             warning(orig_state);
         end
 
         function delete(obj)
+            if obj.is_prime ~= 0
+                calllib(obj.libname, 'ctx_Dispose', obj.dssctx);
+            end
+
             % If nothing is using the library, unload it.
             % Required to properly exit MATLAB.
             cnt = DSS_MATLAB.librefcount(-1);
             if (cnt == 0)
-                calllib(obj.libname, 'Text_Set_Command', 'Set Parallel=no');
-                calllib(obj.libname, 'DSS_ClearAll');
+                prime_ctx = calllib(obj.libname, 'ctx_Get_Prime')
+                calllib(obj.libname, 'ctx_Text_Set_Command', prime_ctx, 'Set Parallel=no');
+                calllib(obj.libname, 'ctx_DSS_ClearAll', prime_ctx);
                 unloadlibrary(obj.libname);
             end
         end
 
         function obj = InitBuffers(obj)
-            % obj.DataPtr_PDouble = calllib(obj.libname, 'DSS_GR_DataPtr_PDouble');
-            % obj.DataPtr_PInteger = calllib(obj.libname, 'DSS_GR_DataPtr_PInteger');
-            % obj.DataPtr_PByte = calllib(obj.libname, 'DSS_GR_DataPtr_PByte');
-            obj.CountPtr_PDouble = calllib(obj.libname, 'DSS_GR_CountPtr_PDouble');
-            obj.CountPtr_PInteger = calllib(obj.libname, 'DSS_GR_CountPtr_PInteger');
-            obj.CountPtr_PByte = calllib(obj.libname, 'DSS_GR_CountPtr_PByte');
+            % obj.DataPtr_PDouble = calllib(obj.libname, 'ctx_DSS_GR_DataPtr_PDouble', obj.dssctx);
+            % obj.DataPtr_PInteger = calllib(obj.libname, 'ctx_DSS_GR_DataPtr_PInteger', obj.dssctx);
+            % obj.DataPtr_PByte = calllib(obj.libname, 'ctx_DSS_GR_DataPtr_PByte', obj.dssctx);
+            obj.CountPtr_PDouble = calllib(obj.libname, 'ctx_DSS_GR_CountPtr_PDouble', obj.dssctx);
+            obj.CountPtr_PInteger = calllib(obj.libname, 'ctx_DSS_GR_CountPtr_PInteger', obj.dssctx);
+            obj.CountPtr_PByte = calllib(obj.libname, 'ctx_DSS_GR_CountPtr_PByte', obj.dssctx);
 
             % if (obj.DataPtr_PDouble.isNull || obj.DataPtr_PDouble.isNull || obj.DataPtr_PByte.isNull)
                 % disp('Null-pointer return from the API! Cannot continue!');
@@ -75,19 +96,19 @@ function delete(obj)
 
 
         function result = get_float64_gr_array(obj)
-            data = calllib(obj.libname, 'DSS_GR_DataPtr_PDouble');
+            data = calllib(obj.libname, 'ctx_DSS_GR_DataPtr_PDouble', obj.dssctx);
             setdatatype(data, 'doublePtr', 1, obj.CountPtr_PDouble.Value(1));
             result = data.Value;
         end
 
         function result = get_int32_gr_array(obj)
-            data = calllib(obj.libname, 'DSS_GR_DataPtr_PInteger');
+            data = calllib(obj.libname, 'ctx_DSS_GR_DataPtr_PInteger', obj.dssctx);
             setdatatype(data, 'int32Ptr', 1, obj.CountPtr_PInteger.Value(1));
             result = data.Value;
         end
 
         function result = get_int8_gr_array(obj)
-            data = calllib(obj.libname, 'DSS_GR_DataPtr_PByte');
+            data = calllib(obj.libname, 'ctx_DSS_GR_DataPtr_PByte', obj.dssctx);
             setdatatype(data, 'int8Ptr', 1, obj.CountPtr_PByte.Value(1));
             result = data.Value;
         end

+DSS_MATLAB/Base.m

@@ -2,6 +2,7 @@
     properties (Access = protected, Hidden = true)
         apiutil
         libname
+        dssctx
     end
 
     methods (Access = protected)
@@ -24,6 +25,7 @@
         function obj = Base(apiutil)
             obj.apiutil = apiutil;
             obj.libname = apiutil.libname;
+            obj.dssctx = apiutil.dssctx;
         end
 
     end