added cleanup strategy factory methods

2 files changed, 78 insertions, 0 deletions

diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 1fda2393cb5..a7249b52123 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -1142,6 +1142,33 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_deadline_message_queue (size_t
 
 template <ACE_SYNCH_DECL>
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> *
+ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_deadline_cleanup_message_queue (size_t hwm,
+                                                                                 size_t lwm,
+                                                                                 ACE_Notification_Strategy *ns,
+                                                                                 u_long static_bit_field_mask,
+                                                                                 u_long static_bit_field_shift,
+                                                                                 u_long pending_threshold,
+                                                                                 u_long dynamic_priority_max,
+                                                                                 u_long dynamic_priority_offset)
+{
+  ACE_Deadline_Cleanup_Message_Strategy *adcms;
+
+  ACE_NEW_RETURN (adcms,
+                  ACE_Deadline_Cleanup_Message_Strategy (static_bit_field_mask,
+                                                         static_bit_field_shift,
+                                                         pending_threshold,
+                                                         dynamic_priority_max,
+                                                         dynamic_priority_offset),
+                  0);
+
+  return new ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> (*adcms, hwm, lwm, ns);
+}
+  // factory method for a dynamically prioritized (by time to deadline) 
+  // ACE_Dynamic_Message_Queue, with automatic cleanup of beyond late messages
+
+
+template <ACE_SYNCH_DECL>
+ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> *
 ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_laxity_message_queue (size_t hwm,
                                                                        size_t lwm,
                                                                        ACE_Notification_Strategy *ns,
@@ -1167,4 +1194,30 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_laxity_message_queue (size_t hw
   // factory method for a dynamically prioritized (by laxity) ACE_Dynamic_Message_Queue
 
 
+template <ACE_SYNCH_DECL>
+ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> *
+ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_laxity_cleanup_message_queue (size_t hwm,
+                                                                               size_t lwm,
+                                                                               ACE_Notification_Strategy *ns,
+                                                                               u_long static_bit_field_mask,
+                                                                               u_long static_bit_field_shift,
+                                                                               u_long pending_threshold,
+                                                                               u_long dynamic_priority_max,
+                                                                               u_long dynamic_priority_offset)
+{
+  ACE_Laxity_Message_Strategy *alcms;
+
+  ACE_NEW_RETURN (alcms,
+                  ACE_Laxity_Cleanup_Message_Strategy (static_bit_field_mask,
+                                                       static_bit_field_shift,
+                                                       pending_threshold,
+                                                       dynamic_priority_max,
+                                                       dynamic_priority_offset),
+                  0);
+
+  return new ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> (*alcms, hwm, lwm, ns);
+}
+  // factory method for a dynamically prioritized (by laxity) 
+  // ACE_Dynamic_Message_Queue, with automatic cleanup of beyond late messages
+
 #endif /* ACE_MESSAGE_QUEUE_T_C */
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index df7f13d56de..1d140abb7e6 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -475,6 +475,19 @@ public:
   // factory method for a dynamically prioritized (by time to deadline) ACE_Dynamic_Message_Queue
 
   static ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> *
+    create_deadline_cleanup_message_queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM,
+                                           size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM,
+                                           ACE_Notification_Strategy * = 0,
+                                           u_long static_bit_field_mask = 0x3FFUL,        // 2^(10) - 1
+                                           u_long static_bit_field_shift = 10,            // 10 low order bits
+                                           u_long pending_threshold = 0x200000UL,         // 2^(22-1)
+                                           u_long dynamic_priority_max = 0x3FFFFFUL,      // 2^(22)-1
+                                           u_long dynamic_priority_offset =  0x200000UL); // 2^(22-1)
+  // factory method for a dynamically prioritized (by time to deadline) 
+  // ACE_Dynamic_Message_Queue, with automatic deletion of beyond late messages
+
+
+  static ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> *
     create_laxity_message_queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM,
                                  size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM,
                                  ACE_Notification_Strategy * = 0,
@@ -484,6 +497,18 @@ public:
                                  u_long dynamic_priority_max = 0x3FFFFFUL,      // 2^(22)-1
                                  u_long dynamic_priority_offset =  0x200000UL); // 2^(22-1)
   // factory method for a dynamically prioritized (by laxity) ACE_Dynamic_Message_Queue
+
+  static ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> *
+    create_laxity_cleanup_message_queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM,
+                                         size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM,
+                                         ACE_Notification_Strategy * = 0,
+                                         u_long static_bit_field_mask = 0x3FFUL,        // 2^(10) - 1
+                                         u_long static_bit_field_shift = 10,            // 10 low order bits
+                                         u_long pending_threshold = 0x200000UL,         // 2^(22-1)
+                                         u_long dynamic_priority_max = 0x3FFFFFUL,      // 2^(22)-1
+                                         u_long dynamic_priority_offset =  0x200000UL); // 2^(22-1)
+  // factory method for a dynamically prioritized (by laxity) 
+  // ACE_Dynamic_Message_Queue, with automatic deletion of beyond late messages
 };
 
 #if defined (__ACE_INLINE__)