diff --git a/checkin_notes b/checkin_notes index 13cb3e5246..9e1dbd844d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3191,3 +3191,10 @@ David 2 Apr 2012 coproc.h client/ coproc_detect.cpp + +David 2 Apr 2012 + - client: don't write deviceHandle to NVIDIA XML description. + Um, pointers don't have any meaning outside the process + + lib/ + coproc.cpp diff --git a/lib/coproc.cpp b/lib/coproc.cpp index b7ab1ce85f..6d19374b36 100644 --- a/lib/coproc.cpp +++ b/lib/coproc.cpp @@ -397,7 +397,6 @@ void COPROC_NVIDIA::write_xml(MIOFILE& f, bool include_request) { " %f\n" " %d\n" " %d\n" - " %p\n" " %u\n" " %u\n" " %d\n" @@ -416,7 +415,6 @@ void COPROC_NVIDIA::write_xml(MIOFILE& f, bool include_request) { peak_flops, cuda_version, display_driver_version, - prop.deviceHandle, (unsigned int)prop.totalGlobalMem, (unsigned int)prop.sharedMemPerBlock, prop.regsPerBlock, @@ -499,7 +497,7 @@ int COPROC_NVIDIA::parse(XML_PARSER& xp) { if (xp.parse_str("name", prop.name, sizeof(prop.name))) continue; if (xp.parse_int("deviceHandle", prop.deviceHandle)) continue; if (xp.parse_double("totalGlobalMem", prop.dtotalGlobalMem)) { - prop.totalGlobalMem = (int)prop.dtotalGlobalMem; + prop.totalGlobalMem = (size_t)prop.dtotalGlobalMem; continue; } if (xp.parse_int("sharedMemPerBlock", (int&)prop.sharedMemPerBlock)) continue;