master_roby3
/
SimpleEventBuilder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed memory management issues and starvation

dev
MasterRoby3 2023-09-18 02:44:36 +02:00
parent 727d20466e
commit b466eeb563
11 changed files with 130 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ControlledQueue.cxx
View File

@ -1,5 +1,6 @@
#include <chrono>
#include <cstdint>
#include <cstdio>
#include <mutex>
#include "ControlledQueue.h"
@ -37,9 +38,13 @@ void ControlledQueue::put(uint32_t word) {
uint32_t ControlledQueue::get() {
std::unique_lock<std::mutex> lk(m_mtx);
if ( !m_cv.wait_for(lk, std::chrono::microseconds(m_timeoutMicroseconds), [&]() { return !(m_queue.empty()); } ) ) {
throw TimeoutException();
while ( m_queue.empty() ) {
if ( !m_cv.wait_for(lk, std::chrono::microseconds(m_timeoutMicroseconds), [&]() { return !(m_queue.empty()); } ) ) {
throw TimeoutException();
}
}
uint32_t word = m_queue.front();
m_queue.pop();

BIN
a.out
View File

Binary file not shown.

BIN
core
View File

Binary file not shown.

BIN
evBuild.out
View File

Binary file not shown.

55
event_builder.cxx
View File

@ -36,7 +36,7 @@
#include "ControlledQueue.h"
#define MAX_EVENTS 1024
#define MAX_QUEUE_SIZE 1000
#define MAX_QUEUE_SIZE 1000000
#define MAX_TIMEOUT_MICROSEC 50000000
#define READER_THREADS 6
@ -176,10 +176,9 @@ void thradizable(int &epoll_fd, int &master_socket, std::array<ControlledQueue,
//printf("Ev trig th %d with tot b %lu\n", thread_index, part);
// Than we received data from one of the monitored sockets
uint32_t buffer[BUFFER_SIZE_WORDS];
int valread = 0;
//while (valread != EAGAIN) {
std::unique_lock<std::mutex> lk(queues_mutexes[fd]);
valread = recv(fd, reinterpret_cast<char*>(buffer), sizeof(buffer), 0);
ssize_t valread = recv(fd, reinterpret_cast<char*>(buffer), sizeof(buffer), 0);
if (valread > 0) {
//printf("[RICEVUTO]\t FROM %d\n", fd);
int opt_incr = (valread % 4) ? 1 : 0;
@ -221,11 +220,16 @@ void thradizable(int &epoll_fd, int &master_socket, std::array<ControlledQueue,
void builder_thread (std::array<ControlledQueue, MAX_EVENTS> &queues_array, uint32_t &runNumber) {
uint32_t counter = 0;
while (1) {
std::unique_lock<std::mutex> conn_lk(conn_mutex);
while ( (max_fd < min_fd) || (exp_num <= 0) || ((max_fd - min_fd + 1) != exp_num)) {
conn_cv.wait(conn_lk);
if ( (max_fd < min_fd) || (exp_num <= 0) || ((max_fd - min_fd + 1) != exp_num)) {
std::unique_lock<std::mutex> conn_lk(conn_mutex);
while ( (max_fd < min_fd) || (exp_num <= 0) || ((max_fd - min_fd + 1) != exp_num)) {
conn_cv.wait(conn_lk);
}
conn_lk.unlock();
}
FullEvent fullEvent;
@ -235,13 +239,16 @@ void builder_thread (std::array<ControlledQueue, MAX_EVENTS> &queues_array, uint
fullEvent.fragmentsArray = new Fragment[max_fd - min_fd + 1];
uint32_t fullEventPayloadSize = 0;
for (int i = min_fd; i <= max_fd; i++){
std::unique_lock<std::mutex> lk(queues_mutexes[i]);
//std::unique_lock<std::mutex> lk(queues_mutexes[i]);
int inCurrentEventNumber = 0;
while (inCurrentEventNumber != 1) {
try {
uint32_t starter = queues_array[i].get();
if (starter == FRAGMENT_HEADER_MARKER) {
uint32_t headerSize = queues_array[i].get();
uint32_t fragmentSize = queues_array[i].get();
@ -250,26 +257,31 @@ void builder_thread (std::array<ControlledQueue, MAX_EVENTS> &queues_array, uint
buffer[1] = headerSize;
buffer[2] = fragmentSize;
for (int j = 3; j < fragmentSize; j++) {
buffer[j] = queues_array[i].get();
}
Fragment fragment = decode_fragment(buffer);
if (fragment.header.detectorEventNumber < fullEvent.eventNumber) {
if (getDetectorEventNumber(buffer) < fullEvent.eventNumber) {
continue;
} else if (fragment.header.detectorEventNumber == fullEvent.eventNumber) {
} else if (getDetectorEventNumber(buffer) == fullEvent.eventNumber) {
Fragment& fragment = fullEvent.fragmentsArray[i - min_fd];
decode_fragment(buffer, fragment);
inCurrentEventNumber = 1;
fullEvent.fragmentsArray[i - min_fd] = fragment;
fullEventPayloadSize += fragment.header.fragmentSize;
} else {
printf("È successo un cazzo di casino");
}
delete [] buffer;
}
} catch (const TimeoutException& ex) {
printf("Ho catchato\n");
inCurrentEventNumber = 1;
Fragment fragment;
Header header;
Fragment& fragment = fullEvent.fragmentsArray[i - min_fd];
Header& header = fragment.header;
header.sourceIdentifier = i - min_fd;
header.runNumber = runNumber;
header.detectorEventNumber = counter;
@ -284,17 +296,20 @@ void builder_thread (std::array<ControlledQueue, MAX_EVENTS> &queues_array, uint
header.headerSize = 7 + header.numberOfStatusElements;
header.fragmentSize = header.headerSize;
fragment.header = header;
//fragment.header = header;
fullEvent.fragmentsArray[i - min_fd] = fragment;
//fullEvent.fragmentsArray[i - min_fd] = fragment;
fullEventPayloadSize += fragment.header.fragmentSize;
}
}
printFullEvent(fullEvent);
lk.unlock();
//lk.unlock();
}
conn_lk.unlock();
fullEvent.eventSize = fullEvent.headerSize + fullEventPayloadSize;
printFullEvent(fullEvent);
counter++;
}
}
@ -369,6 +384,7 @@ int main(int argc, char const *argv[]) {
for (int t_i = 0; t_i < READER_THREADS; t_i++) {
thread_flags[t_i] = 0;
vT[t_i] = std::thread(thradizable, std::ref(epoll_fd), std::ref(master_socket), std::ref(queues_array), std::cref(thread_flags.at(t_i)), t_i);
//vT[t_i].detach();
}
std::thread bdth(builder_thread, std::ref(queues_array), std::ref(runNumber));
@ -376,6 +392,7 @@ int main(int argc, char const *argv[]) {
//ADD CONSUMER THREAD
bdth.join();
//sleep(30);
if (close(epoll_fd)) {
printf("Failed to close epoll file descriptor");

48
fragment_dataformat.h
View File

@ -25,11 +25,27 @@ typedef struct Header {
<< std::setw(8) << std::setfill('0') << header.detectorEventNumber << '\n'
<< std::setw(8) << std::setfill('0') << header.numberOfStatusElements << '\n';
}*/
public:
Header() : statusElementsArray(NULL) {}
~Header() {
if (statusElementsArray != NULL) {
delete [] statusElementsArray;
}
}
} Header;
typedef struct Fragment {
Header header;
uint32_t *payloadElements;
public:
Fragment() : header(), payloadElements(NULL) {}
~Fragment() {
if (payloadElements != NULL) {
delete [] payloadElements;
}
}
} Fragment;
enum ERROR_CODES {
@ -58,8 +74,11 @@ void encode_fragment(uint32_t *buffer, const Fragment &fragment){
}
Fragment decode_fragment(uint32_t *buffer) {
Fragment fragment;
uint32_t getDetectorEventNumber(uint32_t *buffer) {
return buffer[5];
}
void decode_fragment(uint32_t *buffer, Fragment &fragment) {
fragment.header.startOfHeaderMarker = buffer[0];
fragment.header.headerSize = buffer[1];
fragment.header.fragmentSize = buffer[2];
@ -69,37 +88,36 @@ Fragment decode_fragment(uint32_t *buffer) {
fragment.header.numberOfStatusElements = buffer[6];
uint32_t nStatusElements = fragment.header.numberOfStatusElements;
printf("Status elements bitch: %d\n", nStatusElements);
fragment.header.statusElementsArray = new uint32_t[nStatusElements];
for (int i = 1; i <= nStatusElements; i++) {
fragment.header.statusElementsArray[6+i] = buffer[6+i];
fragment.header.statusElementsArray[i-1] = buffer[6+i];
}
uint32_t payload_size = fragment.header.fragmentSize - fragment.header.headerSize;
fragment.payloadElements = new uint32_t[payload_size];
for (int i = 1; i <= payload_size; i++) {
fragment.payloadElements[6+nStatusElements+i] = buffer[6+nStatusElements+i];
fragment.payloadElements[i-1] = buffer[6+nStatusElements+i];
}
return fragment;
}
void printFragment(Fragment &fragment) {
printf("NewFrag\n");
printf("0x%08x", fragment.header.startOfHeaderMarker);
printf("0x%08x", fragment.header.headerSize);
printf("0x%08x", fragment.header.fragmentSize);
printf("0x%08x", fragment.header.sourceIdentifier);
printf("0x%08x", fragment.header.runNumber);
printf("0x%08x", fragment.header.detectorEventNumber);
printf("0x%08x", fragment.header.numberOfStatusElements);
printf("0x%08x\n", fragment.header.startOfHeaderMarker);
printf("0x%08x\n", fragment.header.headerSize);
printf("0x%08x\n", fragment.header.fragmentSize);
printf("0x%08x\n", fragment.header.sourceIdentifier);
printf("0x%08x\n", fragment.header.runNumber);
printf("0x%08x\n", fragment.header.detectorEventNumber);
printf("0x%08x\n", fragment.header.numberOfStatusElements);
for (uint32_t i = 0; i < fragment.header.numberOfStatusElements; i++) {
printf("0x%08x", fragment.header.statusElementsArray[i]);
printf("0x%08x\n", fragment.header.statusElementsArray[i]);
}
uint32_t payloadSize = fragment.header.fragmentSize - fragment.header.headerSize;
for (uint32_t i = 0; i < payloadSize; i++) {
printf("0x%08x", fragment.payloadElements[i]);
printf("0x%08x\n", fragment.payloadElements[i]);
}

8
full_event_format.h
View File

@ -15,6 +15,14 @@ typedef struct FullEvent {
Fragment *fragmentsArray;
public:
FullEvent() : fragmentsArray(NULL) {}
~FullEvent() {
if (fragmentsArray != NULL) {
delete [] fragmentsArray;
}
}
}FullEvent;
void printFullEvent(FullEvent &fullEvent) {

BIN
prov.out
View File

Binary file not shown.

16
provider.cxx
View File

@ -68,7 +68,7 @@ int main(int argc, char* argv[]) {
std::discrete_distribution<uint8_t> discrete_distr({0.9, 0.1});
std::normal_distribution<float> normal_distr(25., 10.);
std::uniform_int_distribution<uint32_t> unif_int_distib;
std::uniform_real_distribution<float> unif_float_distrib(2, 5);
std::uniform_real_distribution<float> unif_float_distrib(1, 2);
//commenting all old_style generation
//srand (static_cast <unsigned> (42));
@ -93,7 +93,8 @@ int main(int argc, char* argv[]) {
connectTo(socket, host, port);
while (true) {
Header header;
Fragment fragment;
Header& header = fragment.header;
header.sourceIdentifier = source_id;
header.runNumber = run_number;
header.detectorEventNumber = event_number;
@ -122,8 +123,6 @@ int main(int argc, char* argv[]) {
header.headerSize = 7 + header.numberOfStatusElements;
header.fragmentSize = header.headerSize + payload_size;
Fragment fragment;
fragment.header = header;
fragment.payloadElements = new uint32_t[payload_size];
for (uint32_t i = 0; i < payload_size; i++) {
fragment.payloadElements[i] = unif_int_distib(generator);
@ -131,7 +130,9 @@ int main(int argc, char* argv[]) {
uint32_t buffer[header.fragmentSize];
encode_fragment(buffer, fragment);
//printFragment(fragment);
ssize_t bytes = send(socket, reinterpret_cast<char*>(buffer), sizeof(buffer), 0);
//printf("sent bytes %zd\n", bytes);
if (bytes != header.fragmentSize * sizeof(uint32_t)) {
perror("Send failed: num bytes not matching");
exit(EXIT_FAILURE);
@ -148,13 +149,8 @@ int main(int argc, char* argv[]) {
//}
//std::cout << std::endl;
if (header.numberOfStatusElements > 0){
delete [] fragment.header.statusElementsArray;
}
delete [] fragment.payloadElements;
sleep(unif_float_distrib(generator));
usleep(static_cast<int>(unif_float_distrib(generator) * 1e6));
}
return 0;

40
trialsFullEvent.cxx 100644
View File

@ -0,0 +1,40 @@
#include "fragment_dataformat.h"
#include "full_event_format.h"
#include <cstdio>
int main() {
FullEvent fullEvent;
fullEvent.headerSize = 5;
fullEvent.runNumber = 5;
fullEvent.eventNumber = 1;
fullEvent.fragmentsArray = new Fragment[5];
uint32_t fullEventPayloadSize = 0;
for (int i = 0; i <5; i++){
uint32_t starter = 1;
uint32_t headerSize = 7;
uint32_t fragmentSize = 10;
uint32_t* buffer = new uint32_t[fragmentSize];
buffer[0] = starter;
buffer[1] = headerSize;
buffer[2] = fragmentSize;
for (int j = 3; j < fragmentSize; j++) {
buffer[j] = 0;
}
printf("ecchecazzo\n");
Fragment& fragment = fullEvent.fragmentsArray[i];
decode_fragment(buffer, fragment);
printf("ecchecazzo\n");
fullEventPayloadSize += fragment.header.fragmentSize;
delete [] buffer;
printf("codiaz\n");
}
}

BIN
tries.out 100755
View File

Binary file not shown.