[Phission-cvs] phission/examples/cpp/PlayerStageDev/src phJoystickData.cpp,1.4,1.5 phPositionData.cpp,1.4,1.5 phPowerData.cpp,1.2,1.3 phSonarData.cpp,1.3,1.4 phWifiData.cpp,1.3,1.4 phWifiLinkData.cpp,1.3,1.4

[Philip T. <pt...@us...>]

Update of /cvsroot/phission/phission/examples/cpp/PlayerStageDev/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14739/examples/cpp/PlayerStageDev/src

Modified Files:
	phJoystickData.cpp phPositionData.cpp phPowerData.cpp 
	phSonarData.cpp phWifiData.cpp phWifiLinkData.cpp 
Log Message:

Converted to adhere to the swap disabling feature of phLiveObject



Index: phPositionData.cpp
===================================================================
RCS file: /cvsroot/phission/phission/examples/cpp/PlayerStageDev/src/phPositionData.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** phPositionData.cpp	18 Sep 2005 22:36:20 -0000	1.4
--- phPositionData.cpp	21 Sep 2005 23:04:05 -0000	1.5
***************
*** 120,163 ****
  
      phTHIS_WRITELOCK(rwlocked);
!     phWRITELOCK(data,other_rwlocked);
      
!     phMemcpy(t_pose,   data.m_pose, sizeof(double) * 3);
!     phMemcpy(t_size,   data.m_size, sizeof(double) * 2);
!     t_px = data.m_px;
!     t_py = data.m_py;
!     t_pa = data.m_pa;
!     t_vx = data.m_vx;
!     t_vy = data.m_vy;
!     t_va = data.m_va;
!     t_stall = data.m_stall;
   
!     phMemcpy(data.m_pose,   this->m_pose, sizeof(double) * 3);
!     phMemcpy(data.m_size,this->m_size, sizeof(double) * 2);
!     data.m_px = this->m_px;
!     data.m_py = this->m_py;
!     data.m_pa = this->m_pa;
!     data.m_vx = this->m_vx;
!     data.m_vy = this->m_vy;
!     data.m_va = this->m_va;
!     data.m_stall = this->m_stall;
! 
!     phMemcpy(this->m_pose,   t_pose, sizeof(double) * 3);
!     phMemcpy(this->m_size,t_size, sizeof(double) * 2);
!     this->m_px = t_px;
!     this->m_py = t_py;
!     this->m_pa = t_pa;
!     this->m_vx = t_vx;
!     this->m_vy = t_vy;
!     this->m_va = t_va;
!     this->m_stall = t_stall;
  
  
!     rc = this->notify();
!     phPRINT_RC(rc,NULL,"this->notify()");
  
!     rc = data.notify();
!     phPRINT_RC(rc,NULL,"data.notify()");
  
-     phRWUNLOCK(data,other_rwlocked);
      phTHIS_RWUNLOCK(rwlocked);
  
--- 120,172 ----
  
      phTHIS_WRITELOCK(rwlocked);
!         
!     if (this->isSwapEnabled())
!     {
!         phWRITELOCK(data,other_rwlocked);
      
!         phMemcpy(t_pose,   data.m_pose, sizeof(double) * 3);
!         phMemcpy(t_size,   data.m_size, sizeof(double) * 2);
!         t_px = data.m_px;
!         t_py = data.m_py;
!         t_pa = data.m_pa;
!         t_vx = data.m_vx;
!         t_vy = data.m_vy;
!         t_va = data.m_va;
!         t_stall = data.m_stall;
   
!         phMemcpy(data.m_pose,   this->m_pose, sizeof(double) * 3);
!         phMemcpy(data.m_size,this->m_size, sizeof(double) * 2);
!         data.m_px = this->m_px;
!         data.m_py = this->m_py;
!         data.m_pa = this->m_pa;
!         data.m_vx = this->m_vx;
!         data.m_vy = this->m_vy;
!         data.m_va = this->m_va;
!         data.m_stall = this->m_stall;
  
+         phMemcpy(this->m_pose,   t_pose, sizeof(double) * 3);
+         phMemcpy(this->m_size,t_size, sizeof(double) * 2);
+         this->m_px = t_px;
+         this->m_py = t_py;
+         this->m_pa = t_pa;
+         this->m_vx = t_vx;
+         this->m_vy = t_vy;
+         this->m_va = t_va;
+         this->m_stall = t_stall;
  
!         rc = this->notify();
!         phPRINT_RC(rc,NULL,"this->notify()");
!     
!         rc = data.notify();
!         phPRINT_RC(rc,NULL,"data.notify()");
  
!         phRWUNLOCK(data,other_rwlocked);
!     }
!     else
!     {
!         rc = this->copyData(data);
!         phCHECK_RC(rc,NULL,"this->copyData(data)");
!     }
  
      phTHIS_RWUNLOCK(rwlocked);
  

