- Version changed in scst_user_spec.txt
authorvlnb <vlnb@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Tue, 14 Aug 2007 17:03:42 +0000 (17:03 +0000)
committervlnb <vlnb@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Tue, 14 Aug 2007 17:03:42 +0000 (17:03 +0000)
 - Minor fixes

git-svn-id: https://scst.svn.sourceforge.net/svnroot/scst/trunk@160 d57e44dd-8a1f-0410-8b47-8ef2f437770f

doc/scst_user_spec.txt
usr/fileio/common.c
usr/fileio/debug.h
usr/fileio/fileio.c

index 423e182..2b57e28 100644 (file)
@@ -2,7 +2,7 @@
 
          USER SPACE INTERFACE DESCRIPTION.
 
-                  Version 0.9.6
+                  Version 0.9.6/1
 
 
                I. Description.
@@ -570,6 +570,7 @@ struct scst_user_scsi_cmd_on_free_cmd
        uint64_t pbuf;
        int32_t resp_data_len;
        uint8_t buffer_cached;
+       uint8_t aborted;
        uint8_t status;
 },
 
@@ -582,6 +583,8 @@ where:
 
  - 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
index 1630501..a5209b1 100644 (file)
@@ -800,7 +800,7 @@ out_close:
        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;
index e2dba9e..5b28ee1 100644 (file)
@@ -105,6 +105,9 @@ do {                                                                \
 #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
index 6e392ff..5c6af50 100644 (file)
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
                goto out_close;
        }
 
-#if 0
+#if 1
        {
                /* Not needed, added here only as a test */
                struct scst_user_opt opt;
@@ -464,8 +464,11 @@ int main(int argc, char **argv)
                                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 @@ int main(int argc, char **argv)
                                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);
                }
        }