mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 37 Wiki Activity

ProcessJFPacket: Add shared_/unique_lock

Browse Source
This commit is contained in:
leonarski_f
2023-04-06 19:59:58 +02:00
parent 2c401945b6
commit 68e6077e73
2 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
receiver/host/ProcessJFPacket.cpp
View File

@@ -37,34 +37,41 @@ bool ProcessJFPacket::ProcessPacket(jf_payload *datagram, uint32_t src_ip) {
if (counter > module_info.size())
throw JFJochException(JFJochExceptionCategory::ArrayOutOfBounds, "Module number out of bounds");
if (module_info[counter].c.frame_number != frame_number) {
if (module_info[counter].c.frame_number != UINT64_MAX)
c_fifo.Put(module_info[counter].c);
{
std::shared_lock<std::shared_mutex> sl(m);
if (module_info[counter].c.frame_number != frame_number) {
sl.unlock();
{
std::unique_lock<std::shared_mutex> ul(m);
if (module_info[counter].c.frame_number != UINT64_MAX)
c_fifo.Put(module_info[counter].c);
auto wr = wr_fifo.GetBlocking();
auto wr = wr_fifo.GetBlocking();
module_info[counter].c.type = Completion::Type::Image;
module_info[counter].c.frame_number = frame_number;
module_info[counter].c.timestamp = datagram->timestamp;
module_info[counter].c.bunchid = datagram->bunchid;
module_info[counter].c.debug = datagram->debug;
module_info[counter].c.packet_mask[0] = 0;
module_info[counter].c.packet_mask[1] = 0;
module_info[counter].c.packet_count = 0;
module_info[counter].c.module = module_number;
module_info[counter].c.type = Completion::Type::Image;
module_info[counter].c.frame_number = frame_number;
module_info[counter].c.timestamp = datagram->timestamp;
module_info[counter].c.bunchid = datagram->bunchid;
module_info[counter].c.debug = datagram->debug;
module_info[counter].c.packet_mask[0] = 0;
module_info[counter].c.packet_mask[1] = 0;
module_info[counter].c.packet_count = 0;
module_info[counter].c.module = module_number;
module_info[counter].c.handle = wr.handle;
module_info[counter].ptr = wr.ptr;
module_info[counter].c.handle = wr.handle;
module_info[counter].ptr = wr.ptr;
}
sl.lock();
}
module_info[counter].c.packet_count++;
module_info[counter].c.packet_mask[packetnum >= 64 ? 1 : 0] |= (1LU << (packetnum % 64));
if (conversion)
conversion->ConvertPacket((int16_t *) (module_info[counter].ptr + 4096 * packetnum), datagram->data,
packetnum);
else
memcpy(module_info[counter].ptr + 4096 * packetnum, datagram->data, 4096 * sizeof(uint16_t));
}
module_info[counter].c.packet_count++;
module_info[counter].c.packet_mask[packetnum >= 64 ? 1 : 0] |= (1LU << (packetnum % 64));
if (conversion)
conversion->ConvertPacket((int16_t *) (module_info[counter].ptr + 4096 * packetnum), datagram->data, packetnum);
else
memcpy(module_info[counter].ptr + 4096 * packetnum, datagram->data, 4096 * sizeof(uint16_t));
return true;
}