Changeset 8397 for branches/cu-security-branch/test/io/bmi/bench-initialize.c

Timestamp:

06/18/10 20:02:50 (3 years ago)

Author:

nlmills

Message:

initial merge with Orange-Branch. much will be broken

Location:

branches/cu-security-branch

Files:

• . (modified) (1 prop)
• test/io/bmi/bench-initialize.c (modified) (2 diffs)

branches/cu-security-branch

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

branches/cu-security-branch/test/io/bmi/bench-initialize.c

@@ -172 +172 @@
     if (flags & BMI_INIT_SERVER)
     {
-        ret = BMI_initialize(method, local_address, BMI_INIT_SERVER);
-    }
-    else
-    {
-
-        ret = BMI_initialize(method, NULL, 0);
+        ret = BMI_initialize(NULL, NULL, 0);
+    }
+    else
+    {
+
+        ret = BMI_initialize(NULL, NULL, 0);
     }
     if (ret < 0)
@@ -351 +351 @@
         ret = BMI_post_sendunexpected(&bmi_id, server_array[i], &ret,
                                       sizeof(int), BMI_EXT_ALLOC, 0, NULL,
-                                      context);
+                                      context, NULL);
         if (ret == 0)
         {

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk