History

TimeSeriesPlatformLibrary: (1) Improved operation of SubscriberInstance, (2) Updated function signatures for DataSubscriber to always include subscriber reference since callbacks require a static function, this allows "instance" implementations to have access to source subscriber.

J. Ritchie Carroll committed 8 years ago

Commit ddde4ba1 parent 24ecf3a7 files · +336 −230Browse files

Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Samples/AdvancedSubscribe.cpp (1 of 7 files). Show all

Unified · Split

Source/Libraries/TimeSeriesPlatformLibrary/Samples/AdvancedSubscribe.cpp+6−6
@@ -41,9 +41,9 @@ tst::SubscriptionInfo CreateSubscriptionInfo(); · 40 unmodified lines
4141
4242 // Handlers for subscriber callbacks.
4343 void Resubscribe(tst::DataSubscriber* source);
44−void ProcessMeasurements(std::vector<gsfts::Measurement> newMeasurements);
45−void DisplayStatusMessage(std::string message);
46−void DisplayErrorMessage(std::string message);
44+void ProcessMeasurements(tst::DataSubscriber* source, std::vector<gsfts::Measurement> newMeasurements);
45+void DisplayStatusMessage(tst::DataSubscriber* source, std::string message);
46+void DisplayErrorMessage(tst::DataSubscriber* source, std::string message);
4747
4848 // Runs the subscriber.
4949 void RunSubscriber(std::string hostname, gsfts::uint16_t port);
@@ -182,7 +182,7 @@ tst::SubscriberConnector CreateSubscriberConnector(std::string hostname, gsfts:: · 132 unmodified lines
182182
183183 // Callback which is called when the subscriber has
184184 // received a new packet of measurements from the publisher.
185−void ProcessMeasurements(std::vector<gsfts::Measurement> newMeasurements)
185+void ProcessMeasurements(tst::DataSubscriber* source, std::vector<gsfts::Measurement> newMeasurements)
186186 {
187187 const std::string TimestampFormat = "%Y-%m-%d %H:%M:%S.%f";
188188 const std::size_t MaxTimestampSize = 80;
@@ -223,13 +223,13 @@ void Resubscribe(tst::DataSubscriber* source) · 34 unmodified lines
223223 }
224224
225225 // Callback which is called to display status messages from the subscriber.
226−void DisplayStatusMessage(std::string message)
226+void DisplayStatusMessage(tst::DataSubscriber* source, std::string message)
227227 {
228228 std::cout << message << std::endl << std::endl;
229229 }
230230
231231 // Callback which is called to display error messages from the connector and subscriber.
232−void DisplayErrorMessage(std::string message)
232+void DisplayErrorMessage(tst::DataSubscriber* source, std::string message)
233233 {
234234 std::cerr << message << std::endl << std::endl;
235235 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t