Index: phSonarData.cpp
===================================================================
RCS file: /cvsroot/phission/phission/examples/cpp/PlayerStageDev/src/phSonarData.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** phSonarData.cpp	18 Sep 2005 22:36:20 -0000	1.3
--- phSonarData.cpp	21 Sep 2005 23:04:05 -0000	1.4
***************
*** 117,156 ****
  
      phTHIS_WRITELOCK(rwlocked);
!     phWRITELOCK(data,other_rwlocked);
  
!     /* Data to temp */
!     phMemcpy(t_pose,   data.m_pose, 
!              sizeof(double) * this->m_pose_count * this->m_pose_dims);
!     phMemcpy(t_scan,   data.m_scan, 
!             sizeof(double) * this->m_scan_count);
!     t_pose_count = data.m_pose_count;
!     t_pose_dims = data.m_pose_dims;
!     t_scan_count = data.m_scan_count;
   
!     /* this to data */ 
!     phMemcpy(data.m_pose, this->m_pose, 
!             sizeof(double) * this->m_pose_count * this->m_pose_dims);
!     phMemcpy(data.m_scan,this->m_scan, 
!             sizeof(double) * this->m_scan_count);
!     data.m_pose_count = this->m_pose_count;
!     data.m_pose_dims = this->m_pose_dims;
!     data.m_scan_count = this->m_scan_count;
  
!     /* Temp to this */
!     phMemcpy(this->m_pose,t_pose, 
!             sizeof(double) * this->m_pose_count * this->m_pose_dims);
!     phMemcpy(this->m_scan,t_scan,
!             sizeof(double) * this->m_scan_count);
!     this->m_pose_count = t_pose_count;
!     this->m_pose_dims = t_pose_dims;
!     this->m_scan_count = t_scan_count;
  
!     rc = this->notify();
!     phPRINT_RC(rc,NULL,"this->notify()");
  
!     rc = data.notify();
!     phPRINT_RC(rc,NULL,"data.notify()");
  
-     phRWUNLOCK(data,other_rwlocked);
      phTHIS_RWUNLOCK(rwlocked);
  
--- 117,166 ----
  
      phTHIS_WRITELOCK(rwlocked);
!         
!     if (this->isSwapEnabled())
!     {
!         phWRITELOCK(data,other_rwlocked);
  
!         /* Data to temp */
!         phMemcpy(t_pose,   data.m_pose, 
!                  sizeof(double) * this->m_pose_count * this->m_pose_dims);
!         phMemcpy(t_scan,   data.m_scan, 
!                 sizeof(double) * this->m_scan_count);
!         t_pose_count = data.m_pose_count;
!         t_pose_dims = data.m_pose_dims;
!         t_scan_count = data.m_scan_count;
   
!         /* this to data */ 
!         phMemcpy(data.m_pose, this->m_pose, 
!                 sizeof(double) * this->m_pose_count * this->m_pose_dims);
!         phMemcpy(data.m_scan,this->m_scan, 
!                 sizeof(double) * this->m_scan_count);
!         data.m_pose_count = this->m_pose_count;
!         data.m_pose_dims = this->m_pose_dims;
!         data.m_scan_count = this->m_scan_count;
  
!         /* Temp to this */
!         phMemcpy(this->m_pose,t_pose, 
!                 sizeof(double) * this->m_pose_count * this->m_pose_dims);
!         phMemcpy(this->m_scan,t_scan,
!                 sizeof(double) * this->m_scan_count);
!         this->m_pose_count = t_pose_count;
!         this->m_pose_dims = t_pose_dims;
!         this->m_scan_count = t_scan_count;
  
!         rc = this->notify();
!         phPRINT_RC(rc,NULL,"this->notify()");
  
!         rc = data.notify();
!         phPRINT_RC(rc,NULL,"data.notify()");
! 
!         phRWUNLOCK(data,other_rwlocked);
!     }
!     else
!     {
!         rc = this->copyData(data);
!         phCHECK_RC(rc,NULL,"this->copyData(data)");
!     }
  
      phTHIS_RWUNLOCK(rwlocked);
  

