ctx fixes, move from void* to uint64 (MATLAB doesn't like pointers)

Author: PMeira

+DSS_MATLAB/APIUtil.m

@@ -11,7 +11,7 @@
         is_prime
     end
     methods
-        function obj = APIUtil(create)
+        function obj = APIUtil(varargin)
 
             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')
@@ -25,8 +25,9 @@
             PropertiesMOfilePath = fullfile(MfilePath, 'messages', 'properties-en-US.mo');
             DSS_MATLAB.librefcount(1);
             if libisloaded(obj.libname)
-                if (nargin > 0) && (create ~= 0)
+                if (nargin > 0) && (varargin{1} ~= 0)
                     obj.dssctx = calllib(obj.libname, 'ctx_New');
+                    DSS_MATLAB.ctxrefcount(obj.dssctx, 1);
                     obj.is_prime = 0;
                 else
                     obj.dssctx = calllib(obj.libname, 'ctx_Get_Prime');
@@ -44,9 +45,10 @@
                 loadlibrary(DLLfilePath, @DSS_MATLAB.dss_capi_no_thunk);
             end
             calllib(obj.libname, 'DSS_Start', 0);
-            calllib(obj.libname, 'DSS_SetPropertiesMO', PropertiesMOfilePath);
-            if (nargin > 0) && (create ~= 0)
+            % calllib(obj.libname, 'DSS_SetPropertiesMO', PropertiesMOfilePath);
+            if (nargin > 0) && (varargin{1} ~= 0)
                 obj.dssctx = calllib(obj.libname, 'ctx_New');
+                DSS_MATLAB.ctxrefcount(obj.dssctx, 1);
                 obj.is_prime = 0;
             else
                 obj.dssctx = calllib(obj.libname, 'ctx_Get_Prime');
@@ -56,15 +58,19 @@
         end
 
         function delete(obj)
-            if obj.is_prime ~= 0
-                calllib(obj.libname, 'ctx_Dispose', obj.dssctx);
+            
+            if obj.is_prime == 0
+                cnt = DSS_MATLAB.ctxrefcount(obj.dssctx, -1);
+                if cnt == 0
+                    calllib(obj.libname, 'ctx_Dispose', obj.dssctx);
+                end
             end
 
             % If nothing is using the library, unload it.
             % Required to properly exit MATLAB.
             cnt = DSS_MATLAB.librefcount(-1);
             if (cnt == 0)
-                prime_ctx = calllib(obj.libname, 'ctx_Get_Prime')
+                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);

+DSS_MATLAB/Base.m

@@ -33,17 +33,17 @@
     methods
 
         function varargout = CheckForError(obj, varargin)
-            error = calllib(obj.libname, 'Error_Get_Number');
+            error = calllib(obj.libname, 'ctx_Error_Get_Number', obj.dssctx);
             if error ~= 0
-                ME = MException(['DSS_MATLAB:Error' int2str(error)], strrep(calllib(obj.libname, 'Error_Get_Description'), '\', '\\'));
+                ME = MException(['DSS_MATLAB:Error' int2str(error)], strrep(calllib(obj.libname, 'ctx_Error_Get_Description', obj.dssctx), '\', '\\'));
                 throw(ME);
             end
             varargout = varargin;
         end
 
         function obj = clear_api_buffers(obj)
-            calllib(obj.libname, 'DSS_DisposeGRData');
-            calllib(obj.libname, 'DSS_ResetStringBuffer');
+            calllib(obj.libname, 'ctx_DSS_DisposeGRData', obj.dssctx);
+            calllib(obj.libname, 'ctx_DSS_ResetStringBuffer', obj.dssctx);
         end
     end
 end

+DSS_MATLAB/ICktElement.m

@@ -104,7 +104,7 @@
     methods (Access = public)
         function obj = ICktElement(apiutil)
             obj@DSS_MATLAB.Base(apiutil);
-            obj.Properties = DSS_MATLAB.IDSSProperty(obj.apiutil);
+            obj.PropertiesRef = DSS_MATLAB.IDSSProperty(obj.apiutil);
         end
 
         function obj = Close(obj, Term, Phs)

+DSS_MATLAB/IDSS.m

@@ -64,8 +64,8 @@
     end
 
     methods (Access = public)
-        function obj = IDSS(create)
-            apiutil = DSS_MATLAB.APIUtil(create);
+        function obj = IDSS(varargin)
+            apiutil = DSS_MATLAB.APIUtil(varargin{:});
             apiutil.InitBuffers();
             obj@DSS_MATLAB.Base(apiutil);
             obj.ActiveCircuit = DSS_MATLAB.ICircuit(obj.apiutil);
@@ -119,7 +119,7 @@
             % manually, the management of threads and potential issues should be handled by the user.
             % 
             % (API Extension)
-            result = IDSS(1);
+            result = DSS_MATLAB.IDSS(1);
         end
     end
     methods