*** empty log message ***

9 files changed, 236 insertions, 3 deletions

diff --git a/ChangeLog-97b b/ChangeLog-97b
index 7c44bfc4373..253f1697576 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,20 @@
+Sun Oct 12 16:16:15 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
+
+	* tests: Addes a new test Priority_Reactor_Test.
+	  
+	* ace/Timer_Queue_Adapters.{h,i}: Added or moved the line that
+	  instructs edit mode to use on emace to the first line.  Also
+	  added ACE_Export to classes in this file.
+	  
+	* ace/Timer_Queue_Adapters.cpp: Added proper inclusion of the
+	  header file.  Corrected a syntax error.
+
+	* examples/Timer_Queue/Timer_Queue.dsw:  Added a new project
+	  Thread_Timer_Queue_Test.dsp. 
+	
+	* tests/run_tests.{bat,sh}: Added MT_SOCK_Test and
+ 	  Priority_Reactor_Test into one-buttoned test set.
+
 Sun Oct 12 16:53:32 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
 	* ace/examples/Service_Configurator/IPC-tests/server: Reformatted
@@ -49,6 +66,9 @@ Sun Oct 12 16:45:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
 
 Sun Oct 12 03:35:37 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
 
+	* examples/Timer_Queue: Added a new directory for testing of
+	  various usages of timer queue.
+	
 	* ace/ACE.cpp (register_stdin_handler): Must register the reactor
 	  we are using to the event handler.
 	  (read_adapter): Must notify the reactor when we are done with
diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp
index 1d8edc37f16..09e4c8e4eb6 100644
--- a/ace/Timer_Queue_Adapters.cpp
+++ b/ace/Timer_Queue_Adapters.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/Timer_Queue_Adapters.cpp"
+
 #if !defined (ACE_TIMER_QUEUE_ADAPTERS_C)
 #define ACE_TIMER_QUEUE_ADAPTERS_C
 
@@ -135,7 +137,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::schedule
     (ACE_Event_Handler* handler,
      const void *act,
      const ACE_Time_Value &delay,
-     const ACE_Time_Value &interval = ACE_Time_Value::zero)
+     const ACE_Time_Value &interval)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
diff --git a/ace/Timer_Queue_Adapters.i b/ace/Timer_Queue_Adapters.i
index bc2cceecc25..6ff933b5836 100644
--- a/ace/Timer_Queue_Adapters.i
+++ b/ace/Timer_Queue_Adapters.i
@@ -1,7 +1,7 @@
-// $Id$
-
 /* -*- C++ -*- */
 
+// $Id$
+
 template<class TQ> ACE_INLINE
 ACE_Thread_Timer_Queue_Adapter<TQ>::ACE_Thread_Timer_Queue_Adapter (void)
   : ACE_Task_Base (ACE_Thread_Manager::instance ()),
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp b/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
new file mode 100644
index 00000000000..69508b307b1
--- /dev/null
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
@@ -0,0 +1,92 @@
+# Microsoft Developer Studio Project File - Name="Thread_Timer_Queue_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Thread_Timer_Queue_Test - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Thread_Timer_Queue_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Thread_Timer_Queue_Test.mak"\

+ CFG="Thread_Timer_Queue_Test - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Timer_Queue_Test - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Thread_Timer_Queue_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Thread_Timer_Queue_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace\\"

+

+!ELSEIF  "$(CFG)" == "Thread_Timer_Queue_Test - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace\\"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Timer_Queue_Test - Win32 Release"

+# Name "Thread_Timer_Queue_Test - Win32 Debug"

+# Begin Source File

+

+SOURCE=.\Thread_Timer_Queue_Test.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/examples/Timer_Queue/Timer_Queue.dsw b/examples/Timer_Queue/Timer_Queue.dsw
index 02a6a64f866..e6ebf888b65 100644
--- a/examples/Timer_Queue/Timer_Queue.dsw
+++ b/examples/Timer_Queue/Timer_Queue.dsw
@@ -15,6 +15,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Thread_Timer_Queue_Test"=.\Thread_Timer_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Global:

 

 Package=<5>

diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp
new file mode 100644
index 00000000000..5fe222aaa9c
--- /dev/null
+++ b/tests/Priority_Reactor_Test.dsp
@@ -0,0 +1,91 @@
+# Microsoft Developer Studio Project File - Name="Priority_Reactor_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Priority_Reactor_Test - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Priority_Reactor_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Priority_Reactor_Test.mak"\

+ CFG="Priority_Reactor_Test - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Priority_Reactor_Test - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Priority_Reactor_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Priority_Reactor_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+

+!ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Priority"

+# PROP BASE Intermediate_Dir "Priority"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Priority_Reactor_Test - Win32 Release"

+# Name "Priority_Reactor_Test - Win32 Debug"

+# Begin Source File

+

+SOURCE=.\Priority_Reactor_Test.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/tests/run_tests.bat b/tests/run_tests.bat
index 1859a026c57..6a9f6e7e860 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -20,10 +20,12 @@ call run_tests Message_Block_Test
 call run_tests Message_Queue_Notifications_Test
 call run_tests Message_Queue_Test
 call run_tests MM_Shared_Memory_Test
+call run_tests MT_SOCK_Test
 call run_tests Mutex_Test
 call run_tests Naming_Test
 call run_tests Pipe_Test
 call run_tests Priority_Buffer_Test
+call run_tests Priority_Reactor_Test
 call run_tests Priority_Task_Test
 call run_tests Process_Mutex_Test
 call run_tests Process_Strategy_Test
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 4654042a552..8379a8c9e64 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -59,8 +59,10 @@ run Reactor_Exceptions_Test	        # uses Reactor and C++ exceptions
 run Reactor_Notify_Test		        # uses Reactor's notify() method, Task
 run Reactor_Timer_Test		        # uses Event_Handler, Reactor
 run Reader_Writer_Test		        # uses Thread_Manager, Mutex
+run Priority_Reactor_Test               # uses Priority_Reactor, Acceptor/Connector...
 run SOCK_Test			        # uses Thread_Manager, SOCK_SAP
 run Conn_Test			        # uses Thread_Manager, Acceptor/Connector, SOCK_SAP
+run MT_SOCK_Test                        # uses Thread_Manager, Acceptor/Connector
 
 # ifdef ACE_HAS_STREAM_PIPES
 run SPIPE_Test			        # uses SPIPE_Acceptor/Connector, Thread_Manager
diff --git a/tests/tests.dsw b/tests/tests.dsw
index 77bc39ca89b..90c9c78a4f3 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -243,6 +243,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Priority_Reactor_Test"=.\Priority_Reactor_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>

 

 Package=<5>