Index: phJoystickData.cpp
===================================================================
RCS file: /cvsroot/phission/phission/examples/cpp/PlayerStageDev/src/phJoystickData.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** phJoystickData.cpp	18 Sep 2005 22:36:20 -0000	1.4
--- phJoystickData.cpp	21 Sep 2005 23:04:05 -0000	1.5
***************
*** 182,215 ****
  
      phTHIS_WRITELOCK(rwlocked);
!     phWRITELOCK(data,other_rwlocked);
  
!     t_button        = this->m_button;
!     t_button_size   = this->m_button_size;
!     t_button_count  = this->m_button_count;
!     t_axis          = this->m_axis;
!     t_axis_size     = this->m_axis_size;
!     t_axis_count    = this->m_axis_count;
      
!     this->m_button        = data.m_button;
!     this->m_button_size   = data.m_button_size;
!     this->m_button_count  = data.m_button_count;
!     this->m_axis          = data.m_axis;
!     this->m_axis_size     = data.m_axis_size;
!     this->m_axis_count    = data.m_axis_count;
  
!     data.m_button        = t_button;
!     data.m_button_size   = t_button_size;
!     data.m_button_count  = t_button_count;
!     data.m_axis          = t_axis;
!     data.m_axis_size     = t_axis_size;
!     data.m_axis_count    = t_axis_count;
      
!     rc = this->notify();
!     phPRINT_RC(rc,NULL,"this->notify()");
  
!     rc = data.notify();
!     phPRINT_RC(rc,NULL,"data.notify()");
  
-     phRWUNLOCK(data,other_rwlocked);
      phTHIS_RWUNLOCK(rwlocked);
  
--- 182,225 ----
  
      phTHIS_WRITELOCK(rwlocked);
!         
!     if (this->isSwapEnabled())
!     {
!         phWRITELOCK(data,other_rwlocked);
  
!         t_button        = this->m_button;
!         t_button_size   = this->m_button_size;
!         t_button_count  = this->m_button_count;
!         t_axis          = this->m_axis;
!         t_axis_size     = this->m_axis_size;
!         t_axis_count    = this->m_axis_count;
      
!         this->m_button        = data.m_button;
!         this->m_button_size   = data.m_button_size;
!         this->m_button_count  = data.m_button_count;
!         this->m_axis          = data.m_axis;
!         this->m_axis_size     = data.m_axis_size;
!         this->m_axis_count    = data.m_axis_count;
  
!         data.m_button        = t_button;
!         data.m_button_size   = t_button_size;
!         data.m_button_count  = t_button_count;
!         data.m_axis          = t_axis;
!         data.m_axis_size     = t_axis_size;
!         data.m_axis_count    = t_axis_count;
      
!         rc = this->notify();
!         phPRINT_RC(rc,NULL,"this->notify()");
  
!         rc = data.notify();
!         phPRINT_RC(rc,NULL,"data.notify()");
!     
!         phRWUNLOCK(data,other_rwlocked);
!     }
!     else
!     {
!         rc = this->setData(data);
!         phCHECK_RC(rc,NULL,"this->setData(data)");
!     }
  
      phTHIS_RWUNLOCK(rwlocked);
  

Index: phWifiData.cpp
===================================================================
RCS file: /cvsroot/phission/phission/examples/cpp/PlayerStageDev/src/phWifiData.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** phWifiData.cpp	18 Sep 2005 22:36:20 -0000	1.3
--- phWifiData.cpp	21 Sep 2005 23:04:05 -0000	1.4
***************
*** 169,202 ****
  
      phTHIS_WRITELOCK(rwlocked);
!     phWRITELOCK(data,other_rwlocked);
      
!     /* Data to temp */
!     t_links             = data.m_links;
!     t_link_count        = data.m_link_count;
!     t_link_data         = data.m_link_data;
!     t_links_size        = data.m_links_size;
!     t_link_data_size    = data.m_link_data_size;
  
!     /* this to data */
!     data.m_links        = this->m_links;
!     data.m_link_count   = this->m_link_count;
!     data.m_link_data    = this->m_link_data;
!     data.m_links_size     = this->m_links_size;
!     data.m_link_data_size = this->m_link_data_size;
  
