Skip to content

Commit 9baac71

Browse files
sy-csy-c
authored
Merge pull request #263 from davidrohr/PR
Fix compilation warnings
2 parents 4f238d7 + c374447 commit 9baac71

4 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎src/ConsumerDataSampling.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
#ifdef WITH_FAIRMQ
1515

16-
#include <fairmq/FairMQDevice.h>
17-
#include <fairmq/FairMQMessage.h>
18-
#include <fairmq/FairMQParts.h>
19-
#include <fairmq/FairMQTransportFactory.h>
16+
#include <fairmq/Device.h>
17+
#include <fairmq/Message.h>
18+
#include <fairmq/Parts.h>
19+
#include <fairmq/TransportFactory.h>
2020
#include <thread>
2121
#include "ReadoutUtils.h"
2222

@@ -91,30 +91,30 @@ class ConsumerDataSampling : public Consumer
9191

9292
sender.fChannels = m;
9393
sender.SetTransport("zeromq");
94-
sender.ChangeState(fair::mq::Transition::InitDevice);
94+
sender.ChangeStateOrThrow(fair::mq::Transition::InitDevice);
9595
sender.WaitForState(fair::mq::State::InitializingDevice);
96-
sender.ChangeState(fair::mq::Transition::CompleteInit);
96+
sender.ChangeStateOrThrow(fair::mq::Transition::CompleteInit);
9797
sender.WaitForState(fair::mq::State::Initialized);
98-
sender.ChangeState(fair::mq::Transition::Bind);
98+
sender.ChangeStateOrThrow(fair::mq::Transition::Bind);
9999
sender.WaitForState(fair::mq::State::Bound);
100-
sender.ChangeState(fair::mq::Transition::Connect);
100+
sender.ChangeStateOrThrow(fair::mq::Transition::Connect);
101101
sender.WaitForState(fair::mq::State::DeviceReady);
102-
sender.ChangeState(fair::mq::Transition::InitTask);
102+
sender.ChangeStateOrThrow(fair::mq::Transition::InitTask);
103103
sender.WaitForState(fair::mq::State::Ready);
104-
sender.ChangeState(fair::mq::Transition::Run);
104+
sender.ChangeStateOrThrow(fair::mq::Transition::Run);
105105

106106
// sender.InteractiveStateLoop();
107107
}
108108

109109
~ConsumerDataSampling()
110110
{
111-
sender.ChangeState(fair::mq::Transition::Stop);
111+
sender.ChangeStateOrThrow(fair::mq::Transition::Stop);
112112
sender.WaitForState(fair::mq::State::Ready);
113-
sender.ChangeState(fair::mq::Transition::ResetTask);
113+
sender.ChangeStateOrThrow(fair::mq::Transition::ResetTask);
114114
sender.WaitForState(fair::mq::State::DeviceReady);
115-
sender.ChangeState(fair::mq::Transition::ResetDevice);
115+
sender.ChangeStateOrThrow(fair::mq::Transition::ResetDevice);
116116
sender.WaitForState(fair::mq::State::Idle);
117-
sender.ChangeState(fair::mq::Transition::End);
117+
sender.ChangeStateOrThrow(fair::mq::Transition::End);
118118

119119
if (deviceThread.joinable()) {
120120
deviceThread.join();

‎src/ConsumerFMQ.cxx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
#ifdef WITH_FAIRMQ
1515

16-
#include <fairmq/FairMQDevice.h>
17-
#include <fairmq/FairMQMessage.h>
18-
#include <fairmq/FairMQTransportFactory.h>
16+
#include <fairmq/Device.h>
17+
#include <fairmq/Message.h>
18+
#include <fairmq/TransportFactory.h>
1919
#include <thread>
2020
#include "ReadoutUtils.h"
2121

@@ -89,30 +89,30 @@ class ConsumerFMQ : public Consumer
8989

9090
sender.fChannels = m;
9191
sender.SetTransport("zeromq");
92-
sender.ChangeState(fair::mq::Transition::InitDevice);
92+
sender.ChangeStateOrThrow(fair::mq::Transition::InitDevice);
9393
sender.WaitForState(fair::mq::State::InitializingDevice);
94-
sender.ChangeState(fair::mq::Transition::CompleteInit);
94+
sender.ChangeStateOrThrow(fair::mq::Transition::CompleteInit);
9595
sender.WaitForState(fair::mq::State::Initialized);
96-
sender.ChangeState(fair::mq::Transition::Bind);
96+
sender.ChangeStateOrThrow(fair::mq::Transition::Bind);
9797
sender.WaitForState(fair::mq::State::Bound);
98-
sender.ChangeState(fair::mq::Transition::Connect);
98+
sender.ChangeStateOrThrow(fair::mq::Transition::Connect);
9999
sender.WaitForState(fair::mq::State::DeviceReady);
100-
sender.ChangeState(fair::mq::Transition::InitTask);
100+
sender.ChangeStateOrThrow(fair::mq::Transition::InitTask);
101101
sender.WaitForState(fair::mq::State::Ready);
102-
sender.ChangeState(fair::mq::Transition::Run);
102+
sender.ChangeStateOrThrow(fair::mq::Transition::Run);
103103

104104
// sender.InteractiveStateLoop();
105105
}
106106

107107
~ConsumerFMQ()
108108
{
109-
sender.ChangeState(fair::mq::Transition::Stop);
109+
sender.ChangeStateOrThrow(fair::mq::Transition::Stop);
110110
sender.WaitForState(fair::mq::State::Ready);
111-
sender.ChangeState(fair::mq::Transition::ResetTask);
111+
sender.ChangeStateOrThrow(fair::mq::Transition::ResetTask);
112112
sender.WaitForState(fair::mq::State::DeviceReady);
113-
sender.ChangeState(fair::mq::Transition::ResetDevice);
113+
sender.ChangeStateOrThrow(fair::mq::Transition::ResetDevice);
114114
sender.WaitForState(fair::mq::State::Idle);
115-
sender.ChangeState(fair::mq::Transition::End);
115+
sender.ChangeStateOrThrow(fair::mq::Transition::End);
116116

117117
if (deviceThread.joinable()) {
118118
deviceThread.join();

‎src/readoutMemoryMonitor.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ int main(int argc, char** argv)
197197
isOk = 0;
198198
break;
199199
}
200-
auto stats = ((MemoryPagesPool::Stats *)msgBuffer[1+p*2]);
201200
unsigned int npages = msgSize[2+p*2] / sizeof(MemoryPagesPool::PageStat);
201+
//auto stats = ((MemoryPagesPool::Stats *)msgBuffer[1+p*2]);
202202
//printf("%d %d: %f - %f - %u\n",p, stats->id, stats->t0,stats->t1,npages);
203203
auto ps = (MemoryPagesPool::PageStat*)msgBuffer[2+p*2];
204204
int c = 0;
@@ -231,7 +231,7 @@ int main(int argc, char** argv)
231231
SDL_Rect r = {ox,oy,cw,cy};
232232
SDL_RenderDrawRect(hRenderer, &r);
233233

234-
auto stats = ((MemoryPagesPool::Stats *)msgBuffer[1+p*2]);
234+
//auto stats = ((MemoryPagesPool::Stats *)msgBuffer[1+p*2]);
235235
unsigned int npages = msgSize[2+p*2] / sizeof(MemoryPagesPool::PageStat);
236236
auto ps = (MemoryPagesPool::PageStat*)msgBuffer[2+p*2];
237237

@@ -261,7 +261,7 @@ int main(int argc, char** argv)
261261
}
262262
int rx = k % npl;
263263
int ry = k / npl;
264-
SDL_Rect r = {ox+bb+rx*pxk+1,oy+bb+ry*pxk+1,pxk-2,pxk-2};
264+
SDL_Rect r = {(int)(ox+bb+rx*pxk+1),(int)(oy+bb+ry*pxk+1),(int)(pxk-2),(int)(pxk-2)};
265265
SDL_RenderFillRect(hRenderer, &r);
266266
}
267267
}

