opentnl-cvs

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/tnl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22383/tnl

Modified Files:
	tnl.vcproj tnlTypes.h 
Added Files:
	journal.cpp tnlJournal.h 
Log Message:
Added initial pass-through journaling code to TNL
cleaned up SFX a bit.

--- NEW FILE: tnlJournal.h ---
//-----------------------------------------------------------------------------------
//
//   Torque Network Library
//   Copyright (C) 2004 GarageGames.com, Inc.
//   For more information see http://www.opentnl.org
//
//   This program is free software; you can redistribute it and/or modify
//   it under the terms of the GNU General Public License as published by
//   the Free Software Foundation; either version 2 of the License, or
//   (at your option) any later version.
//
//   For use in products that are not compatible with the terms of the GNU 
//   General Public License, alternative licensing options are available 
//   from GarageGames.com.
//
//   This program is distributed in the hope that it will be useful,
//   but WITHOUT ANY WARRANTY; without even the implied warranty of
//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//   GNU General Public License for more details.
//
//   You should have received a copy of the GNU General Public License
//   along with this program; if not, write to the Free Software
//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//
//------------------------------------------------------------------------------------

#ifndef _TNL_JOURNAL_H_
#define _TNL_JOURNAL_H_

#include "tnlMethodDispatch.h"
#include <stdio.h>

#define TNL_ENABLE_JOURNALING

namespace TNL
{

/// The Journal class represents the recordable entry point(s) into program execution.
/// When journaling is enabled by the TNL_ENABLE_JOURNALING macro, any calls into specially
/// marked Journal methods will be intercepted and potentially recorded for later playback.
/// If TNL_ENABLE_JOURNALING is not defined, all of the interception code will be disabled.

class Journal : public Object
{
   FILE *journalFile;
   BitStream readStream;
   BitStream writeStream;
public:
   void record(const char *fileName);
   void load(const char *fileName);

   void callEntry(const char *funcName, MarshalledCall *theCall);
   void processNextJournalEntry();
};

struct JournalEntryRecord
{
   const char *mFunctionName;
   JournalEntryRecord *mNext;
   static JournalEntryRecord *mList;

   JournalEntryRecord(const char *functionName)
   {
      mFunctionName = functionName;
      mNext = mList;
      mList = this;
   }
   virtual void getFuncPtr(MethodPointer &m) = 0;
};

#ifdef TNL_ENABLE_JOURNALING
#define TNL_DECLARE_JOURNAL_ENTRYPOINT(func, args) \
      virtual void FN_CDECL func args; \
      virtual void FN_CDECL func##_body args

#define TNL_IMPLEMENT_JOURNAL_ENTRYPOINT(className, func, args) \
      TNL::MethodArgList Journal_##className##_##func(#className, #args); \
      struct Journal_##className##_##func##_er : public JournalEntryRecord { \
         void getFuncPtr(MethodPointer &m) { \
            void (FN_CDECL className::*fptr) args; \
            fptr = &className::func##_body; \
            m.v1 = *((U32 *) &fptr); \
            if(sizeof(fptr) > sizeof(U32)) m.v2 = *(((U32 *) &fptr) + 1); \
         }; \
         Journal_##className##_##func##_er(const char *name) : JournalEntryRecord(name) {} \
      } gJournal_##className##_##func##_er(#func); \
      void FN_CDECL className::func args { \
         SAVE_PARAMS \
         MarshalledCall call(&Journal_##className##_##func); \
         call.marshall(); \
         callEntry(#func, &call); \
      } \
      void FN_CDECL className::func##_body args

#else
#define TNL_DECLARE_JOURNAL_ENTRYPOINT(func, args) \
      void func args

#define TNL_IMPLEMENT_JOURNAL_ENTRYPOINT(className, func, args) \
   void className::func args

#endif
};


#endif
Index: tnl.vcproj
===================================================================
RCS file: /cvsroot/opentnl/tnl/tnl/tnl.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tnl.vcproj	6 May 2004 00:33:38 -0000	1.2
--- tnl.vcproj	10 May 2004 22:34:23 -0000	1.3
***************
*** 184,187 ****
--- 184,190 ----
  		</File>
  		<File
+ 			RelativePath=".\journal.cpp">
+ 		</File>
+ 		<File
  			RelativePath=".\log.cpp">
  		</File>
***************
*** 319,322 ****
--- 322,328 ----
  		</File>
  		<File
+ 			RelativePath=".\tnlJournal.h">
+ 		</File>
+ 		<File
  			RelativePath=".\tnlLog.h">
  		</File>

--- NEW FILE: journal.cpp ---
//-----------------------------------------------------------------------------------
//
//   Torque Network Library
//   Copyright (C) 2004 GarageGames.com, Inc.
//   For more information see http://www.opentnl.org
//
//   This program is free software; you can redistribute it and/or modify
//   it under the terms of the GNU General Public License as published by
//   the Free Software Foundation; either version 2 of the License, or
//   (at your option) any later version.
//
//   For use in products that are not compatible with the terms of the GNU 
//   General Public License, alternative licensing options are available 
//   from GarageGames.com.
//
//   This program is distributed in the hope that it will be useful,
//   but WITHOUT ANY WARRANTY; without even the implied warranty of
//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//   GNU General Public License for more details.
//
//   You should have received a copy of the GNU General Public License
//   along with this program; if not, write to the Free Software
//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//
//------------------------------------------------------------------------------------

#include "tnlJournal.h"

namespace TNL
{

JournalEntryRecord *JournalEntryRecord::mList = NULL;

void Journal::callEntry(const char *funcName, MarshalledCall *theCall)
{
   BitStream unmarshallData(theCall->marshalledData.getBuffer(), theCall->marshalledData.getBytePosition());
   theCall->unmarshall(&unmarshallData);
   for(JournalEntryRecord *walk = JournalEntryRecord::mList; walk; walk = walk->mNext)
   {
      if(!strcmp(walk->mFunctionName, funcName))
      {
         MethodPointer p;
         walk->getFuncPtr(p);
         theCall->dispatch((void *) this, &p);
         return;
      }
   }
}

};
Index: tnlTypes.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/tnl/tnlTypes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tnlTypes.h	6 May 2004 00:33:38 -0000	1.4
--- tnlTypes.h	10 May 2004 22:34:23 -0000	1.5
***************
*** 241,245 ****
--- 241,250 ----
  #  define TNL_OS_STRING "Win32"
  #  define TNL_OS_WIN32
+ 
+ #ifdef TNL_COMPILER_MINGW
+ #  define FN_CDECL
+ #else
  #  define FN_CDECL __cdecl
+ #endif
  
  #elif defined(linux)