summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ace/Shared_Memory_MM.i2
-rw-r--r--examples/Reactor/Misc/Misc.mak171
-rw-r--r--examples/Reactor/Misc/Misc.mdpbin0 -> 39424 bytes
-rw-r--r--examples/Reactor/Misc/test_timer_queue.cpp3
-rw-r--r--examples/Reactor/Proactor/test_proactor.mak21
-rw-r--r--examples/Reactor/Proactor/test_proactor.mdpbin54784 -> 51200 bytes
-rw-r--r--examples/Reactor/Proactor/test_timeout.cpp4
-rw-r--r--tests/Timer_Queue_Test.cpp11
8 files changed, 197 insertions, 15 deletions
diff --git a/ace/Shared_Memory_MM.i b/ace/Shared_Memory_MM.i
index ab00abbb61c..067a8fb693d 100644
--- a/ace/Shared_Memory_MM.i
+++ b/ace/Shared_Memory_MM.i
@@ -6,7 +6,7 @@
// Return the name of file that is mapped (if any).
ACE_INLINE const TCHAR *
-ACE_Shared_Memory_MM::filename (void) const;
+ACE_Shared_Memory_MM::filename (void) const
{
return this->shared_memory_.filename ();
}
diff --git a/examples/Reactor/Misc/Misc.mak b/examples/Reactor/Misc/Misc.mak
new file mode 100644
index 00000000000..063f0ecbe6b
--- /dev/null
+++ b/examples/Reactor/Misc/Misc.mak
@@ -0,0 +1,171 @@
+# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+!IF "$(CFG)" == ""
+CFG=timer_queue - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to timer_queue - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "timer_queue - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE on this makefile
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "Misc.mak" CFG="timer_queue - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "timer_queue - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+################################################################################
+# Begin Project
+CPP=cl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "timer_queue\Debug"
+# PROP BASE Intermediate_Dir "timer_queue\Debug"
+# PROP BASE Target_Dir "timer_queue"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "."
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir "timer_queue"
+OUTDIR=.\.
+INTDIR=.\Debug
+
+ALL : "$(OUTDIR)\timer_queue.exe"
+
+CLEAN :
+ -@erase "$(INTDIR)\test_timer_queue.obj"
+ -@erase "$(INTDIR)\vc40.idb"
+ -@erase "$(INTDIR)\vc40.pdb"
+ -@erase "$(OUTDIR)\timer_queue.exe"
+ -@erase "$(OUTDIR)\timer_queue.ilk"
+ -@erase "$(OUTDIR)\timer_queue.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+"$(INTDIR)" :
+ if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
+
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/timer_queue.bsc"
+BSC32_SBRS= \
+
+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
+# 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 /debug /machine:I386
+LINK32_FLAGS=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 /incremental:yes\
+ /pdb:"$(OUTDIR)/timer_queue.pdb" /debug /machine:I386\
+ /out:"$(OUTDIR)/timer_queue.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\test_timer_queue.obj"
+
+"$(OUTDIR)\timer_queue.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
+ /Fp"$(INTDIR)/timer_queue.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
+CPP_OBJS=.\Debug/
+CPP_SBRS=.\.
+
+.c{$(CPP_OBJS)}.obj:
+ $(CPP) $(CPP_PROJ) $<
+
+.cpp{$(CPP_OBJS)}.obj:
+ $(CPP) $(CPP_PROJ) $<
+
+.cxx{$(CPP_OBJS)}.obj:
+ $(CPP) $(CPP_PROJ) $<
+
+.c{$(CPP_SBRS)}.sbr:
+ $(CPP) $(CPP_PROJ) $<
+
+.cpp{$(CPP_SBRS)}.sbr:
+ $(CPP) $(CPP_PROJ) $<
+
+.cxx{$(CPP_SBRS)}.sbr:
+ $(CPP) $(CPP_PROJ) $<
+
+################################################################################
+# Begin Target
+
+# Name "timer_queue - Win32 Debug"
+################################################################################
+# Begin Source File
+
+SOURCE=.\test_timer_queue.cpp
+DEP_CPP_TEST_=\
+ {$(INCLUDE)}"\ace\ACE.h"\
+ {$(INCLUDE)}"\ace\ACE.i"\
+ {$(INCLUDE)}"\ace\config-win32-common.h"\
+ {$(INCLUDE)}"\ace\config.h"\
+ {$(INCLUDE)}"\ace\Event_Handler.h"\
+ {$(INCLUDE)}"\ace\Event_Handler.i"\
+ {$(INCLUDE)}"\ace\Log_Msg.h"\
+ {$(INCLUDE)}"\ace\Log_Priority.h"\
+ {$(INCLUDE)}"\ace\Log_Record.h"\
+ {$(INCLUDE)}"\ace\Log_Record.i"\
+ {$(INCLUDE)}"\ace\OS.h"\
+ {$(INCLUDE)}"\ace\OS.i"\
+ {$(INCLUDE)}"\ace\Set.cpp"\
+ {$(INCLUDE)}"\ace\Set.h"\
+ {$(INCLUDE)}"\ace\Set.i"\
+ {$(INCLUDE)}"\ace\SString.h"\
+ {$(INCLUDE)}"\ace\SString.i"\
+ {$(INCLUDE)}"\ace\stdcpp.h"\
+ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\
+ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\
+ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\
+ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
+ {$(INCLUDE)}"\ace\Synch.h"\
+ {$(INCLUDE)}"\ace\Synch.i"\
+ {$(INCLUDE)}"\ace\Synch_T.cpp"\
+ {$(INCLUDE)}"\ace\Synch_T.h"\
+ {$(INCLUDE)}"\ace\Synch_T.i"\
+ {$(INCLUDE)}"\ace\Thread.h"\
+ {$(INCLUDE)}"\ace\Thread.i"\
+ {$(INCLUDE)}"\ace\Time_Value.h"\
+ {$(INCLUDE)}"\ace\Timer_Heap.cpp"\
+ {$(INCLUDE)}"\ace\Timer_Heap.h"\
+ {$(INCLUDE)}"\ace\Timer_List.cpp"\
+ {$(INCLUDE)}"\ace\Timer_List.h"\
+ {$(INCLUDE)}"\ace\Timer_Queue.cpp"\
+ {$(INCLUDE)}"\ace\Timer_Queue.h"\
+ {$(INCLUDE)}"\ace\Timer_Queue.i"\
+ {$(INCLUDE)}"\ace\Timers.h"\
+ {$(INCLUDE)}"\ace\Timers.i"\
+ {$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\ws2tcpip.h"\
+
+
+"$(INTDIR)\test_timer_queue.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
+
+
+# End Source File
+# End Target
+# End Project
+################################################################################
diff --git a/examples/Reactor/Misc/Misc.mdp b/examples/Reactor/Misc/Misc.mdp
new file mode 100644
index 00000000000..542188acff0
--- /dev/null
+++ b/examples/Reactor/Misc/Misc.mdp
Binary files differ
diff --git a/examples/Reactor/Misc/test_timer_queue.cpp b/examples/Reactor/Misc/test_timer_queue.cpp
index d31ae9d6874..b6ebf9364c9 100644
--- a/examples/Reactor/Misc/test_timer_queue.cpp
+++ b/examples/Reactor/Misc/test_timer_queue.cpp
@@ -1,7 +1,6 @@
// $Id$
-#include "ace/Timer_Heap.h"
-#include "ace/Timer_List.h"
+#include "ace/Timers.h"
class Example_Handler : public ACE_Event_Handler
{
diff --git a/examples/Reactor/Proactor/test_proactor.mak b/examples/Reactor/Proactor/test_proactor.mak
index ee0650f7bdb..b13926872b1 100644
--- a/examples/Reactor/Proactor/test_proactor.mak
+++ b/examples/Reactor/Proactor/test_proactor.mak
@@ -66,8 +66,6 @@ CLEAN :
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/test_proactor.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -127,8 +125,6 @@ CLEAN :
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/test_timeout.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -157,6 +153,9 @@ LINK32_OBJS= \
!ENDIF
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
+ /Fp"$(INTDIR)/test_proactor.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
+
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
@@ -285,8 +284,15 @@ DEP_CPP_TEST_=\
{$(INCLUDE)}"\ace\Thread_Manager.h"\
{$(INCLUDE)}"\ace\Thread_Manager.i"\
{$(INCLUDE)}"\ace\Time_Value.h"\
+ {$(INCLUDE)}"\ace\Timer_Heap.cpp"\
+ {$(INCLUDE)}"\ace\Timer_Heap.h"\
+ {$(INCLUDE)}"\ace\Timer_List.cpp"\
+ {$(INCLUDE)}"\ace\Timer_List.h"\
+ {$(INCLUDE)}"\ace\Timer_Queue.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue.i"\
+ {$(INCLUDE)}"\ace\Timers.h"\
+ {$(INCLUDE)}"\ace\Timers.i"\
{$(INCLUDE)}"\ace\Token.h"\
{$(INCLUDE)}"\ace\Token.i"\
{$(INCLUDE)}"\ace\Trace.h"\
@@ -410,8 +416,15 @@ DEP_CPP_TEST_T=\
{$(INCLUDE)}"\ace\Thread_Manager.h"\
{$(INCLUDE)}"\ace\Thread_Manager.i"\
{$(INCLUDE)}"\ace\Time_Value.h"\
+ {$(INCLUDE)}"\ace\Timer_Heap.cpp"\
+ {$(INCLUDE)}"\ace\Timer_Heap.h"\
+ {$(INCLUDE)}"\ace\Timer_List.cpp"\
+ {$(INCLUDE)}"\ace\Timer_List.h"\
+ {$(INCLUDE)}"\ace\Timer_Queue.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue.i"\
+ {$(INCLUDE)}"\ace\Timers.h"\
+ {$(INCLUDE)}"\ace\Timers.i"\
{$(INCLUDE)}"\ace\Token.h"\
{$(INCLUDE)}"\ace\Token.i"\
{$(INCLUDE)}"\ace\Trace.h"\
diff --git a/examples/Reactor/Proactor/test_proactor.mdp b/examples/Reactor/Proactor/test_proactor.mdp
index 14d0497de94..9d00e57188a 100644
--- a/examples/Reactor/Proactor/test_proactor.mdp
+++ b/examples/Reactor/Proactor/test_proactor.mdp
Binary files differ
diff --git a/examples/Reactor/Proactor/test_timeout.cpp b/examples/Reactor/Proactor/test_timeout.cpp
index 55a36ccc93d..a5844920dc4 100644
--- a/examples/Reactor/Proactor/test_timeout.cpp
+++ b/examples/Reactor/Proactor/test_timeout.cpp
@@ -24,8 +24,8 @@
#include "ace/Task.h"
class Timeout_Handler : public ACE_Handler
-// = TITLE
-// Generic timeout handler.
+ // = TITLE
+ // Generic timeout handler.
{
public:
Timeout_Handler (void)
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index 3c846246709..b5d40534c88 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -21,18 +21,19 @@
// ============================================================================
#include "ace/Profile_Timer.h"
-#include "ace/Timer_List.h"
-#include "ace/Timer_Heap.h"
+#include "ace/Timers.h"
#include "test_config.h"
static void
randomize_array (int array[], size_t size)
{
+ size_t i;
+
ACE_OS::srand (ACE_OS::time (0L));
// Randomize the array.
- for (size_t i = 0; i < size; i++)
+ for (i = 0; i < size; i++)
{
int index = ACE_OS::rand() % size--;
int temp = array [index];
@@ -233,7 +234,7 @@ test_performance (ACE_Timer_Queue *tq,
timer.start ();
- for (i = 0; i < max_iterations; i++)
+ for (i = max_iterations - 1; i >= 0; i--)
tq->cancel (timer_ids[i]);
ACE_ASSERT (tq->is_empty ());
@@ -304,8 +305,6 @@ main (int argc, char *argv[])
delete timer_queues[i].queue_;
}
- delete [] timer_ids;
-
ACE_END_TEST;
return 0;
}
View Lorry Controller Status