sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

memory optimizations

David Rebbe 2024-12-05 11:42:55 -05:00
parent 875bf45421
commit 3cdf9a341f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/icsneo/icsneo.cpp
View File

@ -197,8 +197,11 @@ ICSNEO_API icsneo_error_t icsneo_close(icsneo_device_t* device) {
return icsneo_error_success; return icsneo_error_success;
} }
dev->close(); dev->close();
// Clear out old messages // Clear out old messages and events
device->messages.clear(); device->messages.clear();
device->messages.shrink_to_fit();
device->events.clear();
device->events.shrink_to_fit();
return icsneo_error_success; return icsneo_error_success;
} }
@ -369,7 +372,7 @@ ICSNEO_API icsneo_error_t icsneo_get_messages(icsneo_device_t* device, icsneo_me
message_t->message = message; message_t->message = message;
device->messages.push_back(message_t); device->messages.push_back(message_t);
} }
device->messages.shrink_to_fit();
// Copy the messages into the output array // Copy the messages into the output array
for (uint32_t i = 0; i < min_size; i++) { for (uint32_t i = 0; i < min_size; i++) {
messages[i] = device->messages[i].get(); messages[i] = device->messages[i].get();
@ -571,6 +574,7 @@ ICSNEO_API icsneo_error_t icsneo_get_events(icsneo_event_t** events, uint32_t* e
}; };
g_events.push_back(e); g_events.push_back(e);
} }
g_events.shrink_to_fit();
// Copy the global events references into the events array // Copy the global events references into the events array
for (uint32_t i = 0; i < min_size; i++) { for (uint32_t i = 0; i < min_size; i++) {
events[i] = &g_events[i]; events[i] = &g_events[i];
@ -603,6 +607,7 @@ ICSNEO_API icsneo_error_t icsneo_device_get_events(icsneo_device_t* device, icsn
}; };
device->events.push_back(e); device->events.push_back(e);
} }
device->events.shrink_to_fit();
// Copy the device events references into the events array // Copy the device events references into the events array
for (uint32_t i = 0; i < min_size; i++) { for (uint32_t i = 0; i < min_size; i++) {
events[i] = &device->events[i]; events[i] = &device->events[i];

1
examples/c/simple/src/main.c
View File

@ -233,7 +233,6 @@ int process_messages(icsneo_device_t* device, icsneo_message_t** messages, uint3
printf(" ]\n"); printf(" ]\n");
continue; continue;
} }
} }
return icsneo_error_success; return icsneo_error_success;