!     /* temp to this */    
!     this->m_links       = t_links;
!     this->m_link_count  = t_link_count;
!     this->m_link_data   = t_link_data;
!     this->m_links_size    = t_links_size;
!     this->m_link_data_size= t_link_data_size;
  
!     rc = this->notify();
!     phPRINT_RC(rc,NULL,"this->notify()");
  
!     rc = data.notify();
!     phPRINT_RC(rc,NULL,"data.notify()");
  
!     phRWUNLOCK(data,other_rwlocked);
      phTHIS_RWUNLOCK(rwlocked);
  
--- 169,211 ----
  
      phTHIS_WRITELOCK(rwlocked);
!         
!     if (this->isSwapEnabled())
!     {
!         phWRITELOCK(data,other_rwlocked);
      
!         /* Data to temp */
!         t_links             = data.m_links;
!         t_link_count        = data.m_link_count;
!         t_link_data         = data.m_link_data;
!         t_links_size        = data.m_links_size;
!         t_link_data_size    = data.m_link_data_size;
  
!         /* this to data */
!         data.m_links        = this->m_links;
!         data.m_link_count   = this->m_link_count;
!         data.m_link_data    = this->m_link_data;
!         data.m_links_size     = this->m_links_size;
!         data.m_link_data_size = this->m_link_data_size;
  
!         /* temp to this */    
!         this->m_links       = t_links;
!         this->m_link_count  = t_link_count;
!         this->m_link_data   = t_link_data;
!         this->m_links_size    = t_links_size;
!         this->m_link_data_size= t_link_data_size;
  
!         rc = this->notify();
!         phPRINT_RC(rc,NULL,"this->notify()");
  
!         rc = data.notify();
!         phPRINT_RC(rc,NULL,"data.notify()");
  
!         phRWUNLOCK(data,other_rwlocked);
!     }
!     else
!     {
!         rc = this->copyData(data);
!         phCHECK_RC(rc,NULL,"this->copyData(data)");
!     }
      phTHIS_RWUNLOCK(rwlocked);
  

Index: phPowerData.cpp
===================================================================
RCS file: /cvsroot/phission/phission/examples/cpp/PlayerStageDev/src/phPowerData.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** phPowerData.cpp	18 Sep 2005 22:36:20 -0000	1.2
--- phPowerData.cpp	21 Sep 2005 23:04:05 -0000	1.3
***************
*** 96,114 ****
  
      phTHIS_WRITELOCK(rwlocked);
!     phWRITELOCK(data,other_rwlocked);
      
!     t_charge = data.m_charge;
   
!     data.m_charge = this->m_charge;
  
!     this->m_charge = t_charge;
  
!     rc = this->notify();
!     phPRINT_RC(rc,NULL,"this->notify()");
  
!     rc = data.notify();
!     phPRINT_RC(rc,NULL,"data.notify()");
  
!     phRWUNLOCK(data,other_rwlocked);
      phTHIS_RWUNLOCK(rwlocked);
  
--- 96,123 ----
  
      phTHIS_WRITELOCK(rwlocked);
!         
!     if (this->isSwapEnabled())
!     {
!         phWRITELOCK(data,other_rwlocked);
      
!         t_charge = data.m_charge;
   
!         data.m_charge = this->m_charge;
  
!         this->m_charge = t_charge;
  
!         rc = this->notify();
!         phPRINT_RC(rc,NULL,"this->notify()");
  
!         rc = data.notify();
!         phPRINT_RC(rc,NULL,"data.notify()");
  
!         phRWUNLOCK(data,other_rwlocked);
!     }
!     else
!     {
!         rc = this->copyData(data);
!         phCHECK_RC(rc,NULL,"this->copyData(data)");
!     }
      phTHIS_RWUNLOCK(rwlocked);
  

Index: phWifiLinkData.cpp
===================================================================
RCS file: /cvsroot/phission/phission/examples/cpp/PlayerStageDev/src/phWifiLinkData.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** phWifiLinkData.cpp	18 Sep 2005 22:36:20 -0000	1.3
--- phWifiLinkData.cpp	21 Sep 2005 23:04:05 -0000	1.4
***************
*** 126,174 ****
  
      phTHIS_WRITELOCK(rwlocked);
!     phWRITELOCK(data,other_rwlocked);
      
