From 0c39d8e9d904dc844ba4251ba5544f960b9f8cc1 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Tue, 23 Aug 2011 12:45:07 +0000
Subject: [PATCH] client: write / parse OpenCL info in COPROC XML data

svn path=/trunk/boinc/; revision=24027
---
 lib/coproc.cpp | 23 +++++++++++++++++------
 lib/parse.h    |  5 ++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/lib/coproc.cpp b/lib/coproc.cpp
index 4a5299701b..c477af0ca4 100644
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
@@ -308,13 +308,29 @@ void COPROC_NVIDIA::description(char* buf) {
 
 #ifndef _USING_FCGI_
 void COPROC_NVIDIA::write_xml(MIOFILE& f, bool include_request) {
+unsigned long long test;
+
+test = strtoull("0x123456789abc", NULL, 0);
+
+
+
     f.printf(
         "<coproc_cuda>\n"
         "   <count>%d</count>\n"
         "   <name>%s</name>\n"
         "   <have_cuda>%d</have_cuda>\n"
         "   <have_cal>%d</have_cal>\n"
-        "   <have_opencl>%d</have_opencl>\n"
+        "   <have_opencl>%d</have_opencl>\n",
+        count,
+        prop.name,
+        have_cuda ? 1 : 0,
+        have_cal ? 1 : 0,
+        have_opencl ? 1 : 0
+    );
+    if (include_request) {
+        write_request(f);
+    }
+    f.printf(
         "   <peak_flops>%f</peak_flops>\n"
         "   <cudaVersion>%d</cudaVersion>\n"
         "   <drvVersion>%d</drvVersion>\n"
@@ -334,11 +350,6 @@ void COPROC_NVIDIA::write_xml(MIOFILE& f, bool include_request) {
         "   <textureAlignment>%u</textureAlignment>\n"
         "   <deviceOverlap>%d</deviceOverlap>\n"
         "   <multiProcessorCount>%d</multiProcessorCount>\n",
-        count,
-        prop.name,
-        have_cuda ? 1 : 0,
-        have_cal ? 1 : 0,
-        have_opencl ? 1 : 0,
         peak_flops,
         cuda_version,
         display_driver_version,
diff --git a/lib/parse.h b/lib/parse.h
index b9dcb71be3..d22eb8d26b 100644
--- a/lib/parse.h
+++ b/lib/parse.h
@@ -84,13 +84,12 @@ inline unsigned long long strtoull(const char *s, char **, int) {
     unsigned long long y;
     strncpy(buf, s, sizeof(buf)-1);
     strip_whitespace(buf);
-    p = buf;
     p = strstr(buf, "0x");
     if (!p) p = strstr(buf, "0X");
     if (p) {
-        sscanf(p, "llx", &y);
+        sscanf(p, "%llx", &y);
     } else {
-        sscanf(buf, "llu", &y);
+        sscanf(buf, "%llu", &y);
     }
     return y;
 }