glupy patch by Ram, Justin: Add/Modify fops, structure types, utility fns

Extend the following fops with Python:
  * open
  * readv
  * writev
  * opendir
  * readdir
  * readdirp
  * stat
  * fstat
  * statfs
  * setxattr
  * getxattr
  * fsetxattr
  * fgetxattr
  * removexattr
  * fremovexattr
  * link
  * unlink
  * readlink
  * symlink
  * mkdir
  * rmdir

Add fd_t, inode_t and iatt_t structure types.

Modify loc_t structure type; Alter the data types of the following
attributes - inode, parent, gfid, pargfid.

Modify uuid2str function, which returns a string equivalent for a ctype
object representing a gfid, to make use of python's 'uuid' module for
accurate representation of uuids.

by Justin Clift:
           Adjust debug-trace.py to work with Python 2.6

           Work around 'zero length field name in format' bug in
           negative.py's uuid2str function

           Fix indentation errors in negative.py, glupy.h,
           glupy.c, gluster.py

Change-Id: If0fcfb2866e21c0380a973f8ffab9ea7b6a4cd5d
BUG: 961856
Signed-off-by: Ram Raja <rraja@redhat.com>
Reviewed-on: http://review.gluster.org/4907
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Justin Clift <jclift@redhat.com>
Tested-by: Justin Clift <jclift@redhat.com>

1 files changed, 63 insertions, 64 deletions

diff --git a/xlators/features/glupy/src/negative.py b/xlators/features/glupy/src/negative.py
index 6ca855f72..1023602b9 100644
--- a/xlators/features/glupy/src/negative.py
+++ b/xlators/features/glupy/src/negative.py
@@ -1,4 +1,5 @@
 import sys
+from uuid import UUID
 from gluster import *
 
 # Negative-lookup-caching example.  If a file wasn't there the last time we
@@ -19,75 +20,73 @@ cache = {}
 dl.get_id.restype = c_long
 dl.get_id.argtypes = [ POINTER(call_frame_t) ]
 
-def uuid2str (orig):
-	return "%08x%08x%08x%08x" % (orig[0], orig[1], orig[2], orig[3])
+def uuid2str (gfid):
+    return str(UUID(''.join(map("{0:02x}".format, gfid))))
 
 class xlator (Translator):
 
-	def __init__ (self, c_this):
-		self.requests = {}
-		Translator.__init__(self,c_this)
+    def __init__ (self, c_this):
+        self.requests = {}
+        Translator.__init__(self,c_this)
 
-	def lookup_fop (self, frame, this, loc, xdata):
-		pargfid = uuid2str(loc.contents.pargfid)
-		print "lookup FOP: %s:%s" % (pargfid, loc.contents.name)
-		# Check the cache.
-		if cache.has_key(pargfid):
-			if loc.contents.name in cache[pargfid]:
-				print "short-circuiting for %s:%s" % (
-					pargfid, loc.contents.name)
-				dl.unwind_lookup(frame,0,this,-1,2,None,None,
-						 None,None)
-				return 0
-		key = dl.get_id(frame)
-		self.requests[key] = (pargfid, loc.contents.name[:])
-		# TBD: get real child xl from init, pass it here
-		dl.wind_lookup(frame,POINTER(xlator_t)(),loc,xdata)
-		return 0
+    def lookup_fop (self, frame, this, loc, xdata):
+        pargfid = uuid2str(loc.contents.pargfid)
+        print "lookup FOP: %s:%s" % (pargfid, loc.contents.name)
+        # Check the cache.
+        if cache.has_key(pargfid):
+            if loc.contents.name in cache[pargfid]:
+                print "short-circuiting for %s:%s" % (pargfid,
+                    loc.contents.name)
+                dl.unwind_lookup(frame,0,this,-1,2,None,None,None,None)
+                return 0
+        key = dl.get_id(frame)
+        self.requests[key] = (pargfid, loc.contents.name[:])
+        # TBD: get real child xl from init, pass it here
+        dl.wind_lookup(frame,POINTER(xlator_t)(),loc,xdata)
+        return 0
 
