[Waba-commits] CVS: waba/vm/toppers nmtoppers_b.h,1.1.2.1,1.1.2.2

[MURANAKA M. <mo...@us...>]

Update of /cvsroot/waba/waba/vm/toppers
In directory usw-pr-cvs1:/tmp/cvs-serv23600

Modified Files:
      Tag: WABAJTRON-branch
	nmtoppers_b.h 
Log Message:
Added thread_id and itron_tskid into WThread.

Index: nmtoppers_b.h
===================================================================
RCS file: /cvsroot/waba/waba/vm/toppers/Attic/nmtoppers_b.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** nmtoppers_b.h	2001/08/13 13:42:37	1.1.2.1
--- nmtoppers_b.h	2001/09/02 05:25:49	1.1.2.2
***************
*** 1,32 ****
  
  #ifdef WITH_THREAD
  
! //*** Isao's Multithread implementation START ***
! // Thread variables - Isao F. Yamashita 07/25/2000
  #define THREAD_LIST_MAX_SIZE 8
  
  typedef struct
  {
!     WClass* tClass;
!     WObject tObject;
!     WObject syncObject;
  
!     WClassMethod* syncMethod;
  
!     int32   runMethodMapNum;
!     int32   syncMethodMapNum;
  
!     uint32  sleepCountSet;
!     uint32  sleepCountNow;
  
!     uchar   isSleepCountAlreadySet;
  
!     uchar   isWaiting;
  } WThread;
  
! WThread wThreadList[THREAD_LIST_MAX_SIZE];
! uint32  threadListCurrentSize;
! uint32  threadProcessIndex;
! uint32  threadSynchMethodIndex;
  
  //*** This "_onThreadStart()" method is called from "start()" method.
--- 1,41 ----
+ #ifndef __NMTOPPERS_A_H__
+ #define __NMTOPPERS_A_H__
  
  #ifdef WITH_THREAD
  
! //*** Monaka's Multithread implemantasion
! //**** based on Isao's Multithread implementation
! 
  #define THREAD_LIST_MAX_SIZE 8
  
+ typedef struct _queue {
+   struct _queue *next;
+   struct _queue *prev;
+ } Queue;
+ 
  typedef struct
  {
!   Queue queue; /* 'Queue' must be first to use type cast trick. */
!   WClass* tClass;
!   WObject tObject;
!   WObject syncObject;
  
!   WClassMethod* syncMethod;
  
!   int32   runMethodMapNum;
!   int32   syncMethodMapNum;
  
!   uint32  sleepCountSet;
!   uint32  sleepCountNow;
  
!   uchar   isSleepCountAlreadySet;
  
!   uchar   isWaiting;
! 
!   uint32 thread_id;
!   uint32 itron_tskid;
  } WThread;
  
! int InitThread(uint32 stack_size);
  
  //*** This "_onThreadStart()" method is called from "start()" method.
***************
*** 46,48 ****
  //*** Isao's Multithread implementation END ***
  
! #endif    /* WITH_THREAD */
--- 55,66 ----
  //*** Isao's Multithread implementation END ***
  
! void tickThread(void);
! int registerAsSyncronized(WClassMethod* method);
! void exitFromSyncronized(WClassMethod* method);
! int enterMonitor(WObject obj);
! int exitMonitor(WObject obj);
! 
! 
! #endif /* WITH_THREAD */
! 
! #endif /* __NMTOPPERS_A_H__ */