foo

9 files changed, 42 insertions, 14 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index caa72aabed4..de221897aa3 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -201,14 +201,21 @@ need to do: <P>
 
 <LI> Add an environment variable called WRAPPER_ROOT that contains the
    name of the root of the directory where you keep the ACE wrapper
-   source tree.  For example, in my .login file I have the following
-   entry: <P>
+   source tree.  The ACE recursive Makefile scheme needs this information. 
+   There are several ways to set the WRAPPER_ROOT variable.  For
+     instance, in my .login file I have the following entry: <P>
 
 <pre><code>
 % setenv WRAPPER_ROOT /home/cs/faculty/schmidt/ACE_wrappers <P>
 </pre></code>
 
-   The ACE recursive Makefile system needs this information. <P>
+However, if you're building a number of versions of ACE (e.g., for
+different OS platforms or for different releases of ACE) you might use
+the following approach:
+
+<pre><code>
+% setenv WRAPPER_ROOT $cwd 
+</pre></code>
 
 <LI> Edit the $WRAPPER_ROOT/ace/OS.h file to update things like default
    hostname and port numbers you'd like the programs in the
diff --git a/ChangeLog-97a b/ChangeLog-97a
index 4a69e796872..b7076fe3bf2 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,3 +1,14 @@
+Thu Jan 16 17:03:47 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* ace/Timer_{Heap,List}.cpp: Added ACE_BUILD_DLL so that things
+ 	  will link.  Thanks to John Morey for reporting this.
+
+	* ace/Synch_T.h: Fixed: class ACE_Write_Guard: method:
+ 	  tryacquire_write so that it will call
+ 	  ...->lock_->tryacquire_write() and not
+ 	  ...->lock_->acquire_write().  Thanks to Alexandre Karev
+	  <Alexandre.Karev@cern.ch> for this fix.
+
 Thu Jan 16 15:51:16 1997  David L. Levine  <levine@cs.wustl.edu>
 
 	* Dump.cpp (register_object): initialized "slot" so that g++ doesn't
@@ -22,6 +33,12 @@ Thu Jan 16 15:51:16 1997  David L. Levine  <levine@cs.wustl.edu>
 
 Wed Jan 15 02:06:21 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
+	* ace/ACE.cpp (round_to_pagesize): If _SC_PAGESIZE is enabled then
+ 	  we set the ACE::pagesize_ variable using sysconf(2).  Thanks to
+ 	  James Mansion for this suggestion.
+
+Wed Jan 15 02:06:21 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
 	* ace/Timer_Queue.cpp (expire): Changed a line of code from
 	
 	  ACE_Timer_Queue_Iterator &iterator (this->iterator ());
@@ -59,8 +76,8 @@ Wed Jan 15 02:06:21 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
  	  ExitProcess() call, some process resources (e.g., file handles)
  	  are freed before the static variable destructors are
  	  called. This results in an application error when tracing is
- 	  enabled. Calling ACE_LOG_MSG->stop_tracing() before the
- 	  ExitProcess() does the job.  Thanks to Luca for this fix.
+ 	  enabled.  Removing the ACE_TRACE call in ~ACE_Event_Handler
+	  seems to fix this.  Thanks to Luca for this fix.
 
 	* ace/OS: Fixed the implementation of semaphores for the POSIX
  	  port (POSIX lacks semaphores).  The trick was to add a "waiters"
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index b09edd9e549..4ab28a442ee 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -632,6 +632,8 @@ ACE::round_to_pagesize (off_t len)
       SYSTEM_INFO sys_info;
       ::GetSystemInfo (&sys_info);
       ACE::pagesize_ = (size_t) sys_info.dwPageSize;
+#elif defined (_SC_PAGESIZE)
+      ACE::pagesize_ = (size_t) ::sysconf (_SC_PAGESIZE);
 #elif defined (ACE_HAS_GETPAGESIZE)
       ACE::pagesize_ = (size_t) ::getpagesize ();
 #else
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 2b9ec440911..ab65d8a562b 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -23,7 +23,7 @@ ACE_Event_Handler::ACE_Event_Handler (void)
 
 ACE_Event_Handler::~ACE_Event_Handler (void) 
 {
-  ACE_TRACE ("ACE_Event_Handler::~ACE_Event_Handler");
+  // ACE_TRACE ("ACE_Event_Handler::~ACE_Event_Handler");
 }
 
 // Gets the file descriptor associated with this I/O device. 
diff --git a/ace/OS.i b/ace/OS.i
index 4e11e47653c..7bf1bf6ad70 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -4597,12 +4597,6 @@ ACE_OS::exit (int status)
 {
   // ACE_TRACE ("ACE_OS::exit");
 #if defined (ACE_WIN32)
-  // In WIN32 when the process exits through an exit() call, some
-  // process resources (I think file handles) are freed before the
-  // static variable destructors are called. This results in an
-  // application error when tracing is enabled. Calling
-  // ACE_LOG_MSG->stop_tracing() before the exit() does the job.
-  ACE_LOG_MSG->stop_tracing ();
   ::ExitProcess ((UINT) status);
 #else
   ::exit (status);
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 5cf4d901f97..c07bf7502c7 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -373,7 +373,7 @@ public:
   int acquire (void) { return this->owner_ = this->lock_->acquire_write (); }
   // Explicitly acquire the write lock.
 
-  int tryacquire_write (void) { return this->owner_ = this->lock_->acquire_write (); }
+  int tryacquire_write (void) { return this->owner_ = this->lock_->tryacquire_write (); }
   // Conditionally acquire the write lock (i.e., won't block).
 
   int tryacquire (void) { return this->owner_ = this->lock_->tryacquire_write (); }
diff --git a/ace/Timer_Heap.cpp b/ace/Timer_Heap.cpp
index b176131af75..be8cb045264 100644
--- a/ace/Timer_Heap.cpp
+++ b/ace/Timer_Heap.cpp
@@ -1,3 +1,7 @@
+// Timer_Heap.cpp
+// $Id$
+
+#define ACE_BUILD_DLL
 #include "ace/Timer_Heap.h"
 
 ACE_Timer_Heap_Iterator::ACE_Timer_Heap_Iterator (ACE_Timer_Heap &heap)
diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h
index fc68b46db57..ad06579d2c0 100644
--- a/ace/Timer_Heap.h
+++ b/ace/Timer_Heap.h
@@ -46,7 +46,7 @@ protected:
   // Pointer to the <ACE_Timer_Heap> that we are iterating over.
 };
 
-class ACE_Timer_Heap : public ACE_Timer_Queue
+class ACE_Export ACE_Timer_Heap : public ACE_Timer_Queue
   // = TITLE 
   //      Provides a very fast and predictable timer implementation.
   //
diff --git a/ace/Timer_List.cpp b/ace/Timer_List.cpp
index 02b06518f9d..8f7c20fa9e2 100644
--- a/ace/Timer_List.cpp
+++ b/ace/Timer_List.cpp
@@ -1,3 +1,7 @@
+// Timer_List.cpp
+// $Id$
+
+#define ACE_BUILD_DLL
 #include "ace/Timer_List.h"
 
 ACE_Timer_List_Iterator::ACE_Timer_List_Iterator (ACE_Timer_List &list)