summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLogs/ChangeLog-02a9
-rw-r--r--ChangeLogs/ChangeLog-03a9
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/README3
-rw-r--r--THANKS4
-rw-r--r--ace/Acceptor.cpp14
-rw-r--r--ace/Base_Thread_Adapter.cpp12
-rw-r--r--ace/Base_Thread_Adapter.h2
-rw-r--r--ace/Base_Thread_Adapter.inl3
-rw-r--r--ace/Refcounted_Auto_Ptr.h6
-rw-r--r--ace/Refcounted_Auto_Ptr.i13
-rw-r--r--tests/Refcounted_Auto_Ptr_Test.cpp6
14 files changed, 74 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b3581bd238..9706a4ed982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Nov 23 08:40:33 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * tests/Refcounted_Auto_Ptr_Test.cpp: Added some ACE_DEBUGs to
+ print out the reference count.
+
+ * ace/Refcounted_Auto_Ptr.h: Added a count() accessor method to
+ return the reference count. Thanks to Andrea Bernicchia
+ <a.bernicchia@acsys.it> for contributing this.
+
Thu Nov 22 05:24:51 2001 Craig Rodrigues <crodrigu@bbn.com>
* examples/QOS/Diffserv: Added a simple example to illustrate
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5b3581bd238..9706a4ed982 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Fri Nov 23 08:40:33 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * tests/Refcounted_Auto_Ptr_Test.cpp: Added some ACE_DEBUGs to
+ print out the reference count.
+
+ * ace/Refcounted_Auto_Ptr.h: Added a count() accessor method to
+ return the reference count. Thanks to Andrea Bernicchia
+ <a.bernicchia@acsys.it> for contributing this.
+
Thu Nov 22 05:24:51 2001 Craig Rodrigues <crodrigu@bbn.com>
* examples/QOS/Diffserv: Added a simple example to illustrate
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5b3581bd238..9706a4ed982 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Fri Nov 23 08:40:33 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * tests/Refcounted_Auto_Ptr_Test.cpp: Added some ACE_DEBUGs to
+ print out the reference count.
+
+ * ace/Refcounted_Auto_Ptr.h: Added a count() accessor method to
+ return the reference count. Thanks to Andrea Bernicchia
+ <a.bernicchia@acsys.it> for contributing this.
+
Thu Nov 22 05:24:51 2001 Craig Rodrigues <crodrigu@bbn.com>
* examples/QOS/Diffserv: Added a simple example to illustrate
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f25e5f93b7b..d42e47bced7 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Nov 23 10:34:39 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * performance-tests/RTCorba/Oneways/Reliable/client.cpp (main):
+ Missed one of the transformations from "OBJECT" to
+ "OBJECT_LEVEL". Thanks to Craig for reporting this.
+
Thu Nov 22 04:01:13 2001 Craig Rodrigues <crodrigu@bbn.com>
Fixes and new test supplied by Yamuna Krishnamurthy <yamuna@cs.wustl.edu>:
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index a1520f73cc6..d107eaba1e4 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -50,7 +50,7 @@ static const char *ior = "file://test.ior";
enum LEVEL {ORB_LEVEL, THREAD_LEVEL, OBJECT_LEVEL};
// Default is OBJECT level.
-static LEVEL level = OBJECT;
+static LEVEL level = OBJECT_LEVEL;
// Default iterations.
static CORBA::ULong iterations = 100;
diff --git a/TAO/tests/Xt_Stopwatch/README b/TAO/tests/Xt_Stopwatch/README
index 0e132991ce5..3bbd0f6f22c 100644
--- a/TAO/tests/Xt_Stopwatch/README
+++ b/TAO/tests/Xt_Stopwatch/README
@@ -20,13 +20,14 @@ X11.
---------------------------------------------------------------------
Technical Description:
+
In addition to specifying the resources that the ORB needs to allocate
for an Xt event loop, the ORB also needs the information about the
XtAppContext in which the user application is initialised. To provide
these information TAO provides a class by name
"TAO_XT_Resource_Factory" that inherits from the
TAO_Default_Resource_factory. This provides the user with a static
-method through which he can set the XtAppContext.
+method through which he can set the XtAppContext.
To make TAO understand that the user is in fact wants to use the
TAO_XT_Resource_Factory and not the default resource factory, the
diff --git a/THANKS b/THANKS
index 0ccf93a3ab9..28c00e3e2f4 100644
--- a/THANKS
+++ b/THANKS
@@ -586,7 +586,7 @@ Frank Buschmann <Frank.Buschmann@mchp.siemens.de>
Eric Eide <eeide@cs.utah.edu>
Don Busch <busch_d@ociweb.com>
Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
-David Hauck <davidh@realtimeint.com>
+David Hauck <davidh@netacquire.com>
Joe Hoffert <joeh@tango.cs.wustl.edu>
Keith Rohrer <KRohrer@hnv.com>
Tim Rose <trose@bridgewatersys.com>
@@ -1371,7 +1371,7 @@ David Yongqiang Wang <davidyw@avaya.com>
Andrew Foster <awf@prismtechnologies.com>
C Chan <CChan@md.aacisd.com>
Alexey Chalimov <alexey@allcharge.com>
-David Hauck <davidh@netacquire.com>
+Andrea Bernicchia <a.bernicchia@acsys.it>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 1e279feef43..2d9cad5e54f 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -250,7 +250,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&
-1);
// Set the reactor of the newly created <SVC_HANDLER> to the same
- // reactor that this <Acceptor> is using.
+ // reactor that this <ACE_Acceptor> is using.
if (this->reactor ())
sh->reactor (this->reactor ());
@@ -274,12 +274,12 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
// associations.
int reset_new_handle = this->reactor ()->uses_event_associations ();
- if (this->peer_acceptor_.accept (svc_handler->peer (), // stream
- 0, // remote address
- 0, // timeout
- 1, // restart
- reset_new_handle // reset new handler
- ) == -1)
+ if (this->acceptor ().accept (svc_handler->peer (), // stream
+ 0, // remote address
+ 0, // timeout
+ 1, // restart
+ reset_new_handle // reset new handler
+ ) == -1)
{
// Close down handler to avoid memory leaks.
svc_handler->close (0);
diff --git a/ace/Base_Thread_Adapter.cpp b/ace/Base_Thread_Adapter.cpp
index 2f8efd4e58f..b0ceffe5cd9 100644
--- a/ace/Base_Thread_Adapter.cpp
+++ b/ace/Base_Thread_Adapter.cpp
@@ -59,27 +59,21 @@ void
ACE_Base_Thread_Adapter::close_log_msg (void)
{
if (ACE_Base_Thread_Adapter::close_log_msg_hook_ != 0)
- {
- (*ACE_Base_Thread_Adapter::close_log_msg_hook_) ();
- }
+ (*ACE_Base_Thread_Adapter::close_log_msg_hook_) ();
}
void
ACE_Base_Thread_Adapter::sync_log_msg (const ACE_TCHAR *prg)
{
if (ACE_Base_Thread_Adapter::sync_log_msg_hook_ != 0)
- {
- (*ACE_Base_Thread_Adapter::sync_log_msg_hook_) (prg);
- }
+ (*ACE_Base_Thread_Adapter::sync_log_msg_hook_) (prg);
}
ACE_OS_Thread_Descriptor *
ACE_Base_Thread_Adapter::thr_desc_log_msg (void)
{
if (ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_ != 0)
- {
- return (*ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_) ();
- }
+ return (*ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_) ();
return 0;
}
diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h
index dfa6cde0071..a57351545bc 100644
--- a/ace/Base_Thread_Adapter.h
+++ b/ace/Base_Thread_Adapter.h
@@ -1,4 +1,3 @@
-
//=============================================================================
/**
* @file Base_Thread_Adapter.h
@@ -9,7 +8,6 @@
*/
//=============================================================================
-
#ifndef ACE_BASE_THREAD_ADAPTER_H
#define ACE_BASE_THREAD_ADAPTER_H
#include "ace/pre.h"
diff --git a/ace/Base_Thread_Adapter.inl b/ace/Base_Thread_Adapter.inl
index 01187486eca..1d0d6ba7a49 100644
--- a/ace/Base_Thread_Adapter.inl
+++ b/ace/Base_Thread_Adapter.inl
@@ -6,7 +6,6 @@ ACE_OS_Thread_Descriptor::flags (void) const
return flags_;
}
-
ACE_INLINE
ACE_OS_Thread_Descriptor::ACE_OS_Thread_Descriptor (long flags)
: flags_ (flags)
@@ -25,7 +24,7 @@ ACE_Base_Thread_Adapter::set_log_msg_hooks (
ACE_Base_Thread_Adapter::inherit_log_msg_hook_ = inherit_hook;
ACE_Base_Thread_Adapter::close_log_msg_hook_ = close_hook;
ACE_Base_Thread_Adapter::sync_log_msg_hook_ = sync_hook;
- ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_ = thr_desc_hook;
+ ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_ = thr_desc_hook;
}
ACE_INLINE ACE_THR_C_FUNC
diff --git a/ace/Refcounted_Auto_Ptr.h b/ace/Refcounted_Auto_Ptr.h
index f28fdc2cbfb..bb1ce9f9af4 100644
--- a/ace/Refcounted_Auto_Ptr.h
+++ b/ace/Refcounted_Auto_Ptr.h
@@ -86,6 +86,9 @@ public:
/// Get the pointer value.
X *get (void);
+ /// Get the reference count value.
+ int count (void) const;
+
// = Utility method.
/// Allows us to check for NULL on all ACE_Refcounted_Auto_Ptr objects.
@@ -126,6 +129,9 @@ private:
/// Get the pointer value.
X *get (void);
+ /// Get the reference count value.
+ int count (void) const;
+
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
diff --git a/ace/Refcounted_Auto_Ptr.i b/ace/Refcounted_Auto_Ptr.i
index 90baf4dac92..8fe557b3dde 100644
--- a/ace/Refcounted_Auto_Ptr.i
+++ b/ace/Refcounted_Auto_Ptr.i
@@ -6,6 +6,19 @@
#include "Synch_T.h"
template <class X, class ACE_LOCK> inline int
+ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::count (void) const
+{
+ ACE_GUARD_RETURN (ACE_LOCK, guard, ACE_const_cast (ACE_LOCK &, this->lock_), 0);
+ return this->ref_count_;
+}
+
+template <class X, class ACE_LOCK> inline int
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::count (void) const
+{
+ return this->rep_->count ();
+}
+
+template <class X, class ACE_LOCK> inline int
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::null (void) const
{
ACE_GUARD_RETURN (ACE_LOCK, guard,
diff --git a/tests/Refcounted_Auto_Ptr_Test.cpp b/tests/Refcounted_Auto_Ptr_Test.cpp
index b15146df817..70ed84245c7 100644
--- a/tests/Refcounted_Auto_Ptr_Test.cpp
+++ b/tests/Refcounted_Auto_Ptr_Test.cpp
@@ -140,12 +140,18 @@ Method_Request_print::Method_Request_print (Scheduler *new_scheduler,
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%t) Method_Request_print created\n")));
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%t) Printer reference count: %d\n"),
+ printer_.count ()));
}
Method_Request_print::~Method_Request_print (void)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%t) Method_Request_print will be deleted.\n")));
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%t) Printer reference count: %d\n"),
+ printer_.count ()));
}
int
View Lorry Controller Status