- client: change some unsigned int to size_t in our versions

of NVIDIA APIs. This apparently caused crashes (in app, not client, which I don't understand) for Einstein@Home. From Steffen Moller. svn path=/trunk/boinc/; revision=25527
BOINC · Apr 2, 2012 · 36529da · 36529da
1 parent 45ec33f
commit 36529da
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 32 deletions.
diff --git a/checkin_notes b/checkin_notes
@@ -3178,3 +3178,16 @@ Charlie 31 Mar 2012
         BOINCTaskBar.cpp,.h
         mac/
             MacSysMenu.cpp,.h
+
+David  2 Apr 2012
+    - client: change some unsigned int to size_t in our versions
+        of NVIDIA APIs.  This apparently caused crashes
+        (in app, not client, which I don't understand) for Einstein@Home.
+        From Steffen Moller.
+
+    html/ops/
+        db_update.php
+    lib/
+        coproc.h
+    client/
+        coproc_detect.cpp
diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp
@@ -845,13 +845,13 @@ int (*__cuDriverGetVersion)(int*);
 int (*__cuDeviceGet)(int*, int);
 int (*__cuDeviceGetAttribute)(int*, int, int);
 int (*__cuDeviceGetName)(char*, int, int);
-int (*__cuDeviceTotalMem)(unsigned int*, int);
+int (*__cuDeviceTotalMem)(size_t*, int);
 int (*__cuDeviceComputeCapability)(int*, int*, int);
 int (*__cuCtxCreate)(void**, unsigned int, unsigned int);
 int (*__cuCtxDestroy)(void*);
-int (*__cuMemAlloc)(unsigned int*, unsigned int);
+int (*__cuMemAlloc)(unsigned int*, size_t);
 int (*__cuMemFree)(unsigned int);
-int (*__cuMemGetInfo)(unsigned int*, unsigned int*);
+int (*__cuMemGetInfo)(size_t*, size_t*);
 #endif
 
 // NVIDIA interfaces are documented here:
@@ -911,13 +911,13 @@ void COPROC_NVIDIA::get(
     __cuDeviceGet = (int(*)(int*, int)) dlsym( cudalib, "cuDeviceGet" );
     __cuDeviceGetAttribute = (int(*)(int*, int, int)) dlsym( cudalib, "cuDeviceGetAttribute" );
     __cuDeviceGetName = (int(*)(char*, int, int)) dlsym( cudalib, "cuDeviceGetName" );
-    __cuDeviceTotalMem = (int(*)(unsigned int*, int)) dlsym( cudalib, "cuDeviceTotalMem" );
+    __cuDeviceTotalMem = (int(*)(size_t*, int)) dlsym( cudalib, "cuDeviceTotalMem" );
     __cuDeviceComputeCapability = (int(*)(int*, int*, int)) dlsym( cudalib, "cuDeviceComputeCapability" );
     __cuCtxCreate = (int(*)(void**, unsigned int, unsigned int)) dlsym( cudalib, "cuCtxCreate" );
     __cuCtxDestroy = (int(*)(void*)) dlsym( cudalib, "cuCtxDestroy" );
-    __cuMemAlloc = (int(*)(unsigned int*, unsigned int)) dlsym( cudalib, "cuMemAlloc" );
+    __cuMemAlloc = (int(*)(unsigned int*, size_t)) dlsym( cudalib, "cuMemAlloc" );
     __cuMemFree = (int(*)(unsigned int)) dlsym( cudalib, "cuMemFree" );
-    __cuMemGetInfo = (int(*)(unsigned int*, unsigned int*)) dlsym( cudalib, "cuMemGetInfo" );
+    __cuMemGetInfo = (int(*)(size_t*, size_t*)) dlsym( cudalib, "cuMemGetInfo" );
 #endif
 
     if (!__cuDriverGetVersion) {
@@ -1134,7 +1134,7 @@ void COPROC_NVIDIA::fake(
 //
 void COPROC_NVIDIA::get_available_ram() {
     int retval;
-    unsigned int memfree, memtotal;
+    size_t memfree, memtotal;
 	int device;
     void* ctx;
 

diff --git a/doc/flops.php b/doc/flops.php
diff --git a/html/ops/db_update.php b/html/ops/db_update.php
@@ -833,6 +833,4 @@ function update_1_30_2012() {
     array(25169, "update_1_30_2012"),
 );
 
-
-
 ?>
diff --git a/lib/coproc.h b/lib/coproc.h
@@ -263,7 +263,7 @@ struct COPROC {
 struct CUDA_DEVICE_PROP {
   char  name[256];
   int   deviceHandle;
-  unsigned int totalGlobalMem;
+  size_t totalGlobalMem;
     // not used on the server; dtotalGlobalMem is used instead
     // (since some boards have >= 4GB)
   int   sharedMemPerBlock;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -833,6 +833,4 @@ function update_1_30_2012() {
		array(25169, "update_1_30_2012"),
		);



		?>