Text archives Help

---

Author: abe
Date: Sun Oct  9 14:38:02 2005
New Revision: 608

Modified:
   branches/itanium2/Core/Shm/MFStreamData.cc
   branches/itanium2/Core/Shm/MFStreamData.h
   branches/itanium2/StandAlone/mf_stream_test.cc
Log:

Crystal Matrix integration finally works.

M    Core/Shm/MFStreamData.cc
M    Core/Shm/MFStreamData.h
M    StandAlone/mf_stream_test.cc


Modified: branches/itanium2/Core/Shm/MFStreamData.cc
==============================================================================
--- branches/itanium2/Core/Shm/MFStreamData.cc  (original)
+++ branches/itanium2/Core/Shm/MFStreamData.cc  Sun Oct  9 14:38:02 2005
@@ -126,8 +126,17 @@
   zres( 4 ),
   frontBuffer( 0 ),
   backBuffer ( 1 ), 
-  semaphore( key, LOCK_OPEN )
+  semaphore( key, LOCK_OPEN ),
+  counter( 0 )
 {
+
+  // Specifify the position/size of the rectangle we are using.
+  numRects = 1;
+  rectDef[0][RECT_X_ORIG] = 0;
+  rectDef[0][RECT_Y_ORIG] = 0;
+  rectDef[0][RECT_X_SIZE] = xres_;
+  rectDef[0][RECT_Y_SIZE] = yres_;
+  rectDef[0][RECT_OFFSET] = 0;
 }
 
 MFStreamData::~MFStreamData() {
@@ -148,6 +157,9 @@
   // Switch the back and front buffers.
   backBuffer  = !backBuffer;
   frontBuffer = !frontBuffer;
+
+  // Increment the counter variable.
+  counter++;
   
   // Increment the semaphore to 1, unlock the shm.
   semaphore.post();  

Modified: branches/itanium2/Core/Shm/MFStreamData.h
==============================================================================
--- branches/itanium2/Core/Shm/MFStreamData.h   (original)
+++ branches/itanium2/Core/Shm/MFStreamData.h   Sun Oct  9 14:38:02 2005
@@ -50,6 +50,12 @@
            MAX_NUM_UPDATES = 1024,   
            MAX_NUM_SSCMD   = 16,   // Specific stream commands.
 
+           RECT_X_ORIG = 0,
+           RECT_Y_ORIG = 1,
+           RECT_X_SIZE = 2,
+           RECT_Y_SIZE = 3,
+           RECT_OFFSET = 4,
+           
            LOCK_WRITING    = 0,
            LOCK_OPEN       = 1,
            LOCK_READING    = 2

Modified: branches/itanium2/StandAlone/mf_stream_test.cc
==============================================================================
--- branches/itanium2/StandAlone/mf_stream_test.cc      (original)
+++ branches/itanium2/StandAlone/mf_stream_test.cc      Sun Oct  9 14:38:02 
2005
@@ -206,7 +206,7 @@
 
       while (1) {
         display( stream_data );
-        SCIRun::Time::waitUntil( SCIRun::Time::currentSeconds()+0.5 );
+        SCIRun::Time::waitUntil( SCIRun::Time::currentSeconds()+0.05 );
       };
 
       closeWindow();

---

• [MANTA] r608 - in branches/itanium2: Core/Shm StandAlone, abe, 10/09/2005

---

Archive powered by MHonArc 2.6.16.