From 94e31a27b6e2330b41cb6a76038af74121517339 Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Wed, 29 Jul 2015 14:29:31 +1000
Subject: [PATCH] Use the fuse ID in debug logs.

It's too confusing with a distinct set of IDs for logging.
---
 connection.go | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/connection.go b/connection.go
index 56a231d..57f36f9 100644
--- a/connection.go
+++ b/connection.go
@@ -67,9 +67,6 @@ type Connection struct {
 	// The context from which all op contexts inherit.
 	parentCtx context.Context
 
-	// For logging purposes only.
-	nextOpID uint32
-
 	mu sync.Mutex
 
 	// A map from fuse "unique" request ID (*not* the op ID for logging used
@@ -89,7 +86,6 @@ type opState struct {
 	inMsg  *buffer.InMessage
 	outMsg *buffer.OutMessage
 	op     interface{}
-	opID   uint32 // For logging
 }
 
 // Create a connection wrapping the supplied file descriptor connected to the
@@ -171,7 +167,7 @@ func (c *Connection) Init() (err error) {
 // Log information for an operation with the given ID. calldepth is the depth
 // to use when recovering file:line information with runtime.Caller.
 func (c *Connection) debugLog(
-	opID uint32,
+	fuseID uint64,
 	calldepth int,
 	format string,
 	v ...interface{}) {
@@ -194,7 +190,7 @@ func (c *Connection) debugLog(
 	// Format the actual message to be printed.
 	msg := fmt.Sprintf(
 		"Op 0x%08x %24s] %v",
-		opID,
+		fuseID,
 		fileLine,
 		fmt.Sprintf(format, v...))
 
@@ -387,10 +383,7 @@ func (c *Connection) ReadOp() (ctx context.Context, op interface{}, err error) {
 		}
 
 		// Choose an ID for this operation for the purposes of logging, and log it.
-		opID := c.nextOpID
-		c.nextOpID++
-
-		c.debugLog(opID, 1, "<- %s", describeRequest(op))
+		c.debugLog(inMsg.Header().Unique, 1, "<- %s", describeRequest(op))
 
 		// Special case: handle interrupt requests inline.
 		if interruptOp, ok := op.(*interruptOp); ok {
@@ -400,7 +393,7 @@ func (c *Connection) ReadOp() (ctx context.Context, op interface{}, err error) {
 
 		// Set up a context that remembers information about this op.
 		ctx = c.beginOp(inMsg.Header().Opcode, inMsg.Header().Unique)
-		ctx = context.WithValue(ctx, contextKey, opState{inMsg, outMsg, op, opID})
+		ctx = context.WithValue(ctx, contextKey, opState{inMsg, outMsg, op})
 
 		// Special case: responding to statfs is required to make mounting work on
 		// OS X. We don't currently expose the capability for the file system to
@@ -431,7 +424,7 @@ func (c *Connection) Reply(ctx context.Context, opErr error) {
 	op := state.op
 	inMsg := state.inMsg
 	outMsg := state.outMsg
-	opID := state.opID
+	fuseID := inMsg.Header().Unique
 
 	// Make sure we destroy the messages when we're done.
 	defer c.putInMessage(inMsg)
@@ -443,9 +436,9 @@ func (c *Connection) Reply(ctx context.Context, opErr error) {
 	// Debug logging
 	if c.debugLogger != nil {
 		if opErr == nil {
-			c.debugLog(opID, 1, "-> OK: %s", describeResponse(op))
+			c.debugLog(fuseID, 1, "-> OK: %s", describeResponse(op))
 		} else {
-			c.debugLog(opID, 1, "-> error: %v", opErr)
+			c.debugLog(fuseID, 1, "-> error: %v", opErr)
 		}
 	}