Sun Jul 27 12:51:14 2003 Venkita Subramonian <venkita@cs.wustl.edu>

7 files changed, 155 insertions, 196 deletions

diff --git a/ChangeLog b/ChangeLog
index 460195fc2ee..c259cc97d84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,32 +1,35 @@
+Sun Jul 27 12:51:14 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
+
+	* Kokyu/DSRT_Dispatcher_Impl.{cpp,h,i}:
+	  Deleted these files. 
+	  
+	* Kokyu/Kokyu.dsp:
+	* Kokyu/Kokyu_Static.dsp:
+	  Updated due to the above deletion.	
+
 Sun Jul 27 12:13:31 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* Kokyu/DSRT_Schedulers.{cpp,h):
-
 	  Removed this file.
 	
-	* Kokyu/Kokyu_DLL.dsp:
-	
+	* Kokyu/Kokyu_DLL.dsp:	
 	  Replaced with Kokyu.dsp.
 	
 	* Kokyu/Kokyu.mwc:
-
 	  Deleted this until I am able to get the mwc based generation
 	  working. 
 	
 	* Kokyu/Kokyu.mpc: 
-
 	  Changed "dllflags" keyword to "dynamicflags". This was causing
 	  build errors in Win2K_VC71_NET_DLL Remedy build. Thanks to
 	  Johnny Willemsen for pointing this out.
 
 	* Kokyu/Makefile.Kokyu:
-
 	  Updated dependencies.
 
 	* Kokyu/Kokyu.dsp:
 	* Kokyu/Kokyu_Static.dsp:
 	* Kokyu/Kokyu.dsw:
-
 	  Updated project and workspace files with newly added DSRT files.
 	
 Sat Jul 26 22:08:48 UTC 2003  Don Hinton  <dhinton@dresystems.com>
diff --git a/Kokyu/DSRT_Dispatcher_Impl.cpp b/Kokyu/DSRT_Dispatcher_Impl.cpp
deleted file mode 100644
index 50642a8386a..00000000000
--- a/Kokyu/DSRT_Dispatcher_Impl.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-
-#include "ace/Sched_Params.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/Dynamic_Service.h"
-
-#include "DSRT_Dispatcher_Impl.h"
-#include "DSRT_Schedulers.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "DSRT_Dispatcher_Impl.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Kokyu, Dispatcher_Impl, "$Id$")
-
-  //using namespace Kokyu;
-
-namespace Kokyu
-{
-int
-DSRT_Dispatcher_Impl::init_i (const DSRT_ConfigInfo& config_info)
-{
-  curr_config_info_ = config_info;
-
-  this->scheduler_impl_ =
-    ACE_Dynamic_Service<DSRT_Scheduler_Impl>::instance ("DSRT_Scheduler_Impl");
-
-  return 0;
-}
-
-int
-DSRT_Dispatcher_Impl::schedule_i (guid_t guid,
-                  const DSRT_QoSDescriptor& qos_info)
-{
-  ACE_UNUSED_ARG (guid);
-  ACE_hthread_t thr_handle;
-  ACE_Thread::self (thr_handle);
-
-  int prio = this->scheduler_impl_->schedule (guid, qos_info);
-  ACE_OS::thr_setprio (thr_handle, prio);
-
-  return prio;
-}
-
-int
-DSRT_Dispatcher_Impl::update_schedule_i (guid_t guid,
-                  const DSRT_QoSDescriptor& qos_info)
-{
-  ACE_UNUSED_ARG (guid);
-  ACE_UNUSED_ARG (qos_info);
-  return 0;
-}
-
-int
-DSRT_Dispatcher_Impl::cancel_schedule_i (guid_t guid,
-                  const DSRT_QoSDescriptor& qos_info)
-{
-  return schedule_i (guid, qos_info);
-}
-
-}
diff --git a/Kokyu/DSRT_Dispatcher_Impl.h b/Kokyu/DSRT_Dispatcher_Impl.h
deleted file mode 100644
index ada49ca7dd0..00000000000
--- a/Kokyu/DSRT_Dispatcher_Impl.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- C++ -*- */
-/**
- *  @file   DSRT_Dispatcher_Impl.h
- *
- *  $Id$
- *
- */
-
-#ifndef DSRT_DISPATCHER_IMPL_H
-#define DSRT_DISPATCHER_IMPL_H
-#include /**/ "ace/pre.h"
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Task.h"
-#include "ace/Message_Block.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Service_Config.h"
-
-#include "ace/Sched_Params.h"
-
-#include "kokyu_export.h"
-#include "Kokyu.h"
-
-namespace Kokyu
-{
-  class DSRT_Scheduler_Impl;
-
-  class DSRT_Dispatcher_Impl
-  {
-  public:
-
-    virtual ~DSRT_Dispatcher_Impl ();
-
-    int init (const DSRT_ConfigInfo&);
-    int schedule (guid_t guid,
-                  const DSRT_QoSDescriptor&);
-    int update_schedule (guid_t guid,
-                         const DSRT_QoSDescriptor&);
-    int cancel_schedule (guid_t guid,
-                         const DSRT_QoSDescriptor&);
-
-  private:
-
-    int init_i (const DSRT_ConfigInfo&);
-    int schedule_i (guid_t guid,
-                    const DSRT_QoSDescriptor&);
-    int update_schedule_i (guid_t guid,
-                           const DSRT_QoSDescriptor&);
-    int cancel_schedule_i (guid_t guid,
-                           const DSRT_QoSDescriptor&);
-
-  private:
-    DSRT_ConfigInfo curr_config_info_;
-    DSRT_Scheduler_Impl* scheduler_impl_;
-  };
-
-} //end of namespace
-
-#if defined (__ACE_INLINE__)
-#include "DSRT_Dispatcher_Impl.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* DEFAULT_DISPATCHER_IMPL_H */
diff --git a/Kokyu/DSRT_Dispatcher_Impl.i b/Kokyu/DSRT_Dispatcher_Impl.i
deleted file mode 100644
index 96a0fbdd26c..00000000000
--- a/Kokyu/DSRT_Dispatcher_Impl.i
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-namespace Kokyu
-{
-
-ACE_INLINE
-DSRT_Dispatcher_Impl::~DSRT_Dispatcher_Impl ()
-{
-}
-
-ACE_INLINE
-int DSRT_Dispatcher_Impl::init (const DSRT_ConfigInfo& config_info)
-{
-  return this->init_i (config_info);
-}
-
-ACE_INLINE
-int DSRT_Dispatcher_Impl::schedule (guid_t guid,
-                                    const DSRT_QoSDescriptor& qos)
-{
-  return this->schedule_i (guid, qos);
-}
-
-ACE_INLINE
-int DSRT_Dispatcher_Impl::update_schedule (guid_t guid,
-                                           const DSRT_QoSDescriptor& qos)
-{
-  return this->update_schedule_i (guid, qos);
-}
-
-ACE_INLINE
-int DSRT_Dispatcher_Impl::cancel_schedule (guid_t guid,
-                                           const DSRT_QoSDescriptor& qos)
-{
-  return this->cancel_schedule_i (guid, qos);
-}
-
-}
diff --git a/Kokyu/Kokyu.dsp b/Kokyu/Kokyu.dsp
index 96dfa903fc4..cfeeda9bce9 100644
--- a/Kokyu/Kokyu.dsp
+++ b/Kokyu/Kokyu.dsp
@@ -8,12 +8,12 @@ CFG=Kokyu_DLL - 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 "Kokyu_DLL.mak".

