Skip to content

Commit 8388174

Browse files
New paths for shared mem files
1 parent 5fd8c47 commit 8388174

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/ChannelPaths.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ namespace b = boost;
1111
namespace AliceO2 {
1212
namespace roc {
1313
namespace {
14-
static const char* DIR_SHAREDMEM = "/dev/shm/alice_o2/rorc";
15-
static const char* FORMAT = "%s/%s/channel_%i/%s";
14+
static const char* DIR_SHAREDMEM = "/dev/shm/";
15+
static const char* FORMAT = "%s/AliceO2_RoC_%s_Channel_%i%s";
1616
}
1717

1818
ChannelPaths::ChannelPaths(PciAddress pciAddress, int channel) : mPciAddress(pciAddress), mChannel(channel)
@@ -31,12 +31,12 @@ std::string ChannelPaths::lock() const
3131

3232
std::string ChannelPaths::fifo() const
3333
{
34-
return makePath("fifo", DIR_SHAREDMEM);
34+
return makePath("_fifo", DIR_SHAREDMEM);
3535
}
3636

3737
std::string ChannelPaths::namedMutex() const
3838
{
39-
return b::str(b::format("alice_o2_rorc_%s_channel_%i.mutex") % mPciAddress.toString() % mChannel);
39+
return b::str(b::format("AliceO2_RoC_%s_Channel_%i_Mutex") % mPciAddress.toString() % mChannel);
4040
}
4141

4242
} // namespace roc

src/Pda/PdaLock.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ class PdaLock
2323
/// Pda::PdaLock lock()
2424
/// But rather like this:
2525
/// Pda::PdaLock lock{}
26-
PdaLock(bool wait = true) : mLock("/dev/shm/alice_o2/rorc/AliceO2_roc_Pda_PdaDmaBuffer.lock",
27-
"AliceO2_roc_Pda_PdaDmaBuffer_Mutex", wait)
26+
PdaLock(bool wait = true) : mLock("/dev/shm/AliceO2_RoC_Pda.lock", "AliceO2_RoC_Pda_Mutex", wait)
2827
{
2928
}
3029

0 commit comments

Comments
 (0)