Added a "phase" argument to decide on when to copy the data from C to…

… Matlab in c-code data profiling code
jvxgit · Jan 22, 2025 · 1b44cc2 · 1b44cc2
1 parent 155573a
commit 1b44cc2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/sources/jvxLibraries/jvx-dsp-base/include/jvx_profiler/jvx_profiler_data_entry.h b/sources/jvxLibraries/jvx-dsp-base/include/jvx_profiler/jvx_profiler_data_entry.h
@@ -9,6 +9,7 @@ struct jvx_profiler_data_entry
 	jvxHandle* fld;
 	jvxCBool cplx;
 	jvxCBool c_to_matlab;
+	jvxSize phase;
 	jvxCBool valid_content;
 };
 

diff --git a/sources/jvxLibraries/jvx-dsp-base/src/jvx_profiler/jvx_profiler_data_entry.c b/sources/jvxLibraries/jvx-dsp-base/src/jvx_profiler/jvx_profiler_data_entry.c
@@ -6,6 +6,7 @@ void jvx_profiler_allocate_single_entry(struct jvx_profiler_data_entry* entry, j
 	entry->cplx = cplxFld;
 	entry->c_to_matlab = c_true;
 	entry->valid_content = c_true;
+	entry->phase = 1;
 	assert(entry->fld == NULL);
 	if (entry->cplx)
 	{

diff --git a/sources/jvxLibraries/jvxLexternalCall/include/CjvxMexCallsProfileTpl.h b/sources/jvxLibraries/jvxLexternalCall/include/CjvxMexCallsProfileTpl.h
@@ -169,6 +169,11 @@ class CjvxMexCallsProfileTpl : public CjvxMexCallsTpl<T>, public CjvxMexCallsPro
 					jvxData* ptrTo = (jvxData*)buffers_in[i];
 					memcpy(ptrTo, ptrFrom, sizeof(jvxData) * this->_common_set_icon.theData_in->con_params.buffersize);
 				}
+				if (engaged)
+				{
+					// Providing data only if c code is operated
+					CjvxMexCallsProfiler::obtainProvideDataMexCall(true, 0);
+				}
 			}
 		}
 
@@ -183,7 +188,7 @@ class CjvxMexCallsProfileTpl : public CjvxMexCallsTpl<T>, public CjvxMexCallsPro
 			if (engaged)
 			{
 				// Providing data only if c code is operated
-				CjvxMexCallsProfiler::obtainProvideDataMexCall(false);
+				CjvxMexCallsProfiler::obtainProvideDataMexCall(false, 1);
 			}
 
 			// Run core algorithm in C
@@ -192,7 +197,7 @@ class CjvxMexCallsProfileTpl : public CjvxMexCallsTpl<T>, public CjvxMexCallsPro
 			if (engaged)
 			{
 				// Providing data only if c code is operated
-				CjvxMexCallsProfiler::obtainProvideDataMexCall(true);
+				CjvxMexCallsProfiler::obtainProvideDataMexCall(true, 1);
 			}
 		}
 

diff --git a/sources/jvxLibraries/jvxLexternalCall/include/CjvxMexCallsProfiler.h b/sources/jvxLibraries/jvxLexternalCall/include/CjvxMexCallsProfiler.h
@@ -24,7 +24,7 @@ class CjvxMexCallsProfiler: public CjvxMexCallsMin
 	std::map<std::string, jvx_profiler_data_entry*> registeredProfilerData;
 	jvxErrorType register_profiling_data(jvx_profiler_data_entry*, const std::string& nm);
 	jvxErrorType unregister_profiling_data(const std::string& nm);
-	jvxErrorType obtainProvideDataMexCall(jvxBool postRun = true);
+	jvxErrorType obtainProvideDataMexCall(jvxBool postRun = true, jvxSize phase = 1);
 	static jvxErrorType jvx_register_entry_profiling_data_cb(jvx_profiler_data_entry* dat, const char* name, jvxHandle* inst);
 	static jvxErrorType jvx_unregister_entry_profiling_data_cb(const char* name, jvxHandle* inst);
 

diff --git a/sources/jvxLibraries/jvxLexternalCall/src/CjvxMexCallsProfiler.cpp b/sources/jvxLibraries/jvxLexternalCall/src/CjvxMexCallsProfiler.cpp
@@ -31,7 +31,7 @@ CjvxMexCallsProfiler::unregister_profiling_data(const std::string& nm)
 }
 
 jvxErrorType
-CjvxMexCallsProfiler::obtainProvideDataMexCall(jvxBool provideData)
+CjvxMexCallsProfiler::obtainProvideDataMexCall(jvxBool provideData, jvxSize phase)
 {
 	jvxExternalDataType* passToMatlab = NULL;
 	jvxExternalDataType* passFromMatlab = NULL;
@@ -60,7 +60,7 @@ CjvxMexCallsProfiler::obtainProvideDataMexCall(jvxBool provideData)
 					}
 				}
 			}
-			if (!provideData && !elm.second->c_to_matlab)
+			if (!provideData && !elm.second->c_to_matlab && (elm.second->phase == phase))
 			{
 				std::string command = "global " + varNameHdlMatlab + "; ";
 				command += elm.first;