registrar: Style cleanup to MessageDeliverer.

No functional change.
This commit is contained in:
Augustin Cavalier
2025-02-12 16:27:44 -05:00
parent 0d23e179a6
commit 0f4bfb43ed
+35 -38
View File
@@ -37,19 +37,17 @@ static const int32 kMaxMessagesPerPort = 10000;
static const int32 kMaxDataPerPort = 50 * 1024 * 1024; // 50 MB static const int32 kMaxDataPerPort = 50 * 1024 * 1024; // 50 MB
// MessagingTargetSet // #pragma mark - MessagingTargetSet
// destructor
MessagingTargetSet::~MessagingTargetSet() MessagingTargetSet::~MessagingTargetSet()
{ {
} }
// #pragma mark - // #pragma mark - DefaultMessagingTargetSet
// DefaultMessagingTargetSet
// constructor
DefaultMessagingTargetSet::DefaultMessagingTargetSet( DefaultMessagingTargetSet::DefaultMessagingTargetSet(
const messaging_target *targets, int32 targetCount) const messaging_target *targets, int32 targetCount)
: MessagingTargetSet(), : MessagingTargetSet(),
@@ -59,19 +57,19 @@ DefaultMessagingTargetSet::DefaultMessagingTargetSet(
{ {
} }
// destructor
DefaultMessagingTargetSet::~DefaultMessagingTargetSet() DefaultMessagingTargetSet::~DefaultMessagingTargetSet()
{ {
} }
// HasNext
bool bool
DefaultMessagingTargetSet::HasNext() const DefaultMessagingTargetSet::HasNext() const
{ {
return (fNextIndex < fTargetCount); return (fNextIndex < fTargetCount);
} }
// Next
bool bool
DefaultMessagingTargetSet::Next(port_id &port, int32 &token) DefaultMessagingTargetSet::Next(port_id &port, int32 &token)
{ {
@@ -85,7 +83,7 @@ DefaultMessagingTargetSet::Next(port_id &port, int32 &token)
return true; return true;
} }
// Rewind
void void
DefaultMessagingTargetSet::Rewind() DefaultMessagingTargetSet::Rewind()
{ {
@@ -93,11 +91,9 @@ DefaultMessagingTargetSet::Rewind()
} }
// #pragma mark - // #pragma mark - SingleMessagingTargetSet
// SingleMessagingTargetSet
// constructor
SingleMessagingTargetSet::SingleMessagingTargetSet(BMessenger target) SingleMessagingTargetSet::SingleMessagingTargetSet(BMessenger target)
: MessagingTargetSet(), : MessagingTargetSet(),
fAtBeginning(true) fAtBeginning(true)
@@ -108,7 +104,7 @@ SingleMessagingTargetSet::SingleMessagingTargetSet(BMessenger target)
? B_PREFERRED_TOKEN : messengerPrivate.Token()); ? B_PREFERRED_TOKEN : messengerPrivate.Token());
} }
// constructor
SingleMessagingTargetSet::SingleMessagingTargetSet(port_id port, int32 token) SingleMessagingTargetSet::SingleMessagingTargetSet(port_id port, int32 token)
: MessagingTargetSet(), : MessagingTargetSet(),
fPort(port), fPort(port),
@@ -117,19 +113,19 @@ SingleMessagingTargetSet::SingleMessagingTargetSet(port_id port, int32 token)
{ {
} }
// destructor
SingleMessagingTargetSet::~SingleMessagingTargetSet() SingleMessagingTargetSet::~SingleMessagingTargetSet()
{ {
} }
// HasNext
bool bool
SingleMessagingTargetSet::HasNext() const SingleMessagingTargetSet::HasNext() const
{ {
return fAtBeginning; return fAtBeginning;
} }
// Next
bool bool
SingleMessagingTargetSet::Next(port_id &port, int32 &token) SingleMessagingTargetSet::Next(port_id &port, int32 &token)
{ {
@@ -143,7 +139,7 @@ SingleMessagingTargetSet::Next(port_id &port, int32 &token)
return true; return true;
} }
// Rewind
void void
SingleMessagingTargetSet::Rewind() SingleMessagingTargetSet::Rewind()
{ {
@@ -151,9 +147,9 @@ SingleMessagingTargetSet::Rewind()
} }
// #pragma mark - // #pragma mark - MessageDeliverer
// Message
/*! \brief Encapsulates a message to be delivered. /*! \brief Encapsulates a message to be delivered.
Besides the flattened message it also stores the when the message was Besides the flattened message it also stores the when the message was
@@ -224,7 +220,7 @@ private:
bool fBusy; bool fBusy;
}; };
// TargetMessage
/*! \brief Encapsulates a Message to be sent to a specific handler. /*! \brief Encapsulates a Message to be sent to a specific handler.
A TargetMessage is always associated with (i.e. queued in) a TargetPort. A TargetMessage is always associated with (i.e. queued in) a TargetPort.
@@ -267,7 +263,7 @@ private:
int32 fToken; int32 fToken;
}; };
// TargetMessageHandle
/*! \brief A small wrapper for TargetMessage providing a complete order. /*! \brief A small wrapper for TargetMessage providing a complete order.
This class only exists to provide the comparison operators required to This class only exists to provide the comparison operators required to
@@ -324,7 +320,7 @@ private:
TargetMessage *fMessage; TargetMessage *fMessage;
}; };
// TargetPort
/*! \brief Represents a full target port, queuing the not yet delivered /*! \brief Represents a full target port, queuing the not yet delivered
messages. messages.
@@ -455,13 +451,14 @@ PRINT("MessageDeliverer::TargetPort::_EnforceLimits(): port: %" B_PRId32
set<TargetMessageHandle> fTimeoutableMessages; set<TargetMessageHandle> fTimeoutableMessages;
}; };
// TargetPortMap
struct MessageDeliverer::TargetPortMap : public map<port_id, TargetPort*> { struct MessageDeliverer::TargetPortMap : public map<port_id, TargetPort*> {
}; };
// #pragma mark - // #pragma mark -
/*! \class MessageDeliverer /*! \class MessageDeliverer
\brief Service for delivering messages, which retries the delivery as long \brief Service for delivering messages, which retries the delivery as long
as the target port is full. as the target port is full.
@@ -476,7 +473,7 @@ struct MessageDeliverer::TargetPortMap : public map<port_id, TargetPort*> {
the yet undelivered messages to the respective target ports. the yet undelivered messages to the respective target ports.
*/ */
// constructor
MessageDeliverer::MessageDeliverer() MessageDeliverer::MessageDeliverer()
: fLock("message deliverer"), : fLock("message deliverer"),
fTargetPorts(NULL), fTargetPorts(NULL),
@@ -485,7 +482,7 @@ MessageDeliverer::MessageDeliverer()
{ {
} }
// destructor
MessageDeliverer::~MessageDeliverer() MessageDeliverer::~MessageDeliverer()
{ {
fTerminating = true; fTerminating = true;
@@ -498,7 +495,7 @@ MessageDeliverer::~MessageDeliverer()
delete fTargetPorts; delete fTargetPorts;
} }
// Init
status_t status_t
MessageDeliverer::Init() MessageDeliverer::Init()
{ {
@@ -519,7 +516,7 @@ MessageDeliverer::Init()
return B_OK; return B_OK;
} }
// CreateDefault
status_t status_t
MessageDeliverer::CreateDefault() MessageDeliverer::CreateDefault()
{ {
@@ -542,7 +539,7 @@ MessageDeliverer::CreateDefault()
return B_OK; return B_OK;
} }
// DeleteDefault
void void
MessageDeliverer::DeleteDefault() MessageDeliverer::DeleteDefault()
{ {
@@ -552,14 +549,14 @@ MessageDeliverer::DeleteDefault()
} }
} }
// Default
MessageDeliverer * MessageDeliverer *
MessageDeliverer::Default() MessageDeliverer::Default()
{ {
return sDeliverer; return sDeliverer;
} }
// DeliverMessage
/*! \brief Delivers a message to the supplied target. /*! \brief Delivers a message to the supplied target.
The method tries to send the message right now (if there are not already The method tries to send the message right now (if there are not already
@@ -583,7 +580,7 @@ MessageDeliverer::DeliverMessage(BMessage *message, BMessenger target,
return DeliverMessage(message, set, timeout); return DeliverMessage(message, set, timeout);
} }
// DeliverMessage
/*! \brief Delivers a message to the supplied targets. /*! \brief Delivers a message to the supplied targets.
The method tries to send the message right now to each of the given targets The method tries to send the message right now to each of the given targets
@@ -603,7 +600,7 @@ status_t
MessageDeliverer::DeliverMessage(BMessage *message, MessagingTargetSet &targets, MessageDeliverer::DeliverMessage(BMessage *message, MessagingTargetSet &targets,
bigtime_t timeout) bigtime_t timeout)
{ {
if (!message) if (message == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
// flatten the message // flatten the message
@@ -616,7 +613,7 @@ MessageDeliverer::DeliverMessage(BMessage *message, MessagingTargetSet &targets,
timeout); timeout);
} }
// DeliverMessage
/*! \brief Delivers a flattened message to the supplied targets. /*! \brief Delivers a flattened message to the supplied targets.
The method tries to send the message right now to each of the given targets The method tries to send the message right now to each of the given targets
@@ -695,7 +692,7 @@ MessageDeliverer::DeliverMessage(const void *messageData, int32 messageSize,
return B_OK; return B_OK;
} }
// _GetTargetPort
MessageDeliverer::TargetPort * MessageDeliverer::TargetPort *
MessageDeliverer::_GetTargetPort(port_id portID, bool create) MessageDeliverer::_GetTargetPort(port_id portID, bool create)
{ {
@@ -716,7 +713,7 @@ MessageDeliverer::_GetTargetPort(port_id portID, bool create)
return port; return port;
} }
// _PutTargetPort
void void
MessageDeliverer::_PutTargetPort(TargetPort *port) MessageDeliverer::_PutTargetPort(TargetPort *port)
{ {
@@ -729,7 +726,7 @@ MessageDeliverer::_PutTargetPort(TargetPort *port)
} }
} }
// _SendMessage
status_t status_t
MessageDeliverer::_SendMessage(Message *message, port_id portID, int32 token) MessageDeliverer::_SendMessage(Message *message, port_id portID, int32 token)
{ {
@@ -740,14 +737,14 @@ MessageDeliverer::_SendMessage(Message *message, port_id portID, int32 token)
return error; return error;
} }
// _DelivererThreadEntry
int32 int32
MessageDeliverer::_DelivererThreadEntry(void *data) MessageDeliverer::_DelivererThreadEntry(void *data)
{ {
return ((MessageDeliverer*)data)->_DelivererThread(); return ((MessageDeliverer*)data)->_DelivererThread();
} }
// _DelivererThread
int32 int32
MessageDeliverer::_DelivererThread() MessageDeliverer::_DelivererThread()
{ {