!     /* Data to temp */
!     memcpy(t_mac, data.m_mac,     sizeof(uint8_t)*32);
!     memcpy(t_ip,  data.m_ip,      sizeof(uint8_t)*32);
!     memcpy(t_essid,data.m_essid,  sizeof(char)*32);
!     t_mode          = data.m_mode;
!     t_encrypt       = data.m_encrypt;
!     t_freq          = data.m_freq;
!     t_qual          = data.m_qual;
!     t_level         = data.m_level;
!     t_noise         = data.m_noise;
!     t_id            = data.m_id;
  
!     /* this to data */
!     memcpy(data.m_mac, this->m_mac,     sizeof(uint8_t)*32);
!     memcpy(data.m_ip,  this->m_ip,      sizeof(uint8_t)*32);
!     memcpy(data.m_essid,this->m_essid,  sizeof(char)*32);
!     data.m_mode        = this->m_mode;
!     data.m_encrypt     = this->m_encrypt;
!     data.m_freq        = this->m_freq;
!     data.m_qual        = this->m_qual;
!     data.m_level       = this->m_level;
!     data.m_noise       = this->m_noise;
!     data.m_id           = this->m_id;
  
!     /* temp to this */    
!     memcpy(this->m_mac, t_mac,     sizeof(uint8_t)*32);
!     memcpy(this->m_ip,  t_ip,      sizeof(uint8_t)*32);
!     memcpy(this->m_essid,t_essid,  sizeof(char)*32);
!     this->m_mode        = t_mode;
!     this->m_encrypt     = t_encrypt;
!     this->m_freq        = t_freq;
!     this->m_qual        = t_qual;
!     this->m_level       = t_level;
!     this->m_noise       = t_noise;
!     this->m_id          = t_id;
  
!     rc = this->notify();
!     phPRINT_RC(rc,NULL,"this->notify()");
  
!     rc = data.notify();
!     phPRINT_RC(rc,NULL,"data.notify()");
  
!     phRWUNLOCK(data,other_rwlocked);
      phTHIS_RWUNLOCK(rwlocked);
  
--- 126,183 ----
  
      phTHIS_WRITELOCK(rwlocked);
!         
!     if (this->isSwapEnabled())
!     {
!         phWRITELOCK(data,other_rwlocked);
      
!         /* Data to temp */
!         memcpy(t_mac, data.m_mac,     sizeof(uint8_t)*32);
!         memcpy(t_ip,  data.m_ip,      sizeof(uint8_t)*32);
!         memcpy(t_essid,data.m_essid,  sizeof(char)*32);
!         t_mode          = data.m_mode;
!         t_encrypt       = data.m_encrypt;
!         t_freq          = data.m_freq;
!         t_qual          = data.m_qual;
!         t_level         = data.m_level;
!         t_noise         = data.m_noise;
!         t_id            = data.m_id;
  
!         /* this to data */
!         memcpy(data.m_mac, this->m_mac,     sizeof(uint8_t)*32);
!         memcpy(data.m_ip,  this->m_ip,      sizeof(uint8_t)*32);
!         memcpy(data.m_essid,this->m_essid,  sizeof(char)*32);
!         data.m_mode        = this->m_mode;
!         data.m_encrypt     = this->m_encrypt;
!         data.m_freq        = this->m_freq;
!         data.m_qual        = this->m_qual;
!         data.m_level       = this->m_level;
!         data.m_noise       = this->m_noise;
!         data.m_id           = this->m_id;
  
!         /* temp to this */    
!         memcpy(this->m_mac, t_mac,     sizeof(uint8_t)*32);
!         memcpy(this->m_ip,  t_ip,      sizeof(uint8_t)*32);
!         memcpy(this->m_essid,t_essid,  sizeof(char)*32);
!         this->m_mode        = t_mode;
!         this->m_encrypt     = t_encrypt;
!         this->m_freq        = t_freq;
!         this->m_qual        = t_qual;
!         this->m_level       = t_level;
!         this->m_noise       = t_noise;
!         this->m_id          = t_id;
  
!         rc = this->notify();
!         phPRINT_RC(rc,NULL,"this->notify()");
  
!         rc = data.notify();
!         phPRINT_RC(rc,NULL,"data.notify()");
  
!         phRWUNLOCK(data,other_rwlocked);
!     }
!     else
!     {
!         rc = this->copyData(data);
!         phCHECK_RC(rc,NULL,"this->copyData(data)");
!     }
      phTHIS_RWUNLOCK(rwlocked);