Update of /cvsroot/playerstage/code/player/server/drivers/shell
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/shell
Modified Files:
dummy.cc kartowriter.cc readlog.cc relay.cc writelog.cc
Log Message:
applied Toby's autopointer patches
Index: writelog.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/writelog.cc,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** writelog.cc 20 Aug 2007 06:37:30 -0000 1.80
--- writelog.cc 23 Aug 2007 19:58:48 -0000 1.81
***************
*** 167,171 ****
// MessageHandler
! public: virtual int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 167,171 ----
// MessageHandler
! public: virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 587,591 ****
int
! WriteLog::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 587,591 ----
int
! WriteLog::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
Index: relay.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/relay.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** relay.cc 3 May 2006 21:32:18 -0000 1.1
--- relay.cc 23 Aug 2007 19:58:48 -0000 1.2
***************
*** 81,85 ****
private:
// MessageHandler
! int ProcessMessage (MessageQueue * resp_queue, player_msghdr * hdr, void
* data);
};
--- 81,85 ----
private:
// MessageHandler
! int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void *
data);
};
***************
*** 99,105 ****
}
! int Relay::ProcessMessage (MessageQueue * resp_queue, player_msghdr * hdr,
void * data)
{
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, hdr->subtype, data,
hdr->size);
return 0;
}
--- 99,105 ----
}
! int Relay::ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr,
void * data)
{
! Publish(device_addr, PLAYER_MSGTYPE_DATA, hdr->subtype, data, hdr->size);
return 0;
}
Index: kartowriter.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/kartowriter.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kartowriter.cc 20 Aug 2007 06:37:30 -0000 1.4
--- kartowriter.cc 23 Aug 2007 19:58:48 -0000 1.5
***************
*** 187,191 ****
// MessageHandler
! int ProcessMessage(MessageQueue* resp_queue, player_msghdr * hdr, void
* data);
};
--- 187,191 ----
// MessageHandler
! int ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void
* data);
};
***************
*** 215,219 ****
}
! int KartoLogger::ProcessMessage(MessageQueue * resp_queue, player_msghdr *
hdr, void * data)
{
//writelog control
--- 215,219 ----
}
! int KartoLogger::ProcessMessage(QueuePointer &resp_queue, player_msghdr *
hdr, void * data)
{
//writelog control
Index: dummy.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/dummy.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dummy.cc 20 Aug 2007 06:37:30 -0000 1.18
--- dummy.cc 23 Aug 2007 19:58:48 -0000 1.19
***************
*** 236,240 ****
int data_len = sizeof(data) - sizeof(data.image) + w * h * 3;
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_CAMERA_DATA_STATE, (void*)&data, data_len,
NULL);
--- 236,240 ----
int data_len = sizeof(data) - sizeof(data.image) + w * h * 3;
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_CAMERA_DATA_STATE, (void*)&data, data_len,
NULL);
***************
*** 258,262 ****
data.id = 1;
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN, (void*)&data, sizeof(data),
NULL);
--- 258,262 ----
data.id = 1;
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN, (void*)&data, sizeof(data),
NULL);
***************
*** 273,277 ****
data.vel.pa = 1.0;
data.stall = 0;
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE, (void*)&data,
sizeof (data), NULL);
--- 273,277 ----
data.vel.pa = 1.0;
data.stall = 0;
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE, (void*)&data,
sizeof (data), NULL);
***************
*** 286,290 ****
data.panspeed = 1.0;
data.tiltspeed = 1.0;
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_PTZ_DATA_STATE, (void*)&data,
sizeof (data), NULL);
--- 286,290 ----
data.panspeed = 1.0;
data.tiltspeed = 1.0;
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_PTZ_DATA_STATE, (void*)&data,
sizeof (data), NULL);
***************
*** 309,313 ****
data.data_packet.battery = 489;
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_WSN_DATA_STATE, (void*)&data,
sizeof (data), NULL);
--- 309,313 ----
data.data_packet.battery = 489;
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_WSN_DATA_STATE, (void*)&data,
sizeof (data), NULL);
Index: readlog.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/readlog.cc,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** readlog.cc 20 Aug 2007 06:37:30 -0000 1.50
--- readlog.cc 23 Aug 2007 19:58:48 -0000 1.51
***************
*** 176,209 ****
public: virtual void Main();
! public: virtual int ProcessMessage(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data);
// Process log interface configuration requests
! private: int ProcessLogConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data);
// Process position interface configuration requests
! private: int ProcessPositionConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data);
// Process laser interface configuration requests
! private: int ProcessLaserConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data);
// Process sonar interface configuration requests
! private: int ProcessSonarConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data);
// Process WSN interface configuration requests
! private: int ProcessWSNConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data);
// Process IMU interface configuration requests
! private: int ProcessIMUConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data);
--- 176,209 ----
public: virtual void Main();
! public: virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data);
// Process log interface configuration requests
! private: int ProcessLogConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data);
// Process position interface configuration requests
! private: int ProcessPositionConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data);
// Process laser interface configuration requests
! private: int ProcessLaserConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data);
// Process sonar interface configuration requests
! private: int ProcessSonarConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data);
// Process WSN interface configuration requests
! private: int ProcessWSNConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data);
// Process IMU interface configuration requests
! private: int ProcessIMUConfig(QueuePointer &resp_queue,
player_msghdr_t * hdr,
void * data);
***************
*** 812,816 ****
////////////////////////////////////////////////////////////////////////////
// Process configuration requests
! int ReadLog::ProcessLogConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data)
--- 812,816 ----
////////////////////////////////////////////////////////////////////////////
// Process configuration requests
! int ReadLog::ProcessLogConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data)
***************
*** 872,876 ****
int
! ReadLog::ProcessPositionConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data)
--- 872,876 ----
int
! ReadLog::ProcessPositionConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data)
***************
*** 906,910 ****
int
! ReadLog::ProcessLaserConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data)
--- 906,910 ----
int
! ReadLog::ProcessLaserConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data)
***************
*** 946,950 ****
int
! ReadLog::ProcessSonarConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data)
--- 946,950 ----
int
! ReadLog::ProcessSonarConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data)
***************
*** 980,984 ****
int
! ReadLog::ProcessWSNConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data)
--- 980,984 ----
int
! ReadLog::ProcessWSNConfig(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data)
***************
*** 1014,1018 ****
int
! ReadLog::ProcessIMUConfig(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data)
--- 1014,1018 ----
int
! ReadLog::ProcessIMUConfig(QueuePointer &resp_queue,
player_msghdr_t * hdr,
void * data)
***************
*** 1048,1052 ****
int
! ReadLog::ProcessMessage(MessageQueue * resp_queue,
player_msghdr_t * hdr,
void * data)
--- 1048,1052 ----
int
! ReadLog::ProcessMessage(QueuePointer & resp_queue,
player_msghdr_t * hdr,
void * data)
***************
*** 1452,1456 ****
return -1;
}
! this->Publish(id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
--- 1452,1456 ----
return -1;
}
! this->Publish(id, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
***************
*** 1494,1498 ****
}
! this->Publish(id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
--- 1494,1498 ----
}
! this->Publish(id, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
***************
*** 1590,1594 ****
return -1;
}
! this->Publish(id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
--- 1590,1594 ----
return -1;
}
! this->Publish(id, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
***************
*** 1617,1621 ****
return -1;
}
! this->Publish(id, NULL, type, subtype,
(void*)&geom, sizeof(geom), &time);
return(0);
--- 1617,1621 ----
return -1;
}
! this->Publish(id, type, subtype,
(void*)&geom, sizeof(geom), &time);
return(0);
***************
*** 1715,1719 ****
data.stall = atoi(tokens[13]);
! this->Publish(id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
--- 1715,1719 ----
data.stall = atoi(tokens[13]);
! this->Publish(id, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
***************
*** 1821,1825 ****
PLAYER_WARN("read fewer wifi link entries than expected");
! this->Publish(id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
--- 1821,1825 ----
PLAYER_WARN("read fewer wifi link entries than expected");
! this->Publish(id, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
***************
*** 1871,1875 ****
data.data_packet.battery = atof(tokens[19]);
! this->Publish(id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
--- 1871,1875 ----
data.data_packet.battery = atof(tokens[19]);
! this->Publish(id, type, subtype,
(void*)&data, sizeof(data), &time);
return(0);
***************
*** 1912,1917 ****
data.pose.ppitch = atof (tokens[11]);
data.pose.pyaw = atof (tokens[12]);
!
! this->Publish (id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
--- 1912,1917 ----
data.pose.ppitch = atof (tokens[11]);
data.pose.pyaw = atof (tokens[12]);
!
! this->Publish (id, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
***************
*** 1936,1941 ****
data.magn_y = atof (tokens[14]);
data.magn_z = atof (tokens[15]);
!
! this->Publish (id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
--- 1936,1941 ----
data.magn_y = atof (tokens[14]);
data.magn_z = atof (tokens[15]);
!
! this->Publish (id, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
***************
*** 1964,1969 ****
data.q2 = atof (tokens[18]);
data.q3 = atof (tokens[19]);
!
! this->Publish (id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
--- 1964,1969 ----
data.q2 = atof (tokens[18]);
data.q3 = atof (tokens[19]);
!
! this->Publish (id, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
***************
*** 1991,1996 ****
data.orientation.ppitch = atof (tokens[17]);
data.orientation.pyaw = atof (tokens[18]);
!
! this->Publish (id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
--- 1991,1996 ----
data.orientation.ppitch = atof (tokens[17]);
data.orientation.pyaw = atof (tokens[18]);
!
! this->Publish (id, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
***************
*** 2038,2043 ****
data.points[i] = element;
}
!
! this->Publish (id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
--- 2038,2042 ----
data.points[i] = element;
}
! this->Publish (id, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
***************
*** 2080,2085 ****
data.panspeed = atof (tokens[10]);
data.tiltspeed = atof (tokens[11]);
!
! this->Publish (id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
--- 2079,2083 ----
data.panspeed = atof (tokens[10]);
data.tiltspeed = atof (tokens[11]);
! this->Publish (id, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
***************
*** 2129,2134 ****
}
data.motor_state = atoi (tokens[data.actuators_count*5 +
8]);
!
! this->Publish (id, NULL, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
--- 2127,2132 ----
}
data.motor_state = atoi (tokens[data.actuators_count*5 +
8]);
!
! this->Publish (id, type, subtype,
(void*)&data, sizeof(data), &time);
return (0);
***************
*** 2182,2186 ****
*v = atof(*t);
! Publish(id, NULL, type, subtype, (void *)&inputs, sizeof(inputs),
&time);
return 0;
--- 2180,2184 ----
*v = atof(*t);
! Publish(id, type, subtype, (void *)&inputs, sizeof(inputs),
&time);
return 0;
***************
*** 2237,2241 ****
}
! Publish(id, NULL, type, subtype, (void *)&inputs, sizeof(inputs),
&time);
return 0;
--- 2235,2239 ----
}
! Publish(id, type, subtype, (void *)&inputs, sizeof(inputs),
&time);
return 0;
***************
*** 2292,2296 ****
}
! Publish(id, NULL, type, subtype, (void *)&rdata, sizeof(rdata),
&time);
return 0;
--- 2290,2294 ----
}
! Publish(id, type, subtype, (void *)&rdata, sizeof(rdata),
&time);
return 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
