maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a global "void_instruction" in imscope record thread

Browse Source 
This avoids the issue of compare_exchange_weak always failing. The issue
was that `store()` is not equal to `exchange()`. `exchange` uses memory
copy while `store()` copies the value representation of the argument, which
is not always the same thing.
This commit is contained in:
Bartosz Podrygajlo
2025-01-28 16:55:53 +01:00
parent 30de011fa3
commit 2ea6ac26bd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/TOOLS/imscope/imscope_record.cpp
+4 -4
View File
@@ -48,6 +48,7 @@ typedef struct alignas(hardware_destructive_interference_size) ImScopeDumpInstru
} ImScopeDumpInstruction; } ImScopeDumpInstruction;
std::atomic<ImScopeDumpInstruction> dump_instruction; std::atomic<ImScopeDumpInstruction> dump_instruction;
ImScopeDumpInstruction void_instruction({-1, -1, nullptr});
extern "C" void imscope_record_autoinit(void *dataptr) extern "C" void imscope_record_autoinit(void *dataptr)
{ {
@@ -61,7 +62,7 @@ extern "C" void imscope_record_autoinit(void *dataptr)
scope_array[i].data.meta = {-1, -1}; scope_array[i].data.meta = {-1, -1};
} }
dump_instruction.store({-1, -1, nullptr}); dump_instruction.exchange(void_instruction);
scopeData_t *scope = (scopeData_t *)calloc(1, sizeof(scopeData_t)); scopeData_t *scope = (scopeData_t *)calloc(1, sizeof(scopeData_t));
scope->copyData = copyDataThreadSafe; scope->copyData = copyDataThreadSafe;
@@ -86,8 +87,7 @@ extern "C" void imscope_record_autoinit(void *dataptr)
void dumpScopeData(int slot, int frame, const char *cause_string) void dumpScopeData(int slot, int frame, const char *cause_string)
{ {
ImScopeDumpInstruction to_dump = {slot, frame, cause_string}; ImScopeDumpInstruction to_dump = {slot, frame, cause_string};
ImScopeDumpInstruction expected = {-1, -1, nullptr}; dump_instruction.compare_exchange_weak(void_instruction, to_dump);
dump_instruction.compare_exchange_weak(expected, to_dump);
} }
void *imscope_record_thread(void *data_void_ptr) void *imscope_record_thread(void *data_void_ptr)
@@ -142,7 +142,7 @@ void *imscope_record_thread(void *data_void_ptr)
kbytes_written += pos / 1000.0f; kbytes_written += pos / 1000.0f;
outf.close(); outf.close();
LOG_D(PHY, "ImScope done writing to %s\n", filename.c_str()); LOG_D(PHY, "ImScope done writing to %s\n", filename.c_str());
dump_instruction.store({-1, -1, nullptr}, std::memory_order::memory_order_relaxed); dump_instruction.exchange(void_instruction);
} }
for (auto i = 0U; i < EXTRA_SCOPE_TYPES; i++) { for (auto i = 0U; i < EXTRA_SCOPE_TYPES; i++) {
ImScopeDataWrapper &scope_data = scope_array[i]; ImScopeDataWrapper &scope_data = scope_array[i];