+!MESSAGE NMAKE /f "Kokyu.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 "Kokyu_DLL.mak" CFG="Kokyu_DLL - Win32 Debug"

+!MESSAGE NMAKE /f "Kokyu.mak" CFG="Kokyu_DLL - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -51,7 +51,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo /o"Kokyu.bsc"

+# 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 /dll /machine:I386

 # ADD LINK32 ace.lib /nologo /dll /machine:I386 /out:"..\bin\Kokyu.dll" /libpath:"../ace"

@@ -79,7 +79,7 @@ LINK32=link.exe
 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo /o"Kokyu.bsc"

+# 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 /dll /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Kokyud.dll" /pdbtype:sept /libpath:"../ace"

@@ -107,15 +107,11 @@ SOURCE=.\Dispatcher_Task.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\DSRT_Dispatcher_Impl.cpp

+SOURCE=.\Kokyu.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\DSRT_Schedulers.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Kokyu.cpp

+SOURCE=.\Kokyu_defs.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -135,15 +131,11 @@ SOURCE=.\Dispatcher_Task.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\DSRT_Dispatcher_Impl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DSRT_Schedulers.h

+SOURCE=.\Kokyu.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Kokyu.h

+SOURCE=.\Kokyu_defs.h

 # End Source File

 # Begin Source File

 

@@ -198,7 +190,20 @@ SOURCE=.\Dispatcher_Task.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\DSRT_Dispatcher_Impl.i

+SOURCE=.\DSRT_Dispatch_Item_T.i

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\DSRT_Dispatcher_Impl_T.i

 

 !IF  "$(CFG)" == "Kokyu_DLL - Win32 Release"

 

@@ -222,6 +227,101 @@ SOURCE=.\Kokyu.i
 !ENDIF 

 

 # End Source File

+# Begin Source File

+

+SOURCE=.\Kokyu_defs.i

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Kokyu_dsrt.i

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\DSRT_Direct_Dispatcher_Impl_T.cpp

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\DSRT_Dispatch_Item_T.cpp

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\DSRT_Dispatcher_Impl_T.cpp

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\DSRT_Sched_Queue_T.cpp

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Kokyu_dsrt.cpp

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

 # End Group

 # End Target

 # End Project

diff --git a/Kokyu/Kokyu.dsw b/Kokyu/Kokyu.dsw
index 57658e7f698..5196a156df0 100644
--- a/Kokyu/Kokyu.dsw
+++ b/Kokyu/Kokyu.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

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

 

-Project: "Kokyu DLL"=.\Kokyu_DLL.dsp - Package Owner=<4>

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

 

 Package=<5>

 {{{

diff --git a/Kokyu/Kokyu_Static.dsp b/Kokyu/Kokyu_Static.dsp
index 38aa0cdfd4d..f0e1c88a1d3 100644
--- a/Kokyu/Kokyu_Static.dsp
+++ b/Kokyu/Kokyu_Static.dsp
@@ -179,10 +179,6 @@ SOURCE=.\Dispatcher_Task.i
 # Begin Source File

 

 SOURCE=.\DSRT_Dispatch_Item_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DSRT_Dispatcher_Impl.i

 

 !IF  "$(CFG)" == "Kokyu_Static - Win32 Release"

 

@@ -196,6 +192,15 @@ SOURCE=.\DSRT_Dispatcher_Impl.i
 # Begin Source File

 

 SOURCE=.\DSRT_Dispatcher_Impl_T.i

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -213,10 +218,28 @@ SOURCE=.\Kokyu.i
 # Begin Source File

 

 SOURCE=.\Kokyu_defs.i

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Kokyu_dsrt.i

+

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Template Files"