config.c:

  config_drive:
    Catch an instance of anonymous drives.  Doubtless many remain.

interrupt.c:
  complete_rqe:
    Call logrq to log iodone events if DEBUG_LASTREQS is set.

    Call set_sd_state with setstate_noupdate to avoid buffered I/O out
    of interrupt context.

    Use define DEBUG_RESID instead of constant.

memory.c:
  Remove dead expandrq() function

  Malloc:
    Remove directory component of file names in malloc table.

  Add function vinum_rqinfo (part of the request tracing stuff).

request.c:
  Add function logrq (part of the request tracing stuff).

  vinumstrategy:
    Check whether config needs to be written to disk, do it if so.
    This is a stopgap until the Vinum daemon (bacchusd?  oenologistd?)
    is written.

    If DEBUG_LASTREQS is set, call logrq to log user buffer headers.

  launch_requests:
    Correct format of debug output to console.

    If DEBUG_LASTREQS is set, call logrq to log request elements.

request.h:
  Add definitions for request trace.

state.c:
  set_sd_state:
    Check flags for setstate_noupdate.  If set, don't write the config
    to disk, just set global VF_DIRTYCONFIG flag.  This is part of the
    kludge to avoid writing config from an interrupt context.

vinumext.h:
    Add declaration for vinum_rqinfo, put inside #ifdef DEBUG
    Remove dead macro expandrq

vinumio.h:
  Increase maximum ioctl reply length to 4 kB if DEBUG is set.
  Define VINUM_RQINFO ioctl if DEBUG is set.

vinumioctl.c:
  vinumioctl:
    Change implementation of VINUM_DEBUG ioctl: use a debug flag
    (DEBUG_REMOTEGDB) to decide whether to go into remote debugging or
    not.

    Implement VINUM_RQINFO.

vinumkw.h:
  Define kw_info even when not debugging.

vinumvar.h:
  Define VF_DIRTYCONFIG
  Add pointers to request info to vinum_info if DEBUG is set.
  Define setstate_noupdate
  Define additional debug bits DEBUG_RESID, DEBUG_LASTREQS and
  DEBUG_REMOTEGDB.

1 files changed, 32 insertions, 0 deletions

diff --git a/lkm/vinum/request.h b/lkm/vinum/request.h
index b4beccc..6575204 100644
--- a/lkm/vinum/request.h
+++ b/lkm/vinum/request.h
@@ -157,3 +157,35 @@ enum requeststatus {
     REQUEST_DOWN,					    /* request failed: subdisk down  */
     REQUEST_ENOMEM					    /* ran out of memory */
 };
+
+#ifdef DEBUG
+/* Trace entry for request info (DEBUG_LASTREQS) */
+enum rqinfo_type {
+    loginfo_unused,					    /* never been used */
+    loginfo_user_bp,					    /* this is the bp when strategy is called */
+    loginfo_user_bpl,					    /* and this is the bp at launch time */
+    loginfo_rqe,					    /* user RQE */
+    loginfo_iodone,					    /* iodone */
+    loginfo_raid5_data,					    /* write RAID-5 data block */
+    loginfo_raid5_parity				    /* write RAID-5 parity block */
+};
+
+union rqinfou {						    /* info to pass to logrq */
+    struct buf *bp;
+    struct rqelement *rqe;				    /* address of request, for correlation */
+};
+
+struct rqinfo {
+    enum rqinfo_type type;				    /* kind of event */
+    struct timeval timestamp;				    /* time it happened */
+    struct buf *bp;					    /* point to user buffer */
+    union {
+	struct buf b;					    /* yup, the *whole* buffer header */
+	struct rqelement rqe;				    /* and the whole rqe */
+    } info;
+};
+
+#define RQINFO_SIZE 64					    /* number of info slots in buffer */
+
+void logrq(enum rqinfo_type type, union rqinfou info, struct buf *ubp);
+#endif