-	def lookup_cbk (self, frame, cookie, this, op_ret, op_errno, inode, buf,
-			xdata, postparent):
-		print "lookup CBK: %d (%d)" % (op_ret, op_errno)
-		key = dl.get_id(frame)
-		pargfid, name = self.requests[key]
-		# Update the cache.
-		if op_ret == 0:
-			print "found %s, removing from cache" % name
-			if cache.has_key(pargfid):
-				cache[pargfid].discard(name)
-		elif op_errno == 2:	# ENOENT
-			print "failed to find %s, adding to cache" % name
-			if cache.has_key(pargfid):
-				cache[pargfid].add(name)
-			else:
-				cache[pargfid] = set([name])
-		del self.requests[key]
-		dl.unwind_lookup(frame,cookie,this,op_ret,op_errno,
-						 inode,buf,xdata,postparent)
-		return 0
+    def lookup_cbk (self, frame, cookie, this, op_ret, op_errno, inode, buf,
+                    xdata, postparent):
+        print "lookup CBK: %d (%d)" % (op_ret, op_errno)
+        key = dl.get_id(frame)
+        pargfid, name = self.requests[key]
+        # Update the cache.
+        if op_ret == 0:
+            print "found %s, removing from cache" % name
+            if cache.has_key(pargfid):
+                cache[pargfid].discard(name)
+        elif op_errno == 2:    # ENOENT
+            print "failed to find %s, adding to cache" % name
+            if cache.has_key(pargfid):
+                cache[pargfid].add(name)
+            else:
+                cache[pargfid] = set([name])
+        del self.requests[key]
+        dl.unwind_lookup(frame,cookie,this,op_ret,op_errno,
+                         inode,buf,xdata,postparent)
+        return 0
 
-	def create_fop (self, frame, this, loc, flags, mode, umask, fd, xdata):
-		pargfid = uuid2str(loc.contents.pargfid)
-		print "create FOP: %s:%s" % (pargfid, loc.contents.name)
-		key = dl.get_id(frame)
-		self.requests[key] = (pargfid, loc.contents.name[:])
-		# TBD: get real child xl from init, pass it here
-		dl.wind_create(frame,POINTER(xlator_t)(),loc,flags,mode,umask,
-			       fd,xdata)
-		return 0
+    def create_fop (self, frame, this, loc, flags, mode, umask, fd, xdata):
+        pargfid = uuid2str(loc.contents.pargfid)
+        print "create FOP: %s:%s" % (pargfid, loc.contents.name)
+        key = dl.get_id(frame)
+        self.requests[key] = (pargfid, loc.contents.name[:])
+        # TBD: get real child xl from init, pass it here
+        dl.wind_create(frame,POINTER(xlator_t)(),loc,flags,mode,umask,fd,xdata)
+        return 0
 
-	def create_cbk (self, frame, cookie, this, op_ret, op_errno, fd, inode,
-			buf, preparent, postparent, xdata):
-		print "create CBK: %d (%d)" % (op_ret, op_errno)
-		key = dl.get_id(frame)
-		pargfid, name = self.requests[key]
-		# Update the cache.
-		if op_ret == 0:
-			print "created %s, removing from cache" % name
-			if cache.has_key(pargfid):
-				cache[pargfid].discard(name)
-		del self.requests[key]
-		dl.unwind_create(frame,cookie,this,op_ret,op_errno,fd,inode,buf,
-				 preparent,postparent,xdata)
-		return 0
+    def create_cbk (self, frame, cookie, this, op_ret, op_errno, fd, inode,
+                    buf, preparent, postparent, xdata):
+        print "create CBK: %d (%d)" % (op_ret, op_errno)
+        key = dl.get_id(frame)
+        pargfid, name = self.requests[key]
+        # Update the cache.
+        if op_ret == 0:
+            print "created %s, removing from cache" % name
+            if cache.has_key(pargfid):
+                cache[pargfid].discard(name)
+        del self.requests[key]
+        dl.unwind_create(frame,cookie,this,op_ret,op_errno,fd,inode,buf,
+                         preparent,postparent,xdata)
+        return 0