From 0cc2cda080bf3838d4d9f75961fe01518ab61781 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Thu, 17 Feb 2011 14:51:17 +0100
Subject: [PATCH] misc fixes

---
 src/cutop.c | 40 ++++++++++++++++++++++++++++++++++++++--
 src/cutop.h |  7 ++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/cutop.c b/src/cutop.c
index d69978d..e12e40b 100644
--- a/src/cutop.c
+++ b/src/cutop.c
@@ -11,7 +11,7 @@ int main (int argc, char **argv) {
 	
 	
 	
-	while((opt = getopt(argc, argv, "hl:mvxdro")) != -1) {
+	while((opt = getopt(argc, argv, "hl:tmvxdro")) != -1) {
 		switch(opt) {
 			case 'l':
 				loop = atoi(optarg);
@@ -31,6 +31,9 @@ int main (int argc, char **argv) {
 			case 'o':
 				xfunc = &tst_opencl;
 				break;
+			case 't':
+				xfunc = &tst_threads;
+				break;
 			case 'v':
 				printf("This is cutop - version %s\n", CUTOP_VERSION);
 				exit(1);
@@ -104,6 +107,8 @@ void drv_leak_mem(CUdevice unused) {
  *********************************************************************/
 void query_memory(CUdevice unused) {
 	
+	pid_t mypid;
+	struct utsname myself;
 	unsigned int i;                        /* loop var           */
 	int devcount;                          /* device count       */
 	CUdevice dev;                          /* cuda device handle */
@@ -115,6 +120,9 @@ void query_memory(CUdevice unused) {
 	cuOK( cuDeviceGetCount(&devcount) );
 	
 	
+	mypid = getpid();
+	uname(&myself);
+	
 	printf("# found %d cuda-aware devices\n",devcount);
 	
 	for(i=0;i<devcount;i++) {
@@ -124,7 +132,7 @@ void query_memory(CUdevice unused) {
 		cuOK( cuCtxCreate(&ctx, 0, dev) );
 		cuOK( cuMemGetInfo(&mem_free, &mem_total) );
 		
-		printf("device=%2d, name=%20s, mem_total=%4luMiB, mem_free=%4luMiB\n", i, devname, mem_total/1024/1024, mem_free/1024/1024);
+		printf("host=%s pid=%d device=%2d, name=%20s, mem_total=%4luMiB, mem_free=%4luMiB\n", myself.nodename, mypid, i, devname, mem_total/1024/1024, mem_free/1024/1024);
 		
 		cuOK( cuCtxDetach(ctx) );
 	}
@@ -148,6 +156,34 @@ void query_devprops(CUdevice unused) {
 	
 }
 
+void tst_threads(CUdevice x) {
+	#define NTHREADS 5
+	pthread_t threads[NTHREADS];
+	int thread_args[NTHREADS];
+	int r, i;
+	printf(">> CREATING THREADS RIGHT NOW\n");
+	for (i=0; i<NTHREADS; ++i) {
+		thread_args[i] = i;
+		r = pthread_create(&threads[i], NULL, _thcode, (void *) &thread_args[i]);
+	}
+	
+	for (i=0; i<NTHREADS; ++i) {
+		r = pthread_join(threads[i], NULL);
+	}
+	exit(0);
+}
+
+void *_thcode(void *argument)
+{
+	int thread_id;
+	
+	thread_id = *((int *) argument);
+	
+	cudaSetDevice(0);
+	printf("This is thread %d // %d\n", thread_id, pthread_self());
+	
+	return 0;
+}
 
 void tst_runtime(CUdevice x) {
 	query_devprops(x);
diff --git a/src/cutop.h b/src/cutop.h
index c4612cd..d4ca8f1 100644
--- a/src/cutop.h
+++ b/src/cutop.h
@@ -3,8 +3,12 @@
 #include <cuda_runtime_api.h>
 #include <cublas.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 #include <execinfo.h>
+#include <pthread.h>
+
 
 #define NV_DEVNAME_SIZE 256
 
@@ -30,4 +34,5 @@ void query_devprops(CUdevice);
 void tst_runtime(CUdevice  );  // jump to a function using the runtime api
 void tst_drvapi(CUdevice   );  // jump to a function using the driver api
 void tst_opencl(CUdevice   );  // jump to a function using the OpenCL api
- 
+void tst_threads(CUdevice  );
+void *_thcode(void *argument);
-- 
2.11.4.GIT