Skip to content

Commit 7c657d8

Browse files
authored
Remove unused source
1 parent 0d6ea28 commit 7c657d8

File tree

11 files changed

+4
-881
lines changed

11 files changed

+4
-881
lines changed

apps/ProgramAlf.cxx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ class ProgramAlf : public AliceO2::Common::Program
107107

108108
getLogger() << "Card #" << serial << " : " << card.pciAddress << endm;
109109
bar2 = roc::ChannelFactory().getBar(card.pciAddress, 2);
110-
//mBars[serial][2] = bar2; // All links pass through this for the CRU
111110
for (int linkId = 0; linkId < CRU_NUM_LINKS; linkId++) {
112111
links.push_back({ alfId, serial, linkId, bar2 });
113112
}
@@ -125,9 +124,9 @@ class ProgramAlf : public AliceO2::Common::Program
125124
alfServer.makeRpcServers(links);
126125
}
127126

128-
// main thread | Add/Remove/Update services
127+
// main thread
129128
while (!isSigInt()) {
130-
//alfServer.addRemoveUpdateServices();
129+
std::this_thread::sleep_for(std::chrono::seconds(1));
131130
}
132131
}
133132

apps/ProgramAlfClient.cxx

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,6 @@ class ProgramAlfClient : public AliceO2::Common::Program
101101
Alf::IcSequenceRpc icSequence(names.icSequence());
102102
Alf::IcGbtI2cWriteRpc icGbtI2cWriteRpc(names.icGbtI2cWrite());
103103

104-
/*Alf::PublishRegistersStartRpc publishRegistersStartRpc(names.publishRegistersStart());
105-
Alf::PublishRegistersStopRpc publishRegistersStopRpc(names.publishRegistersStop());
106-
107-
AliceO2::Common::GuardFunction publishStopper{
108-
[&]() {
109-
publishRegistersStopRpc.stop("TEST_PUB_REGS_SINGLE");
110-
publishRegistersStopRpc.stop("TEST_PUB_REGS_MULTI");
111-
}
112-
};*/
113-
114104
// Test register write and read
115105
uint32_t wAddress = 0x00f00078;
116106
uint32_t wValue = 0x4;
@@ -145,15 +135,6 @@ class ProgramAlfClient : public AliceO2::Common::Program
145135

146136
icGbtI2cWriteRpc.write(0x3);
147137

148-
// Test register publishing
149-
/*getLogger() << "Register publishing services RPC" << endm;
150-
publishRegistersStartRpc.publish("TEST_PUB_REGS_SINGLE", 1.0, { rAddress });
151-
publishRegistersStartRpc.publish("TEST_PUB_REGS_MULTI", 2.0, { rAddress, rAddress + 4, rAddress + 8 });
152-
153-
getLogger() << "Register publishing services subscription" << endm;
154-
Alf::PublishInfo publishRegistersInfoSingle(names.publishRegisters("TEST_PUB_REGS_SINGLE"));
155-
Alf::PublishInfo publishRegistersInfoMulti(names.publishRegisters("TEST_PUB_REGS_MULTI"));*/
156-
157138
getWarningLogger() << "See ya!" << endm;
158139
}
159140

src/AlfClient.h

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -198,120 +198,6 @@ class IcGbtI2cWriteRpc : DimRpcInfoWrapper
198198
}
199199
};
200200

201-
/* UNUSED FROM NOW ON */
202-
203-
// UNUSED
204-
class PublishRegistersStartRpc : DimRpcInfoWrapper
205-
{
206-
public:
207-
PublishRegistersStartRpc(const std::string& serviceName)
208-
: DimRpcInfoWrapper(serviceName)
209-
{
210-
}
211-
212-
std::string publish(std::string dnsName, double interval, std::vector<size_t> addresses)
213-
{
214-
std::ostringstream stream;
215-
stream << dnsName << argumentSeparator() << interval;
216-
for (size_t i = 0; i < addresses.size(); ++i) {
217-
stream << argumentSeparator() << addresses[i];
218-
}
219-
//getLogger() << stream.str() << endm;
220-
setString(stream.str());
221-
return getString();
222-
}
223-
};
224-
225-
// UNUSED
226-
class PublishRegistersStopRpc : DimRpcInfoWrapper
227-
{
228-
public:
229-
PublishRegistersStopRpc(const std::string& serviceName)
230-
: DimRpcInfoWrapper(serviceName)
231-
{
232-
}
233-
234-
void stop(std::string dnsName)
235-
{
236-
setString(dnsName);
237-
getString();
238-
}
239-
};
240-
241-
// UNUSED
242-
class PublishInfo : DimInfoWrapper //TODO: To be extended with overriden handler for REGS, SCA & SWT ?
243-
{
244-
public:
245-
PublishInfo(const std::string& serviceName)
246-
: DimInfoWrapper(serviceName)
247-
{
248-
}
249-
};
250-
251-
// UNUSED
252-
class PublishScaSequenceStartRpc : DimRpcInfoWrapper
253-
{
254-
public:
255-
PublishScaSequenceStartRpc(const std::string& serviceName)
256-
: DimRpcInfoWrapper(serviceName)
257-
{
258-
}
259-
260-
void publish(std::string dnsName, double interval, const std::vector<Sca::CommandData>& commandDataPairs)
261-
{
262-
std::ostringstream stream;
263-
stream << dnsName << argumentSeparator() << interval;
264-
for (size_t i = 0; i < commandDataPairs.size(); ++i) {
265-
stream << argumentSeparator() << commandDataPairs[i].command << pairSeparator() << commandDataPairs[i].data;
266-
}
267-
//printf("Publish SCA: %s\n", stream.str().c_str());
268-
setString(stream.str());
269-
getString();
270-
}
271-
};
272-
273-
// UNUSED
274-
class PublishScaSequenceStopRpc : DimRpcInfoWrapper
275-
{
276-
public:
277-
PublishScaSequenceStopRpc(const std::string& serviceName)
278-
: DimRpcInfoWrapper(serviceName)
279-
{
280-
}
281-
282-
void stop(std::string dnsName)
283-
{
284-
setString(dnsName);
285-
getString();
286-
}
287-
};
288-
289-
// UNUSED
290-
class PublishSwtSequenceStartRpc : DimRpcInfoWrapper
291-
{
292-
};
293-
294-
// UNUSED
295-
class PublishSwtSequenceStopRpc : DimRpcInfoWrapper
296-
{
297-
};
298-
299-
// UNUSED
300-
/*class ScaReadRpc: DimRpcInfoWrapper //TODO: Does this stay??
301-
{
302-
public:
303-
ScaReadRpc(const std::string& serviceName)
304-
: DimRpcInfoWrapper(serviceName)
305-
{
306-
}
307-
308-
std::string read()
309-
{
310-
setString("");
311-
return stripPrefix(getString());
312-
}
313-
};*/
314-
315201
} // namespace Alf
316202
} // namespace AliceO2
317203

0 commit comments

Comments
 (0)