Changeset 8899

Timestamp:

06/28/11 12:18:43 (23 months ago)

Author:

walt

Message:

added IO byte counters for small_io
added IO byte counters for ONLY small_io and ONLY flows
minor format edit
debug fixes to usrint code

Location:

branches/Orange-Branch

Files:

• include/pvfs2-mgmt.h (modified) (1 diff)
• src/apps/admin/pvfs2-perf-mon-snmp.c (modified) (3 diffs)
• src/client/usrint/Makefile (modified) (2 diffs)
• src/client/usrint/iocommon.c (modified) (46 diffs)
• src/client/usrint/iocommon.h (modified) (1 diff)
• src/client/usrint/openfile-util.c (modified) (22 diffs)
• src/client/usrint/openfile-util.h (modified) (2 diffs)
• src/client/usrint/posix-pvfs.c (modified) (29 diffs)
• src/client/usrint/posix.c (modified) (8 diffs)
• src/client/usrint/stdio.c (modified) (6 diffs)
• src/client/usrint/usrint.h (modified) (1 diff)
• src/common/misc/pint-perf-counter.c (modified) (4 diffs)
• src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c (modified) (2 diffs)
• src/io/trove/trove-mgmt.c (modified) (1 diff)
• src/server/small-io.sm (modified) (2 diffs)

branches/Orange-Branch/include/pvfs2-mgmt.h

@@ -68 +68 @@
     PINT_PERF_REQSCHED = 6,             /* instantaneous active requests */
     PINT_PERF_REQUESTS = 7,             /* requests received */
+    PINT_PERF_SMALL_READ = 8,           /* bytes read by small_io */
+    PINT_PERF_SMALL_WRITE = 9,          /* bytes written by small_io */
+    PINT_PERF_FLOW_READ = 10,           /* bytes read by flow */
+    PINT_PERF_FLOW_WRITE = 11,          /* bytes written by flow */
 };
 

branches/Orange-Branch/src/apps/admin/pvfs2-perf-mon-snmp.c

@@ -34 +34 @@
 #define OID_REQSCHED ".1.3.6.1.4.1.7778.6"
 #define OID_REQUESTS ".1.3.6.1.4.1.7778.7"
+#define OID_SMALL_READ ".1.3.6.1.4.1.7778.8"
+#define OID_SMALL_WRITE ".1.3.6.1.4.1.7778.9"
+#define OID_FLOW_READ ".1.3.6.1.4.1.7778.10"
+#define OID_FLOW_WRITE ".1.3.6.1.4.1.7778.11"
 
 #define INT_TYPE "INTEGER"
@@ -61 +65 @@
    {OID_REQSCHED, INT_TYPE, PINT_PERF_REQSCHED, "Requests Active"},
    {OID_REQUESTS, CNT_TYPE, PINT_PERF_REQUESTS, "Requests Received"},
+   {OID_SMALL_READ, CNT_TYPE, PINT_PERF_SMALL_READ, "Bytes Read by Small_IO"},
+   {OID_SMALL_WRITE, CNT_TYPE, PINT_PERF_SMALL_WRITE, "Bytes Written by Small_IO"},
+   {OID_FLOW_READ, CNT_TYPE, PINT_PERF_FLOW_READ, "Bytes Read by Flow"},
+   {OID_FLOW_WRITE, CNT_TYPE, PINT_PERF_FLOW_WRITE, "Bytes Written by Flow"},
    {NULL, NULL, -1, NULL}   /* this halts the key count */
 };
@@ -293 +301 @@
                     strcmp(cmd_buffer, key_table[k].key_oid); k++);
             /* out of for loop k equals selected key */
