Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Transport/PublisherInstance.cpp (1 of 28 files). Show all
Unified · Split
| @@ -57,16 +57,28 @@ void PublisherInstance::HandleErrorMessage(DataPublisher* source, const string& · 56 unmodified lines | |||
| 57 | instance->ErrorMessage(message); | 57 | instance->ErrorMessage(message); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | void PublisherInstance::HandleClientConnected(DataPublisher* source, const GSF::Guid& subscriberID, const std::string& connectionID) | 60 | void PublisherInstance::HandleClientConnected(DataPublisher* source, const SubscriberConnectionPtr& connection) |
| 61 | { | 61 | { |
| 62 | PublisherInstance* instance = static_cast<PublisherInstance*>(source->GetUserData()); | 62 | PublisherInstance* instance = static_cast<PublisherInstance*>(source->GetUserData()); |
| 63 | instance->ClientConnected(subscriberID, connectionID); | 63 | instance->ClientConnected(connection); |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | void PublisherInstance::HandleClientDisconnected(DataPublisher* source, const GSF::Guid& subscriberID, const std::string& connectionID) | 66 | void PublisherInstance::HandleClientDisconnected(DataPublisher* source, const SubscriberConnectionPtr& connection) |
| 67 | { | 67 | { |
| 68 | PublisherInstance* instance = static_cast<PublisherInstance*>(source->GetUserData()); | 68 | PublisherInstance* instance = static_cast<PublisherInstance*>(source->GetUserData()); |
| 69 | instance->ClientDisconnected(subscriberID, connectionID); | 69 | instance->ClientDisconnected(connection); |
| 70 | } | ||
| 71 | |||
| 72 | void PublisherInstance::HandleTemporalSubscriptionRequested(DataPublisher* source, const SubscriberConnectionPtr& connection) | ||
| 73 | { | ||
| 74 | PublisherInstance* instance = static_cast<PublisherInstance*>(source->GetUserData()); | ||
| 75 | instance->TemporalSubscriptionRequested(connection); | ||
| 76 | } | ||
| 77 | |||
| 78 | void PublisherInstance::HandleTemporalProcessingIntervalChangeRequested(DataPublisher* source, const SubscriberConnectionPtr& connection) | ||
| 79 | { | ||
| 80 | PublisherInstance* instance = static_cast<PublisherInstance*>(source->GetUserData()); | ||
| 81 | instance->TemporalProcessingIntervalChangeRequested(connection); | ||
| 70 | } | 82 | } |
| 71 | 83 | ||
| 72 | void PublisherInstance::StatusMessage(const string& message) | 84 | void PublisherInstance::StatusMessage(const string& message) |
| @@ -79,14 +91,24 @@ void PublisherInstance::ErrorMessage(const string& message) · 6 unmodified lines | |||
| 79 | cerr << message << endl << endl; | 91 | cerr << message << endl << endl; |
| 80 | } | 92 | } |
| 81 | 93 | ||
| 82 | void PublisherInstance::ClientConnected(const GSF::Guid& subscriberID, const string& connectionID) | 94 | void PublisherInstance::ClientConnected(const SubscriberConnectionPtr& connection) |
| 95 | { | ||
| 96 | cout << "Client \"" << connection->GetConnectionID() << "\" with subscriber ID " << ToString(connection->GetSubscriberID()) << " connected..." << endl << endl; | ||
| 97 | } | ||
| 98 | |||
| 99 | void PublisherInstance::ClientDisconnected(const SubscriberConnectionPtr& connection) | ||
| 100 | { | ||
| 101 | cout << "Client \"" << connection->GetConnectionID() << "\" with subscriber ID " << ToString(connection->GetSubscriberID()) << " disconnected..." << endl << endl; | ||
| 102 | } | ||
| 103 | |||
| 104 | void PublisherInstance::TemporalSubscriptionRequested(const SubscriberConnectionPtr& connection) | ||
| 83 | { | 105 | { |
| 84 | cout << "Client \"" << connectionID << "\" with subscriber ID " << ToString(subscriberID) << " connected..." << endl << endl; | 106 | cout << "Client \"" << connection->GetConnectionID() << "\" with subscriber ID " << ToString(connection->GetSubscriberID()) << " has requested a temporal subscription starting at " << ToString(connection->GetStartTimeConstraint()) << endl << endl; |
| 85 | } | 107 | } |
| 86 | 108 | ||
| 87 | void PublisherInstance::ClientDisconnected(const GSF::Guid& subscriberID, const std::string& connectionID) | 109 | void PublisherInstance::TemporalProcessingIntervalChangeRequested(const SubscriberConnectionPtr& connection) |
| 88 | { | 110 | { |
| 89 | cout << "Client \"" << connectionID << "\" with subscriber ID " << ToString(subscriberID) << " disconnected..." << endl << endl; | 111 | cout << "Client \"" << connection->GetConnectionID() << "\" with subscriber ID " << ToString(connection->GetSubscriberID()) << " has requested to change its temporal processing interval to " << ToString(connection->GetProcessingInterval()) << "ms" << endl << endl; |
| 90 | } | 112 | } |
| 91 | 113 | ||
| 92 | void PublisherInstance::Initialize() | 114 | void PublisherInstance::Initialize() |
| @@ -96,6 +118,8 @@ void PublisherInstance::Initialize() · 3 unmodified lines | |||
| 96 | m_publisher.RegisterErrorMessageCallback(&HandleErrorMessage); | 118 | m_publisher.RegisterErrorMessageCallback(&HandleErrorMessage); |
| 97 | m_publisher.RegisterClientConnectedCallback(&HandleClientConnected); | 119 | m_publisher.RegisterClientConnectedCallback(&HandleClientConnected); |
| 98 | m_publisher.RegisterClientDisconnectedCallback(&HandleClientDisconnected); | 120 | m_publisher.RegisterClientDisconnectedCallback(&HandleClientDisconnected); |
| 121 | m_publisher.RegisterTemporalSubscriptionRequestedCallback(&HandleTemporalSubscriptionRequested); | ||
| 122 | m_publisher.RegisterTemporalProcessingIntervalChangeRequestedCallback(&HandleTemporalProcessingIntervalChangeRequested); | ||
| 99 | 123 | ||
| 100 | m_initialized = true; | 124 | m_initialized = true; |
| 101 | } | 125 | } |