Update of /cvsroot/playerstage/code/player/libplayercore
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1460/libplayercore
Modified Files:
message.cc .cvsignore playerinterfacegen.py
Log Message:
Added entries to .cvsignore for eclipse CVS setup
Modified playerxdrgen to generate clone and free methods
Renamed dpcpy methods to copy and made argument order match memcpy
simplified vectormap interface a little
fixed misc warnings
cleanup tests
Index: playerinterfacegen.py
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayercore/playerinterfacegen.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** playerinterfacegen.py 27 Aug 2007 03:51:44 -0000 1.2
--- playerinterfacegen.py 17 Sep 2007 02:18:51 -0000 1.3
***************
*** 114,118 ****
for m in interface_messages:
print " {", interface_def, ",", m.msg_type, ",", m.msg_subtype_string,
","
! print " (player_pack_fn_t)%(dt_base)s_pack,
(player_dpcpy_fn_t)%(dt)s_dpcpy, (player_cleanup_fn_t)%(dt)s_cleanup}," % {
"dt_base": m.datatype[:-2], "dt": m.datatype}
def process_for_utils(targetfile):
--- 114,118 ----
for m in interface_messages:
print " {", interface_def, ",", m.msg_type, ",", m.msg_subtype_string,
","
! print " (player_pack_fn_t)%(dt_base)s_pack,
(player_copy_fn_t)%(dt)s_copy, (player_cleanup_fn_t)%(dt)s_cleanup}," % {
"dt_base": m.datatype[:-2], "dt": m.datatype}
def process_for_utils(targetfile):
Index: message.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayercore/message.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** message.cc 27 Aug 2007 03:52:17 -0000 1.25
--- message.cc 17 Sep 2007 02:18:51 -0000 1.26
***************
*** 74,84 ****
((player_msghdr *) Data)->size = data_size;
! memcpy(&this->Data[sizeof(struct player_msghdr)],data,data_size);
! if (do_deepcopy && data != NULL)
{
! player_dpcpy_fn_t dpcpyfunc = NULL;
! if((dpcpyfunc = playerxdr_get_dpcpyfunc(Header.addr.interf, Header.type,
Header.subtype)) != NULL)
{
! if((this->DynDataSize = (*dpcpyfunc)(data, this->GetPayload())) == 0)
{
// Possible error
--- 74,83 ----
((player_msghdr *) Data)->size = data_size;
! if (do_deepcopy && data != NULL && data_size > 0)
{
! player_copy_fn_t copyfunc = NULL;
! if((copyfunc = playerxdr_get_copyfunc(Header.addr.interf, Header.type,
Header.subtype)) != NULL)
{
! if((this->DynDataSize = (*copyfunc)(this->GetPayload(),data)) == 0)
{
// Possible error
***************
*** 87,90 ****
--- 86,93 ----
}
}
+ else
+ {
+ memcpy(&this->Data[sizeof(struct player_msghdr)],data,data_size);
+ }
this->RefCount = new unsigned int;
***************
*** 113,131 ****
((player_msghdr *) Data)->size = data_size;
- memcpy(&this->Data[sizeof(struct player_msghdr)],data,data_size);
- // Perform deep copy if necessary
if (do_deepcopy && data != NULL && data_size > 0)
{
! player_dpcpy_fn_t dpcpyfunc = NULL;
! if((dpcpyfunc = playerxdr_get_dpcpyfunc(Header.addr.interf, Header.type,
Header.subtype)) != NULL)
{
! if((this->DynDataSize = (*dpcpyfunc)(data, this->GetPayload())) == 0)
{
// Possible error
PLAYER_WARN3 ("copied zero bytes in deep copy of message %s: %s, %d",
interf_to_str (Header.addr.interf), msgtype_to_str (Header.type),
Header.subtype);
- assert(0);
}
}
}
this->RefCount = new unsigned int;
--- 116,135 ----
((player_msghdr *) Data)->size = data_size;
if (do_deepcopy && data != NULL && data_size > 0)
{
! player_copy_fn_t copyfunc = NULL;
! if((copyfunc = playerxdr_get_copyfunc(Header.addr.interf, Header.type,
Header.subtype)) != NULL)
{
! if((this->DynDataSize = (*copyfunc)(this->GetPayload(),data)) == 0)
{
// Possible error
PLAYER_WARN3 ("copied zero bytes in deep copy of message %s: %s, %d",
interf_to_str (Header.addr.interf), msgtype_to_str (Header.type),
Header.subtype);
}
}
}
+ else
+ {
+ memcpy(&this->Data[sizeof(struct player_msghdr)],data,data_size);
+ }
this->RefCount = new unsigned int;
Index: .cvsignore
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayercore/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** .cvsignore 20 Aug 2007 06:37:26 -0000 1.5
--- .cvsignore 17 Sep 2007 02:18:51 -0000 1.6
***************
*** 7,8 ****
--- 7,13 ----
interface_table.c
player_interfaces.h
+ .libs
+ .deps
+ *.lo
+ *.a
+ *.la
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
