From 93de9409666a1bd9efd69df59e1cbb5ae68a107b Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Fri, 1 May 2015 12:38:03 +1000
Subject: [PATCH] Added some vanity op descriptions.

---
 fuseops/common_op.go |  6 +++---
 fuseops/ops.go       | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/fuseops/common_op.go b/fuseops/common_op.go
index cbb4206..1a651d2 100644
--- a/fuseops/common_op.go
+++ b/fuseops/common_op.go
@@ -164,7 +164,7 @@ func (o *commonOp) init(
 	o.opsInFlight = opsInFlight
 
 	// Set up a trace span for this op.
-	o.ctx, o.report = reqtrace.StartSpan(ctx, o.ShortDesc())
+	o.ctx, o.report = reqtrace.StartSpan(ctx, o.op.ShortDesc())
 }
 
 func (o *commonOp) Header() OpHeader {
@@ -193,7 +193,7 @@ func (o *commonOp) respondErr(err error) {
 
 	o.Logf(
 		"-> (%s) error: %v",
-		o.ShortDesc(),
+		o.op.ShortDesc(),
 		err)
 
 	o.bazilReq.RespondError(err)
@@ -213,7 +213,7 @@ func (o *commonOp) respond(resp interface{}) {
 
 	// Special case: handle successful ops with no response struct.
 	if resp == nil {
-		o.Logf("-> (%s) OK", o.ShortDesc())
+		o.Logf("-> (%s) OK", o.op.ShortDesc())
 		respond.Call([]reflect.Value{})
 		return
 	}
diff --git a/fuseops/ops.go b/fuseops/ops.go
index 976b530..a683880 100644
--- a/fuseops/ops.go
+++ b/fuseops/ops.go
@@ -18,6 +18,7 @@
 package fuseops
 
 import (
+	"fmt"
 	"os"
 	"time"
 
@@ -143,6 +144,11 @@ type LookUpInodeOp struct {
 	Entry ChildInodeEntry
 }
 
+func (o *LookUpInodeOp) ShortDesc() (desc string) {
+	desc = fmt.Sprintf("LookUpInode(parent=%v, name=%q)", o.Parent, o.Name)
+	return
+}
+
 func (o *LookUpInodeOp) Respond(err error) {
 	defer o.commonOp.opsInFlight.Done()
 
@@ -317,6 +323,11 @@ type MkDirOp struct {
 	Entry ChildInodeEntry
 }
 
+func (o *MkDirOp) ShortDesc() (desc string) {
+	desc = fmt.Sprintf("MkDir(parent=%v, name=%q)", o.Parent, o.Name)
+	return
+}
+
 func (o *MkDirOp) Respond(err error) {
 	defer o.commonOp.opsInFlight.Done()
 
@@ -374,6 +385,11 @@ type CreateFileOp struct {
 	Handle HandleID
 }
 
+func (o *CreateFileOp) ShortDesc() (desc string) {
+	desc = fmt.Sprintf("CreateFile(parent=%v, name=%q)", o.Parent, o.Name)
+	return
+}
+
 func (o *CreateFileOp) Respond(err error) {
 	defer o.commonOp.opsInFlight.Done()