‎src/receiverFMQ.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -582,17 +582,17 @@ int main(int argc, const char** argv)
582582

583583
fd.fChannels = m;
584584
fd.SetTransport("zeromq");
585-
fd.ChangeState(fair::mq::Transition::InitDevice);
585+
fd.ChangeStateOrThrow(fair::mq::Transition::InitDevice);
586586
fd.WaitForState(fair::mq::State::InitializingDevice);
587-
fd.ChangeState(fair::mq::Transition::CompleteInit);
587+
fd.ChangeStateOrThrow(fair::mq::Transition::CompleteInit);
588588
fd.WaitForState(fair::mq::State::Initialized);
589-
fd.ChangeState(fair::mq::Transition::Bind);
589+
fd.ChangeStateOrThrow(fair::mq::Transition::Bind);
590590
fd.WaitForState(fair::mq::State::Bound);
591-
fd.ChangeState(fair::mq::Transition::Connect);
591+
fd.ChangeStateOrThrow(fair::mq::Transition::Connect);
592592
fd.WaitForState(fair::mq::State::DeviceReady);
593-
fd.ChangeState(fair::mq::Transition::InitTask);
593+
fd.ChangeStateOrThrow(fair::mq::Transition::InitTask);
594594
fd.WaitForState(fair::mq::State::Ready);
595-
fd.ChangeState(fair::mq::Transition::Run);
595+
fd.ChangeStateOrThrow(fair::mq::Transition::Run);
596596

597597
// fd.InteractiveStateLoop();
598598

@@ -603,13 +603,13 @@ int main(int argc, const char** argv)
603603
}
604604
printf("Exit requested\n");
605605

606-
fd.ChangeState(fair::mq::Transition::Stop);
606+
fd.ChangeStateOrThrow(fair::mq::Transition::Stop);
607607
fd.WaitForState(fair::mq::State::Ready);
608-
fd.ChangeState(fair::mq::Transition::ResetTask);
608+
fd.ChangeStateOrThrow(fair::mq::Transition::ResetTask);
609609
fd.WaitForState(fair::mq::State::DeviceReady);
610-
fd.ChangeState(fair::mq::Transition::ResetDevice);
610+
fd.ChangeStateOrThrow(fair::mq::Transition::ResetDevice);
611611
fd.WaitForState(fair::mq::State::Idle);
612-
fd.ChangeState(fair::mq::Transition::End);
612+
fd.ChangeStateOrThrow(fair::mq::Transition::End);
613613

614614
printf("Done!\n");
615615
return 0;

0 commit comments

Comments
 (0)