[Scst-svn] SF.net SVN: scst: [160] trunk

[<vl...@us...>]

Revision: 160
          http://scst.svn.sourceforge.net/scst/?rev=160&view=rev
Author:   vlnb
Date:     2007-08-14 10:03:42 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
 - Version changed in scst_user_spec.txt
 - Minor fixes

Modified Paths:
--------------
    trunk/doc/scst_user_spec.txt
    trunk/usr/fileio/common.c
    trunk/usr/fileio/debug.h
    trunk/usr/fileio/fileio.c

Modified: trunk/doc/scst_user_spec.txt
===================================================================
--- trunk/doc/scst_user_spec.txt	2007-08-14 16:54:54 UTC (rev 159)
+++ trunk/doc/scst_user_spec.txt	2007-08-14 17:03:42 UTC (rev 160)
@@ -2,7 +2,7 @@
 
 	  USER SPACE INTERFACE DESCRIPTION.
 
-		   Version 0.9.6
+		   Version 0.9.6/1
 
 
 		I. Description.
@@ -570,6 +570,7 @@
 	uint64_t pbuf;
 	int32_t resp_data_len;
 	uint8_t buffer_cached;
+	uint8_t aborted;
 	uint8_t status;
 },
 
@@ -582,6 +583,8 @@
 
  - buffer_cached - true, if memory reusage is enabled for this command
 
+ - aborted - true, if command was aborted
+
  - status - SAM status of the commands execution
    
 The user space handler should reply using the corresponding reply

Modified: trunk/usr/fileio/common.c
===================================================================
--- trunk/usr/fileio/common.c	2007-08-14 16:54:54 UTC (rev 159)
+++ trunk/usr/fileio/common.c	2007-08-14 17:03:42 UTC (rev 160)
@@ -800,7 +800,7 @@
 	close(vcmd.fd);
 
 out:
-	PRINT_INFO_PR("Thread %d exited (res=%d)", gettid(), res);
+	PRINT_INFO_PR("Thread %d exiting (res=%d)", gettid(), res);
 
 	TRACE_EXIT_RES(res);
 	return (void*)res;

Modified: trunk/usr/fileio/debug.h
===================================================================
--- trunk/usr/fileio/debug.h	2007-08-14 16:54:54 UTC (rev 159)
+++ trunk/usr/fileio/debug.h	2007-08-14 17:03:42 UTC (rev 160)
@@ -105,6 +105,9 @@
 #define TRACE_BUFFER(message, buff, len) {}
 #define TRACE_BUFF_FLAG(flag, message, buff, len) {}
 
+static inline int debug_init(void) { return 0; }
+static inline void debug_done(void) {}
+
 #endif /* DEBUG || TRACING */
 
 #ifdef DEBUG

Modified: trunk/usr/fileio/fileio.c
===================================================================
--- trunk/usr/fileio/fileio.c	2007-08-14 16:54:54 UTC (rev 159)
+++ trunk/usr/fileio/fileio.c	2007-08-14 17:03:42 UTC (rev 160)
@@ -396,7 +396,7 @@
 		goto out_close;
 	}
 
-#if 0
+#if 1
 	{
 		/* Not needed, added here only as a test */
 		struct scst_user_opt opt;
@@ -464,8 +464,11 @@
 				res = errno;
 				PRINT_ERROR_PR("pthread_join() failed: %s",
 					strerror(res));
-			} else if (rc1 != NULL)
+			} else if (rc1 != NULL) {
 				res = (int)rc1;
+				PRINT_INFO("Thread %d exited, res %x", i, res);
+			} else
+				PRINT_INFO("Thread %d exited", i);
 		}
 		if (dev.prio_thr) {
 			rc = pthread_join(prio, &rc1);
@@ -473,8 +476,11 @@
 				res = errno;
 				PRINT_ERROR_PR("Prio pthread_join() failed: %s",
 					strerror(res));
-			} else if (rc1 != NULL)
+			} else if (rc1 != NULL) {
 				res = (int)rc1;
+				PRINT_INFO("Prio thread %d exited, res %x", i, res);
+			} else
+				PRINT_INFO("Prio thread %d exited", i);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.