-            if (k <= max_keys)
+            if (k < max_keys)
             {
                 returnType = key_table[k].key_type;

branches/Orange-Branch/src/client/usrint/Makefile

@@ -4 +4 @@
 LIBDIR=
 
-CFLAGS=$(INCDIR) $(LIBDIR)
+CFLAGS=-g -O0 $(INCDIR) $(LIBDIR)
 
 OBJS=iocommon.o openfile-util.o posix-pvfs.o posix.o stdio.o request.o
@@ -12 +12 @@
 all: $(OBJS)
 
-clean: 
+clean::
         rm *.o
 

branches/Orange-Branch/src/client/usrint/iocommon.c

@@ -16 +16 @@
 #include <iocommon.h>
 
-int init=0;
-
-/* Perform PVFS initialization if not already finished */
-void iocommon_ensure_init()
-{
-
-    /* Initialize the file system with mount points */
-    int ret;
-    if (!init)
-    {
-        ret = PVFS_util_init_defaults();
-        assert(ret==PVFS_FD_SUCCESS);
-        init=1;
-    }
-
-}
 
 void iocommon_cred(PVFS_credentials **credentials)
@@ -52 +36 @@
 {
     PVFS_credentials *credentials;
+
+    pvfs_sys_init();
     iocommon_cred(&credentials);
     return PVFS_sys_flush(pd->pvfs_ref, credentials, PVFS_HINT_NULL);
@@ -71 +57 @@
     memset(&resp_lookup, 0, sizeof(resp_lookup));
 
+    pvfs_sys_init();
+    iocommon_cred(&credentials);
+
     /* Determine the fs_id and pvfs_path */
     rc = PVFS_util_resolve(abs_path, &lookup_fs_id, pvfs_path, 256);
-    if (rc == -1)
+    if (rc < 0)
     {
         return -1;
     }
 
-    iocommon_cred(&credentials);
     rc = PVFS_sys_lookup(lookup_fs_id, pvfs_path,
                          credentials, &resp_lookup,
@@ -100 +88 @@
 
     /* Initialize any variables */
+    pvfs_sys_init();
     memset(&resp_lookup, 0, sizeof(resp_lookup));
 
@@ -135 +124 @@
 
     /* Initialize */
+    pvfs_sys_init();
     memset(&attr, 0, sizeof(attr));
     memset(&resp_create, 0, sizeof(resp_create));
@@ -155 +145 @@
 #endif
 
-    attr.owner = getuid();
-    attr.group = getgid();
+    attr.owner = geteuid();
+    attr.group = getegid();
     attr.atime = time(NULL);
     attr.mtime = attr.atime;
@@ -260 +250 @@
     memset(&attributes_resp, 0, sizeof(attributes_resp));
 
+    pvfs_sys_init();
+    iocommon_cred(&credentials);
+
     /* Split the path into a directory and file */
-    rc = split_pathname(pathname, &directory, &filename);
-    if (rc == -1)
+    rc = split_pathname(pathname, 0, &directory, &filename);
+    if (rc < 0)
     {
         goto errorout;
@@ -281 +274 @@
     {
         rc = iocommon_lookup_absolute(directory, &parent_ref);
-        if (rc == -1)
+        if (rc < 0)
         {
             goto errorout;
@@ -294 +287 @@
                                           follow_link,
                                           &parent_ref);
-            if (rc == -1)
+            if (rc < 0)
             {
                 goto errorout;
@@ -335 +328 @@
             /* create failed, the file must have been */
             /* created by a different process, so just open it */
-            if (rc != -1)
+            if (rc < 0)
             {
                 /* get existing handle */
@@ -342 +335 @@
                                               follow_link,
                                               &file_ref);
-                if (rc == -1)
+                if (rc < 0)
                 {
                     /* not sure what is wrong */
@@ -360 +353 @@
 
     /* Get the file's type information from its attributes */
-    PVFS_sys_getattr(pd->pvfs_ref, PVFS_ATTR_SYS_ALL_NOHINT,
-                     credentials, &attributes_resp, NULL);
+    rc = PVFS_sys_getattr(pd->pvfs_ref,
+                          PVFS_ATTR_SYS_ALL_NOHINT,
+                          credentials,
+                          &attributes_resp,
+                          NULL);
+    if (rc < 0)
+    {
+        goto errorout;
+    }
     pd->mode = attributes_resp.attr.perms; /* this may change */
     if (attributes_resp.attr.objtype & PVFS_TYPE_METAFILE)
@@ -379 +379 @@
     if (flag & O_TRUNC)
     {
-        PVFS_credentials *credentials;
-        iocommon_cred(&credentials);
-        PVFS_sys_truncate(file_ref, 0, credentials, NULL);
+        rc = PVFS_sys_truncate(file_ref, 0, credentials, NULL);
+        if (rc < 0)
+        {
+            goto errorout;
+        }
     }
 
@@ -387 +389 @@
     if (flag & O_APPEND)
     {
-        iocommon_lseek(pd, 0, 0, SEEK_END);
+        rc = iocommon_lseek(pd, 0, 0, SEEK_END);
     }
 
@@ -401 +403 @@
         free(filename);
     }
-    if (rc == -1)
+    if (rc < 0)
     {
         return NULL;
@@ -409 +411 @@
         return pd;
     }
+}
+
+/**
+ * Implementation of truncate via PVFS
+ *
+ */
+int iocommon_truncate(PVFS_object_ref file_ref, off64_t length)
+{
+    PVFS_credentials *credentials;
+
+    pvfs_sys_init();
+    iocommon_cred(&credentials);
+    return PVFS_sys_truncate(file_ref, length, credentials, NULL);
 }
 
@@ -451 +466 @@
         {
             /* Get the file's size in bytes as the ending offset */
-            rc = PVFS_sys_getattr(pd->pvfs_ref, PVFS_ATTR_SYS_SIZE,
-                                  credentials, &attributes_resp, NULL);
+            rc = PVFS_sys_getattr(pd->pvfs_ref,
+                                  PVFS_ATTR_SYS_SIZE,
+                                  credentials,
+                                  &attributes_resp,
+                                  NULL);
             if(rc)
             {
@@ -481 +499 @@
                                   &readdir_resp,
                                   NULL);
-            if(rc == -1)
+            if(rc < 0)
             {
                 return -1;
@@ -492 +510 @@
 }
 
-/*
- * pvfs_unlink implementation
- * need to verify this is a file or symlink
- * use rmdir for directory
+/**
+ * implements unlink and rmdir
+ * 
+ * dirflag indicates trying to remove a dir (rmdir)
  */
 int iocommon_remove (const char *pathname,
@@ -514 +532 @@
 
     /* Initialize the system interface for this process */
-    iocommon_ensure_init();
+    pvfs_sys_init();
     iocommon_cred(&credentials);
 
-    rc = split_pathname(pathname, &parentdir, &file);
-    if (rc == -1)
+    rc = split_pathname(pathname, dirflag, &parentdir, &file);
+    if (rc < 0)
     {
         return -1;
@@ -526 +544 @@
     {
         rc = iocommon_lookup_absolute(parentdir, &parent_ref);
-        if (rc == -1)
+        if (rc < 0)
         {
             goto errorout;
@@ -533 +551 @@
     else
     {
-        if (!parentdir)
+        if (parentdir)
         {
             rc = iocommon_lookup_relative(parentdir, *pdir,
                             PVFS2_LOOKUP_LINK_FOLLOW, &parent_ref);
-            if (rc == -1)
+            if (rc < 0)
             {
                 goto errorout;
@@ -552 +570 @@
     rc = iocommon_lookup_relative(file, parent_ref,
                 PVFS2_LOOKUP_LINK_NO_FOLLOW, &file_ref);
-    if (rc == -1)
+    if (rc < 0)
     {
         goto errorout;
     }
     rc = iocommon_getattr(file_ref, &attr);
-    if (rc == -1)
+    if (rc < 0)
     {
         goto errorout;
     }
-    if ((attr.objtype & PVFS_TYPE_DIRECTORY) && dirflag)
+    if ((attr.objtype & PVFS_TYPE_DIRECTORY) && !dirflag)
     {
         errno = EISDIR;
         goto errorout;
     }
-    else if (!(attr.objtype & PVFS_TYPE_DIRECTORY) && !dirflag)
+    else if (!(attr.objtype & PVFS_TYPE_DIRECTORY) && dirflag)
     {
         errno = ENOTDIR;
@@ -572 +590 @@
     }
 
+    /* should check to see if any process has file open */
     rc = PVFS_sys_remove(file, parent_ref, credentials, PVFS_HINT_NULL);
 
@@ -583 +602 @@
         free(file);
     }
-    if (rc == -1)
+    if (rc < 0)
     {
         return -1;
@@ -593 +612 @@
 }
 
+/**
+ * wrapper for unlink
+ */
 int iocommon_unlink(const char *pathname,
                     PVFS_object_ref *pdir)
 {
-    return iocommon_remove(pathname, pdir, 1);
-}
-
+    return iocommon_remove(pathname, pdir, 0);
+}
+
+/**
+ * wrapper for rmdir
+ */
 int iocommon_rmdir(const char *pathname,
                    PVFS_object_ref *pdir)
 {
-    return iocommon_remove(pathname, pdir, 0);
+    return iocommon_remove(pathname, pdir, 1);
 }
 
@@ -620 +645 @@
 
     iocommon_cred(&creds);
-    rc = split_pathname(oldpath, &olddir, &oldname);
-    if (rc == -1)
+    rc = split_pathname(oldpath, 0, &olddir, &oldname);
+    if (rc < 0)
     {
         return -1;
     }
-    if (!olddir)
+    if (!oldpdir)
     {
         rc = iocommon_lookup_absolute(olddir, &oldref);
-        if (rc == -1)
+        if (rc < 0)
         {
             goto errorout;
@@ -635 +660 @@
     else
     {
-        if (!olddir)
+        if (olddir)
         {
             rc = iocommon_lookup_relative(olddir, *oldpdir, 
                                 PVFS2_LOOKUP_LINK_FOLLOW, &oldref);
-            if (rc == -1)
+            if (rc < 0)
             {
                 goto errorout;
@@ -649 +674 @@
         }
     }
-    rc = split_pathname(newpath, &olddir, &oldname);
-    if (rc == -1)
+    rc = split_pathname(newpath, 0, &newdir, &newname);
+    if (rc < 0)
     {
         goto errorout;
@@ -657 +682 @@
     {
         rc = iocommon_lookup_absolute(newdir, &newref);
-        if (rc == -1)
+        if (rc < 0)
         {
             goto errorout;
@@ -664 +689 @@
     else
     {
-        if (!olddir)
+        if (newdir)
         {
             rc = iocommon_lookup_relative(newdir, *newpdir,
                             PVFS2_LOOKUP_LINK_FOLLOW, &newref);
-            if (rc == -1)
+            if (rc < 0)
             {
                 goto errorout;
@@ -847 +872 @@
 }
 
-/* WBL - question - should attr not be a pointer */
 int iocommon_setattr(PVFS_object_ref obj, PVFS_sys_attr *attr)
 {
@@ -963 +987 @@
     {
         attr.owner = owner;
+        attr.mask |= PVFS_ATTR_SYS_UID;
     }
     if (owner != -1)
     {
         attr.group = group;
-    }
-    attr.mask = PVFS_ATTR_SYS_UID | PVFS_ATTR_SYS_GID;
+        attr.mask |= PVFS_ATTR_SYS_GID;
+    }
 
     rc = iocommon_setattr(pd->pvfs_ref, &attr);
@@ -979 +1004 @@
     int                  rc = 0;
     PVFS_sys_attr        attr;
+
+    /* Initialize */
+    memset(&attr, 0, sizeof(attr));
 
     attr.perms = mode & 07777; /* mask off any stray bits */
@@ -1007 +1035 @@
     memset(&resp_mkdir,  0, sizeof(resp_mkdir));
 
+    pvfs_sys_init();
     iocommon_cred(&credentials);
 
-    rc = split_pathname(pvfs_path, &parentdir, &filename);
-    if (rc == -1)
+    rc = split_pathname(pvfs_path, 1, &parentdir, &filename);
+    if (rc < 0)
     {
         return -1;
@@ -1021 +1050 @@
     {
         rc = iocommon_lookup_absolute(parentdir, &parent_ref);
-        if (rc == -1)
+        if (rc < 0)
         {
             goto errorout;
@@ -1028 +1057 @@
     else
     {
-        if (!parentdir)
+        if (parentdir)
         {
             rc = iocommon_lookup_relative(parentdir, *pdir,
                             PVFS2_LOOKUP_LINK_FOLLOW, &parent_ref);
-            if (rc == -1)
+            if (rc < 0)
             {
                 goto errorout;
@@ -1044 +1073 @@
    
     /* Set the attributes for the new directory */
-    attr.owner = (int)getuid;
-    attr.group = (int)getgid;
-    attr.perms = mode;
+    attr.owner = geteuid();
+    attr.group = getegid();
+    attr.perms = mode & 07777; /* mask off stray bits */
     attr.mask = (PVFS_ATTR_SYS_ALL_SETABLE);
 
@@ -1108 +1137 @@
     memset(&resp_symlink,0, sizeof(resp_symlink));
 
+    pvfs_sys_init();
     iocommon_cred(&credentials);
 
 
-    rc = split_pathname(pvfs_path, &parentdir, &filename);
-    if (rc == -1)
+    rc = split_pathname(pvfs_path, 0, &parentdir, &filename);
+    if (rc < 0)
     {
         return -1;
@@ -1123 +1153 @@
     {
         rc = iocommon_lookup_absolute(parentdir, &parent_ref);
-        if (rc == -1)
+        if (rc < 0)
         {
             goto errorout;
@@ -1130 +1160 @@
     else
     {
-        if (!parentdir)
+        if (parentdir)
         {
             rc = iocommon_lookup_relative(parentdir, *pdir,
                             PVFS2_LOOKUP_LINK_FOLLOW, &parent_ref);
-            if (rc == -1)
+            if (rc < 0)
             {
                 goto errorout;
@@ -1206 +1236 @@
                           &readdir_resp,
                           NULL);
-    if(rc == -1)
+    if(rc < 0)
     {
         return -1;
     }
     pd->token = readdir_resp.token;
-    name_max = MIN(NAME_MAX, PVFS_NAME_MAX);
+    name_max = PVFS_util_min(NAME_MAX, PVFS_NAME_MAX);
     while(readdir_resp.pvfs_dirent_outcount--)
     {
@@ -1218 +1248 @@
         dirp->d_off = pd->file_pointer;
         dirp->d_reclen = sizeof(PVFS_dirent);
-        memncpy(dirp->d_name, readdir_resp.dirent_array[i].d_name, name_max);
+        memcpy(dirp->d_name, readdir_resp.dirent_array[i].d_name, name_max);
         dirp->d_name[name_max] = 0;
         pd->file_pointer += sizeof(PVFS_dirent);
@@ -1278 +1308 @@
 
     /* Initialize the system interface for this process */
-    iocommon_ensure_init();
+    pvfs_sys_init();
     iocommon_cred(&credentials);
 
-    rc = split_pathname(pvfs_path, &parentdir, &file);
-    if (rc == -1)
+    rc = split_pathname(pvfs_path, 0, &parentdir, &file);
+    if (rc < 0)
     {
         return -1;
@@ -1290 +1320 @@
     {
         rc = iocommon_lookup_absolute(parentdir, &parent_ref);
-        if (rc == -1)
+        if (rc < 0)
         {
             goto errorout;
@@ -1297 +1327 @@
     else
     {
-        if (!parentdir)
+        if (parentdir)
         {
             rc = iocommon_lookup_relative(parentdir, *pdir,
                             PVFS2_LOOKUP_LINK_FOLLOW, &parent_ref);
-            if (rc == -1)
+            if (rc < 0)
             {
                 goto errorout;

branches/Orange-Branch/src/client/usrint/iocommon.h

@@ -68 +68 @@
                                mode_t file_permission,
                                PVFS_object_ref *pdir);
+
+int iocommon_truncate(PVFS_object_ref file_ref, off64_t length);
 
 off64_t iocommon_lseek(pvfs_descriptor *pd, off64_t offset, PVFS_size unit_size, int whence);

branches/Orange-Branch/src/client/usrint/openfile-util.c

@@ -14 +14 @@
 #include <posix-ops.h>
 #include <openfile-util.h>
-
-static int pvfs_is_sys_initialized = 0; 
 
 #define PREALLOC 3
@@ -22 +20 @@
 static int next_descriptor = 0; 
 static pvfs_descriptor **descriptor_table; 
+static char rstate[256];  /* used for random number generation */
+
+posix_ops glibc_ops;
 
 pvfs_descriptor pvfs_stdin =
@@ -65 +66 @@
 };
 
+void load_glibc(void)
+{ 
+    glibc_ops.open = dlsym(RTLD_NEXT, "open");
+    glibc_ops.open64 = dlsym(RTLD_NEXT, "open64");
+    glibc_ops.openat = dlsym(RTLD_NEXT, "openat");
+    glibc_ops.openat64 = dlsym(RTLD_NEXT, "openat64");
+    glibc_ops.creat = dlsym(RTLD_NEXT, "creat");
+    glibc_ops.creat64 = dlsym(RTLD_NEXT, "creat64");
+    glibc_ops.unlink = dlsym(RTLD_NEXT, "unlink");
+    glibc_ops.unlinkat = dlsym(RTLD_NEXT, "unlinkat");
+    glibc_ops.rename = dlsym(RTLD_NEXT, "rename");
+    glibc_ops.renameat = dlsym(RTLD_NEXT, "renameat");
+    glibc_ops.read = dlsym(RTLD_NEXT, "read");
+    glibc_ops.pread = dlsym(RTLD_NEXT, "pread");
+    glibc_ops.readv = dlsym(RTLD_NEXT, "readv");
+    glibc_ops.pread64 = dlsym(RTLD_NEXT, "pread64");
+    glibc_ops.write = dlsym(RTLD_NEXT, "write");
+    glibc_ops.pwrite = dlsym(RTLD_NEXT, "pwrite");
+    glibc_ops.writev = dlsym(RTLD_NEXT, "writev");
+/*  glibc_ops.write64 = dlsym(RTLD_NEXT, "write64"); */
+    glibc_ops.lseek = dlsym(RTLD_NEXT, "lseek");
+    glibc_ops.lseek64 = dlsym(RTLD_NEXT, "lseek64");
+    glibc_ops.truncate = dlsym(RTLD_NEXT, "truncate");
+    glibc_ops.truncate64 = dlsym(RTLD_NEXT, "truncate64");
+    glibc_ops.ftruncate = dlsym(RTLD_NEXT, "ftruncate");
+    glibc_ops.ftruncate64 = dlsym(RTLD_NEXT, "ftruncate64");
+    glibc_ops.close = dlsym(RTLD_NEXT, "close");
+    glibc_ops.flush = dlsym(RTLD_NEXT, "flush");
+    glibc_ops.stat = dlsym(RTLD_NEXT, "stat");
+    glibc_ops.stat64 = dlsym(RTLD_NEXT, "stat64");
+    glibc_ops.fstat = dlsym(RTLD_NEXT, "fstat");
+    glibc_ops.fstat64 = dlsym(RTLD_NEXT, "fstat64");
+    glibc_ops.fstatat = dlsym(RTLD_NEXT, "fstatat");
+    glibc_ops.fstatat64 = dlsym(RTLD_NEXT, "fstatat64");
+    glibc_ops.lstat = dlsym(RTLD_NEXT, "lstat");
+    glibc_ops.lstat64 = dlsym(RTLD_NEXT, "lstat64");
+    glibc_ops.dup = dlsym(RTLD_NEXT, "dup");
+    glibc_ops.dup2 = dlsym(RTLD_NEXT, "dup2");
+    glibc_ops.chown = dlsym(RTLD_NEXT, "chown");
+    glibc_ops.fchown = dlsym(RTLD_NEXT, "fchown");
+    glibc_ops.fchownat = dlsym(RTLD_NEXT, "fchownat");
+    glibc_ops.lchown = dlsym(RTLD_NEXT, "lchown");
+    glibc_ops.chmod = dlsym(RTLD_NEXT, "chmod");
+    glibc_ops.fchmod = dlsym(RTLD_NEXT, "fchmod");
+    glibc_ops.fchmodat = dlsym(RTLD_NEXT, "fchmodat");
+    glibc_ops.lchmod = dlsym(RTLD_NEXT, "lchmod");
+    glibc_ops.mkdir = dlsym(RTLD_NEXT, "mkdir");
+    glibc_ops.mkdirat = dlsym(RTLD_NEXT, "mkdirat");
+    glibc_ops.rmdir = dlsym(RTLD_NEXT, "rmdir");
+    glibc_ops.readlink = dlsym(RTLD_NEXT, "readlink");
+    glibc_ops.readlinkat = dlsym(RTLD_NEXT, "readlinkat");
+    glibc_ops.symlink = dlsym(RTLD_NEXT, "symlink");
+    glibc_ops.symlinkat = dlsym(RTLD_NEXT, "symlinkat");
+    glibc_ops.link = dlsym(RTLD_NEXT, "link");
+    glibc_ops.linkat = dlsym(RTLD_NEXT, "linkat");
+    glibc_ops.readdir = dlsym(RTLD_NEXT, "readdir");
+    glibc_ops.getdents = dlsym(RTLD_NEXT, "getdents");
+    glibc_ops.access = dlsym(RTLD_NEXT, "access");
+    glibc_ops.faccessat = dlsym(RTLD_NEXT, "faccessat");
+    glibc_ops.flock = dlsym(RTLD_NEXT, "flock");
+    glibc_ops.fcntl = dlsym(RTLD_NEXT, "fcntl");
+    glibc_ops.sync = dlsym(RTLD_NEXT, "sync");
+    glibc_ops.fsync = dlsym(RTLD_NEXT, "fsync");
+    glibc_ops.fdatasync = dlsym(RTLD_NEXT, "fdatasync");
+    glibc_ops.umask = dlsym(RTLD_NEXT, "umask");
+    glibc_ops.getumask = dlsym(RTLD_NEXT, "getumask");
+    glibc_ops.getdtablesize = dlsym(RTLD_NEXT, "getdtablesize");
+}
 
 /* 
@@ -70 +139 @@
  */ 
 
-int pvfs_sys_init() { 
+void pvfs_sys_init(void) { 
         struct rlimit rl; 
         int rc; 
-
-        /* initalize the file system */ 
-        PVFS_util_init_defaults(); 
+    static int pvfs_lib_init_flag = 0; 
+
+    if (pvfs_lib_init_flag)
+    {
+        return;
+    }
+    pvfs_lib_init_flag = 1; /* should only run this once */
+
+    /* this allows system calls to run */
+    load_glibc();
 
         rc = getrlimit(RLIMIT_NOFILE, &rl); 
         /* need to check for "INFINITY" */
 
+    /* set up descriptor table */
         descriptor_table_size = rl.rlim_max;
         descriptor_table =
@@ -89 +166 @@
     descriptor_table[1] = &pvfs_stdout;
     descriptor_table[2] = &pvfs_stderr;
+    descriptor_table_count = PREALLOC;
         next_descriptor = PREALLOC;
 
-        /* Mark the initialization complete */ 
-        pvfs_is_sys_initialized = 1; 
-        return PVFS_FD_SUCCESS; 
+        /* initalize PVFS */ 
+        PVFS_util_init_defaults(); 
+
+    /* call other initialization routines */
+    PINT_initrand();
 }
 
@@ -100 +180 @@
     return descriptor_table_size;
 }
-
 
 /*
@@ -109 +188 @@
  {
         int i; 
+    if (fsops == NULL)
+    {
+        errno = EINVAL;
+        return NULL;
+    }
+    pvfs_sys_init();
+
+    /* table should be initialized now - check for available slot */
         if (descriptor_table_count == (descriptor_table_size - PREALLOC))
         {
+        errno = ENOMEM;
                 return NULL;
         }
@@ -116 +204 @@
    /* find next empty slot in table */
         for (i = next_descriptor; descriptor_table[i];
-                        i = (i == descriptor_table_size - 1) ? PREALLOC : i++);
+                        i = (i == descriptor_table_size - 1) ? PREALLOC : i + 1);
 
    /* found a slot */
@@ -124 +212 @@
                 return NULL;
         }
-        next_descriptor = ((i == descriptor_table_size - 1) ? PREALLOC : i++);
+        next_descriptor = ((i == descriptor_table_size - 1) ? PREALLOC : i + 1);
         descriptor_table_count++;
 
@@ -140 +228 @@
         descriptor_table[i]->is_in_use = PVFS_FS;
 
-   return descriptor_table[i];
+    return descriptor_table[i];
 }
 
@@ -148 +236 @@
 int pvfs_dup_descriptor(int oldfd, int newfd)
 {
+    if (oldfd < 0 || oldfd >= descriptor_table_size)
+    {
+        errno = EBADF;
+        return -1;
+    }
     if (newfd == -1)
     {
@@ -174 +267 @@
 pvfs_descriptor *pvfs_find_descriptor(int fd)
 {
+    if (fd < 0 || fd >= descriptor_table_size)
+    {
+        errno = EBADF;
+        return NULL;
+    }
         return descriptor_table[fd];
 }
@@ -181 +279 @@
     pvfs_descriptor *pd;
 
+    if (fd < 0 || fd >= descriptor_table_size)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = descriptor_table[fd];
 
@@ -187 +290 @@
 
         /* keep up with used descriptors */
-        descriptor_table_count++;
+        descriptor_table_count--;
 
     /* check if last copy */
@@ -251 +354 @@
 }
 
-/* 
- *Determines if a path is part of a PVFS Filesystem 
+/**
+ * Determines if a path is part of a PVFS Filesystem 
+ *
+ * returns 1 if PVFS 0 otherwise
  */
 
@@ -261 +366 @@
     char *str;
 
+    pvfs_sys_init();
+    memset(&file_system, 0, sizeof(file_system));
+    /* add current working dir to front of relative path */
+    /* and copy to temp string working area */
     if(path[0] != '/')
     {
@@ -282 +391 @@
     }
 
+    /* lop off the last segment of the path */
     int count;
     for(count = strlen(str) -2; count > 0; count--)
@@ -296 +406 @@
     if(file_system.f_type == PVFS_FS)
     {
-#ifdef DEBUG
-       printf("IS PVFS_PATH\n");
-#endif
-       return true;
-    }
-    else if(file_system.f_type == LINUX_FS)
-    {
-#ifdef DEBUG
-        printf("IS NOT PVFS_PATH\n");
-#endif
-        return false;
+        return 1;
     }
     else
     {
-        printf("NO A LINUX OR PVFS FILE SYSTEM!! (BAILING OUT!!!)\n");
-        exit(1);
+        /* not PVFS assume the kernel can handle it */
+        return 0;
     }
 }
@@ -328 +428 @@
  * If non-null is passed as the directory or filename,
  * the field will be allocated and filled with the correct value
+ *
+ * A slash at the end of the path is interpreted as no filename
+ * and is an error.  To parse the last dir in a path, remove this
+ * trailing slash.  No filename with no directory is OK.
  */
 int split_pathname( const char *path,
+                    int dirflag,
                     char **directory,
                     char **filename)
 {
-    int i;
+    int i, slashes = 0;
     int length = strlen("pvfs2");
 
@@ -347 +452 @@
     }
     /* Split path into a directory and filename */
-    length = strlen(path);
-    for (i = length - 1; i >= 0; --i)
+    length = strnlen(path, PVFS_NAME_MAX);
+    if (length == PVFS_NAME_MAX)
+    {
+        errno = ENAMETOOLONG;
+        return -1;
+    }
+    i = length - 1;
+    if (dirflag)
+    {
+        /* skip any trailing slashes */
+        for(; i >= 0 && path[i] == '/'; i--)
+        {
+            slashes++;
+        }
+    }
+    for (; i >= 0; i--)
     {
         if (path[i] == '/')
@@ -367 +486 @@
         /* found no '/' path is all filename */
         *directory = NULL;
-        i++;
-    }
+    }
+    i++;
     /* copy the filename */
-    *filename = malloc(length - i + 1);
+    fnlen = length - i - slashes
+    if (fnlen == 0)
+    {
+        filename = NULL;
+        if (!directory)
+        {
+            errno = EISDIR;
+        }
+        else
+        {
+            errno = ENOENT;
+        }
+        return = -1;
+    }
+    /* check flag to see if there are slashes to skip */
+    *filename = malloc(fnlen + 1);
     if (!*filename)
     {
@@ -381 +515 @@
         return -1;
     }
-    strncpy(*filename, path + i + 1, length - i);
+    strncpy(*filename, path + i, length - i);
     (*filename)[length - i] = '\0';
     return 0;
+}
+
+void PINT_initrand(void)
+{
+    static int init_called = 0;
+    pid_t pid;
+    uid_t uid;
+    gid_t gid;
+    struct timeval time;
+    char *oldstate;
+    unsigned int seed;
+
+    if (init_called)
+    {
+        return;
+    }
+    init_called = 1;
+    pid = getpid();
+    uid = getuid();
+    gid = getgid();
+    gettimeofday(&time, NULL);
+    seed = (((pid << 16) ^ uid) ^ (gid << 8)) ^ time.tv_usec;
+    oldstate = initstate(seed, rstate, 256);
+    setstate(oldstate);
+}
+
+long int PINT_random(void)
+{
+    char *oldstate;
+    long int rndval;
+
+    PINT_initrand();
+    oldstate = setstate(rstate);
+    rndval = random();
+    setstate(oldstate);
+    return rndval;
 }
 

branches/Orange-Branch/src/client/usrint/openfile-util.h

@@ -19 +19 @@
 int split_pathname( const char *path, char **directory, char **filename);
 
-int pvfs_sys_init(); 
+void pvfs_sys_init(void); 
 
 char *pvfs_qualify_path(const char *path);
@@ -52 +52 @@
                             PVFS_object_ref parent_ref,
                             PVFS_object_ref *ref);
+
+void PINT_initrand(void);
+
+long int PINT_random(void);
 #endif

branches/Orange-Branch/src/client/usrint/posix-pvfs.c

@@ -43 +43 @@
     pvfs_descriptor *pd;
 
+    if (!path)
+    {
+        errno = EINVAL;
+        return -1;
+    }
     va_start(ap, flags);
     if (flags & O_CREAT)
@@ -77 +82 @@
     PVFS_hint hints;
 
+    if (!path)
+    {
+        errno = EINVAL;
+        return -1;
+    }
     va_start(ap, flags);
     if (flags & O_CREAT)
@@ -109 +119 @@
     pvfs_descriptor *dpd, *fpd;
 
+    if (!path)
+    {
+        errno - EINVAL;
+        return -1;
+    }
     va_start(ap, flags);
     if (flags & O_CREAT)
@@ -133 +148 @@
     else
     {
+        if (dirfd < 0)
+        {
+            errno = EBADF;
+            return -1;
+        }
         dpd = pvfs_find_descriptor(dirfd);
         if (!dpd)
@@ -139 +159 @@
         }
         fpd = iocommon_open(path, flags, hints, mode, &dpd->pvfs_ref);
+        if (!fpd)
+        {
+            return -1;
+        }
         return fpd->fd;
     }
@@ -153 +177 @@
     pvfs_descriptor *pd;
 
+    if (dirfd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     va_start(ap, flags);
     if (flags & O_CREAT)
@@ -214 +243 @@
     {
         int flags = O_RDONLY;
+        if (dirfd < 0)
+        {
+            errno = EBADF;
+            return -1;
+        }       
         pd = pvfs_find_descriptor(dirfd);
         rc = iocommon_unlink(path, &pd->pvfs_ref);
@@ -252 +286 @@
     char *absoldpath, *absnewpath;
 
+    if (!oldpath || !newpath)
+    {
+        errno = EINVAL;
+        return -1;
+    }
     if (oldpath[0] != '/')
     {
+        if (olddirfd < 0)
+        {
+            errno = EBADF;
+            return -1;
+        }
         olddes = pvfs_find_descriptor(olddirfd);
         absoldpath = (char *)oldpath;
@@ -264 +308 @@
     if (oldpath[0] != '/')
     {
+        if (newdirfd < 0)
+        {
+            errno = EBADF;
+            return -1;
+        }
         newdes = pvfs_find_descriptor(newdirfd);
         absnewpath = (char *)newpath;
@@ -292 +341 @@
     int rc;
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pvfs_descriptor *pd = pvfs_find_descriptor(fd);
     if (!pd)
@@ -336 +390 @@
 {
     int rc;
+
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pvfs_descriptor *pd = pvfs_find_descriptor(fd);
     if (!pd)
@@ -460 +520 @@
     pvfs_descriptor* pd;
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     /* Find the descriptor */
     pd = pvfs_find_descriptor(fd);
@@ -489 +554 @@
     pvfs_descriptor *pd;
 
+    if (!path)
+    {
+        errno = EINVAL;
+        return -1;
+    }
     pd = iocommon_open(path, O_WRONLY, PVFS_HINT_NULL, 0 , NULL);
     if (!pd)
@@ -514 +584 @@
     pvfs_descriptor *pd;
     
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     if (!pd)
@@ -533 +608 @@
     pvfs_descriptor* pd;
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     if (!pd)
@@ -560 +640 @@
 #endif
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     /* Find the descriptor */
     pd = pvfs_find_descriptor(fd);
@@ -620 +705 @@
     pvfs_descriptor *pd;
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     return iocommon_stat(pd, buf);
@@ -631 +721 @@
     pvfs_descriptor *pd;
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     return iocommon_stat64(pd, buf);
@@ -660 +755 @@
         {
             flags |= O_NOFOLLOW;
+        }
+        if (fd < 0)
+        {
+            errno = EBADF;
+            return -1;
         }
         pd = pvfs_find_descriptor(fd);
@@ -698 +798 @@
         {
             flags |= O_NOFOLLOW;
+        }
+        if (fd < 0)
+        {
+            errno = EBADF;
+            return -1;
         }
         pd = pvfs_find_descriptor(fd);
@@ -790 +895 @@
     pvfs_descriptor *pd;
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     return iocommon_chown(pd, owner, group);
@@ -819 +929 @@
         {
             flags |= O_NOFOLLOW;
+        }
+        if (fd < 0)
+        {
+            errno = EBADF;
+            return -1;
         }
         pd = pvfs_find_descriptor(fd);
@@ -879 +994 @@
     pvfs_descriptor *pd;
 
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     return iocommon_chmod(pd, mode);
@@ -908 +1028 @@
         {
             flags |= O_NOFOLLOW;
+        }
+        if (fd < 0)
+        {
+            errno = EBADF;
+            return -1;
         }
         pd = pvfs_find_descriptor(fd);
@@ -974 +1099 @@
     else
     {
+        if (dirfd < 0)
+        {
+            errno = EBADF;
+            return -1;
+        }
         pd = pvfs_find_descriptor(dirfd);
         rc = iocommon_make_directory(path,
@@ -1033 +1163 @@
     {
         int flags = O_RDONLY | O_NOFOLLOW;
+        if (fd < 0)
+        {
+            errno = EBADF;
+            return -1;
+        }
         pd = pvfs_find_descriptor(fd);
         if (!pd)
@@ -1057 +1192 @@
 {
     pvfs_descriptor *pd;
+    if (newdirfd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(newdirfd);
     return iocommon_symlink(newpath, oldpath, &pd->pvfs_ref);
@@ -1090 +1230 @@
 {
     pvfs_descriptor *pd;
+
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     return iocommon_getdents(pd, dirp, count);
@@ -1102 +1248 @@
 {
     pvfs_descriptor *pd;
+
+    if (fd < 0)
+    {
+        errno = EBADF;
+        return -1;
+    }
     pd = pvfs_find_descriptor(fd);
     return iocommon_access(path, mode, flags, &pd->pvfs_ref);

branches/Orange-Branch/src/client/usrint/posix.c

@@ -15 +15 @@
 #include <posix-pvfs.h>
 #include <openfile-util.h>
-
-static int pvfs_lib_init = 0; 
-
-posix_ops glibc_ops =
-{
-    .statfs = statfs
-};
-
-void load_glibc(void)
-{ 
-    pvfs_lib_init = 1; 
-    glibc_ops.open = dlsym(RTLD_NEXT, "open");
-    glibc_ops.open64 = dlsym(RTLD_NEXT, "open64");
-    glibc_ops.unlink = dlsym(RTLD_NEXT, "unlink");
-    glibc_ops.close = dlsym(RTLD_NEXT, "close");
-    glibc_ops.read = dlsym(RTLD_NEXT, "read");
-    glibc_ops.write = dlsym(RTLD_NEXT, "write");
-    glibc_ops.lseek = dlsym(RTLD_NEXT, "lseek");
-    glibc_ops.lseek64 = dlsym(RTLD_NEXT, "lseek64");
-    glibc_ops.pread = dlsym(RTLD_NEXT, "pread"); 
-    glibc_ops.pwrite = dlsym(RTLD_NEXT, "pwrite"); 
-    glibc_ops.readv = dlsym(RTLD_NEXT, "readv"); 
-    glibc_ops.writev = dlsym(RTLD_NEXT, "writev"); 
-}
 
 /*
@@ -54 +30 @@
     pvfs_descriptor *pd;
     
-    if(!pvfs_lib_init) { 
-        load_glibc(); 
-    }
-
     va_start(ap, flags); 
     if (flags & O_CREAT)
@@ -69 +41 @@
     va_end(ap); 
 
-    if(is_pvfs_path(path)) { 
-#ifdef DEBUG
-        printf("PVFS_OPEN\n"); 
-#endif
+    if (is_pvfs_path(path))
+    { 
         return pvfs_open(path, flags, mode, hints);
     }
-    else {
-#ifdef DEBUG
-        printf("GLIBC_OPEN\n"); 
-#endif
+    else
+    {
         pd = pvfs_alloc_descriptor(&glibc_ops);
         pd->posix_fd = pd->fsops->open(path, flags, mode);
@@ -96 +64 @@
     PVFS_hint hints;  /* need to figure out how to set default */
     
-    if(!pvfs_lib_init) { 
-        load_glibc(); 
-    }
-
     va_start(ap, flags); 
     if (flags & O_HINTS)
@@ -123 +87 @@
 int creat(const char *path, mode_t mode)
 { 
-    if(!pvfs_lib_init) { 
-        load_glibc(); 
-    }
-
     return open(path, O_CREAT|O_WRONLY|O_TRUNC, mode); 
 }
@@ -135 +95 @@
 int creat64(const char *path, mode_t mode)
 { 
-    if(!pvfs_lib_init) { 
-        load_glibc(); 
-    }
-
     return open64(path, O_CREAT|O_WRONLY|O_TRUNC, mode); 
 }
@@ -147 +103 @@
 int unlink(const char *path)
 {
-    if (!pvfs_lib_init) {
-        load_glibc();
-    }
     if (is_pvfs_path(path)) {
-#ifdef DEBUG
-        pvfs_debug("unlink: calling pvfs_unlink\n");
-#endif
         return pvfs_ops.unlink(path);
     }
     else {
-#ifdef DEBUG
-        pvfs_debug("unlink: calling glibc_ops.unlink\n");
-#endif
         return glibc_ops.unlink(path);
     }
@@ -517 +464 @@
 {
     return lstat64(path, buf);
+}
+
+int getdents(unsigned int fd, struct dirent *dirp, unsigned int count)
+{
+    return -1;
 }
 

branches/Orange-Branch/src/client/usrint/stdio.c

@@ -38 +38 @@
 #define DIRBUFSIZE (512*1024)
 #define ASIZE 256
+#define MAXTRIES 16 /* arbitrary - how many tries to get a unique file name */
 
 /** This function coverts from stream style mode to ssycall style flags
@@ -1100 +1101 @@
  * mkdtemp makes a temp dir and returns an fd 
  */
-char * mkdtemp(char *template)
-{
-    char *rc = NULL;
+char *mkdtemp(char *template)
+{
     int fd;
+    int len;
+    int rnum;
+    int try;
+
     if (!template)
     {
@@ -1109 +1113 @@
         return NULL;
     }
-    rc = mktemp(template);
-    if (rc == NULL)
-    {
+    len = strlen(template);
+    if (!strncmp(&template[len-6],"XXXXXX",6))
+    {
+        errno = EINVAL;
         return NULL;
     }
-    fd = mkdir(template, 0600);
-    if (fd < 0)
-    {
-        return NULL;
+    for(try = 0; try < MAXTRIES; try++)
+    {
+        rnum = PINT_random() % 1000000;
+        sprintf(&template[len-6],"%06d", rnum);
+        fd = mkdir(template, 0700);
+        if (fd < 0)
+        {
+            if (errno == EEXIST)
+            {
+                continue;
+            }
+            return NULL;
+        }
     }
     return template;
@@ -1127 +1141 @@
 int mkstemp(char *template)
 {
-    char *ret;
     int fd;
+    int len;
+    int rnum;
+    int try;
+
     if (!template)
     {
@@ -1134 +1151 @@
         return -1;
     }
-    ret = mktemp(template);
-    if (ret == NULL)
-    {
-        return -1;
-    }
-    fd = open(template, O_RDWR|O_EXCL|O_CREAT, 0600);
+    len = strlen(template);
+    if (!strncmp(&template[len-6],"XXXXXX",6))
+    {
+        errno = EINVAL;
+        return -1;
+    }
+    for(try = 0; try < MAXTRIES; try++)
+    {
+        rnum = PINT_random() % 1000000;
+        sprintf(&template[len-6],"%06d", rnum);
+        fd = open(template, O_RDWR|O_EXCL|O_CREAT, 0600);
+        if (fd < 0)
+        {
+            if (errno == EEXIST)
+            {
+                continue;
+            }
+            return -1;
+        }
+    }
     return fd;
 }
@@ -1261 +1292 @@
         int bytes_read;
         /* read a block of dirents into the buffer */
-        bytes_read = getdents64(dir->fileno, dir->buf_base,
-                               (dir->buf_end - dir->buf_base));
+        bytes_read = getdents(dir->fileno, dir->buf_base,
+                             (dir->buf_end - dir->buf_base));
         dir->buf_act = dir->buf_base + bytes_read;
         dir->buf_ptr = dir->buf_base;

branches/Orange-Branch/src/client/usrint/usrint.h

@@ -59 +59 @@
 #define O_NOFOLLOW 0
 #endif
-#define max(x, y) (((x) > (y)) ? (x) : (y))
 #define true   1 
 #define false  0 

branches/Orange-Branch/src/common/misc/pint-perf-counter.c

@@ -52 +52 @@
     {"request scheduler", PINT_PERF_REQSCHED, PINT_PERF_PRESERVE},
     {"requests received ", PINT_PERF_REQUESTS, PINT_PERF_PRESERVE},
+    {"bytes read by small_io", PINT_PERF_SMALL_READ, PINT_PERF_PRESERVE},
+    {"bytes written by small_io", PINT_PERF_SMALL_WRITE, PINT_PERF_PRESERVE},
+    {"bytes read by flow", PINT_PERF_FLOW_READ, PINT_PERF_PRESERVE},
+    {"bytes written by flow", PINT_PERF_FLOW_WRITE, PINT_PERF_PRESERVE},
     {NULL, 0, 0},
 };
@@ -228 +232 @@
                         enum PINT_perf_ops op)
 {
+#if 0
     int64_t tmp; /* this is for debugging purposes */
+#endif
 
     if(!pc || !pc->sample || !pc->sample->value)
@@ -238 +244 @@
     gen_mutex_lock(&pc->mutex);
 
+#if 0
     tmp = pc->sample->value[key];
+#endif
 
     if(key >= pc->key_count)
     {
         gossip_err("Error: PINT_perf_count(): invalid key.\n");
-        return;
+        goto errorout;
     }
 
@@ -265 +273 @@
 #endif
 
+errorout:
     gen_mutex_unlock(&pc->mutex);
     return;

branches/Orange-Branch/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c

@@ -1067 +1067 @@
                     actual_size, 
                     PINT_PERF_ADD);
+    PINT_perf_count(PINT_server_pc,
+                    PINT_PERF_FLOW_READ, 
+                    actual_size, 
+                    PINT_PERF_ADD);
 
     flow_data->parent->total_transferred += actual_size;
@@ -1352 +1356 @@
     do{
         q_item->parent->total_transferred += result_tmp->result.bytes;
-        PINT_perf_count(
-            PINT_server_pc,
-            PINT_PERF_WRITE, 
-            result_tmp->result.bytes,
-            PINT_PERF_ADD);
+        PINT_perf_count( PINT_server_pc,
+                         PINT_PERF_WRITE, 
+                         result_tmp->result.bytes,
+                         PINT_PERF_ADD);
+        PINT_perf_count( PINT_server_pc,
+                         PINT_PERF_FLOW_WRITE, 
+                         result_tmp->result.bytes,
+                         PINT_PERF_ADD);
         old_result_tmp = result_tmp;
         result_tmp = result_tmp->next;

branches/Orange-Branch/src/io/trove/trove-mgmt.c

@@ -89 +89 @@
                      TROVE_method_callback method_callback,
                      char *data_path,
-                                 char *meta_path,
+                     char *meta_path,
                      TROVE_ds_flags flags)
 {

branches/Orange-Branch/src/server/small-io.sm

@@ -18 +18 @@
 #include "pint-distribution.h"
 #include "pint-request.h"
+#include "pint-perf-counter.h"
 
 %%
@@ -232 +233 @@
         }
     }
+    if(s_op->req->u.small_io.io_type == PVFS_IO_READ)
+    {
+        PINT_perf_count(PINT_server_pc,
+                        PINT_PERF_READ,
+                        s_op->resp.u.small_io.result_size,
+                        PINT_PERF_ADD);
+        PINT_perf_count(PINT_server_pc,
+                        PINT_PERF_SMALL_READ,
+                        s_op->resp.u.small_io.result_size,
+                        PINT_PERF_ADD);
+    }
+    else
+    {
+        PINT_perf_count(PINT_server_pc,
+                        PINT_PERF_WRITE,
+                        s_op->resp.u.small_io.result_size,
+                        PINT_PERF_ADD);
+        PINT_perf_count(PINT_server_pc,
+                        PINT_PERF_SMALL_WRITE,
+                        s_op->resp.u.small_io.result_size,
+                        PINT_PERF_ADD);
+    }
 
     return SM_ACTION_COMPLETE;