Changeset 8556

Timestamp:

10/11/10 17:35:16 (3 years ago)

Author:

sampson

Message:

Porting BMI sockets

Location:

branches/windows-client

Files:

• include/pvfs2-types.h (modified) (1 diff)
• projects/OrangeFS/OrangeFS.sln (modified) (2 diffs)
• projects/OrangeFS/bmi (added)
• projects/OrangeFS/bmi/bmi.vcxproj (added)
• projects/OrangeFS/bmi_wintcp/bmi_wintcp.vcxproj (modified) (1 diff)
• projects/OrangeFS/test-bmi-client (added)
• projects/OrangeFS/test-bmi-client/test-bmi-client.vcxproj (added)
• projects/OrangeFS/test-bmi-server (added)
• projects/OrangeFS/test-bmi-server/test-bmi-server.vcxproj (added)
• src/common/quicklist/quicklist.h (modified) (1 diff)
• src/common/windows/wincommon.h (modified) (1 diff)
• src/io/bmi/bmi.c (modified) (11 diffs)
• src/io/bmi/bmi_wintcp/bmi-wintcp.c (modified) (1 diff)
• src/io/bmi/bmi_wintcp/socket-collection.c (modified) (1 diff)
• src/io/bmi/reference-list.h (modified) (1 diff)
• test/io/bmi/test-bmi-client.c (modified) (3 diffs)
• test/io/bmi/test-bmi-server.c (modified) (3 diffs)

branches/windows-client/include/pvfs2-types.h

@@ -21 +21 @@
 #ifdef WIN32
 #include "wincommon.h"
-/* define struct timeval */
-struct timeval 
-{
-    long tv_sec;
-    long tv_usec;
-};
 #else
 #include <sys/time.h>

branches/windows-client/projects/OrangeFS/OrangeFS.sln

@@ -21 +21 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "id-generator", "id-generator\id-generator.vcxproj", "{0CBAD436-373C-4F35-A620-2D46C12D8FE0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmi", "bmi\bmi.vcxproj", "{B7F1BEBC-F833-448A-829A-3505019C8169}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-bmi-client", "test-bmi-client\test-bmi-client.vcxproj", "{490C6444-6931-4D69-9EC0-B104920591ED}"
+        ProjectSection(ProjectDependencies) = postProject
+                {9C95DF0D-5B60-4E94-94ED-000861C651B4} = {9C95DF0D-5B60-4E94-94ED-000861C651B4}
+                {0CBAD436-373C-4F35-A620-2D46C12D8FE0} = {0CBAD436-373C-4F35-A620-2D46C12D8FE0}
+                {62A89A5C-1B78-40B7-BB6A-6E5A06DB06E1} = {62A89A5C-1B78-40B7-BB6A-6E5A06DB06E1}
+                {A7C0F968-DACA-4BFE-B36F-46FDAEB8EF1D} = {A7C0F968-DACA-4BFE-B36F-46FDAEB8EF1D}
+                {B7F1BEBC-F833-448A-829A-3505019C8169} = {B7F1BEBC-F833-448A-829A-3505019C8169}
+                {9138ABF9-041F-4A55-9E87-0F433719F4FC} = {9138ABF9-041F-4A55-9E87-0F433719F4FC}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-bmi-server", "test-bmi-server\test-bmi-server.vcxproj", "{AC842F24-4342-42D1-928D-19176B22917C}"
+        ProjectSection(ProjectDependencies) = postProject
+                {9C95DF0D-5B60-4E94-94ED-000861C651B4} = {9C95DF0D-5B60-4E94-94ED-000861C651B4}
+                {0CBAD436-373C-4F35-A620-2D46C12D8FE0} = {0CBAD436-373C-4F35-A620-2D46C12D8FE0}
+                {62A89A5C-1B78-40B7-BB6A-6E5A06DB06E1} = {62A89A5C-1B78-40B7-BB6A-6E5A06DB06E1}
+                {A7C0F968-DACA-4BFE-B36F-46FDAEB8EF1D} = {A7C0F968-DACA-4BFE-B36F-46FDAEB8EF1D}
+                {B7F1BEBC-F833-448A-829A-3505019C8169} = {B7F1BEBC-F833-448A-829A-3505019C8169}
+                {9138ABF9-041F-4A55-9E87-0F433719F4FC} = {9138ABF9-041F-4A55-9E87-0F433719F4FC}
+        EndProjectSection
 EndProject
 Global
@@ -50 +72 @@
                 {0CBAD436-373C-4F35-A620-2D46C12D8FE0}.Release|Win32.ActiveCfg = Release|Win32
                 {0CBAD436-373C-4F35-A620-2D46C12D8FE0}.Release|Win32.Build.0 = Release|Win32
+                {B7F1BEBC-F833-448A-829A-3505019C8169}.Debug|Win32.ActiveCfg = Debug|Win32
+                {B7F1BEBC-F833-448A-829A-3505019C8169}.Debug|Win32.Build.0 = Debug|Win32
+                {B7F1BEBC-F833-448A-829A-3505019C8169}.Release|Win32.ActiveCfg = Release|Win32
+                {B7F1BEBC-F833-448A-829A-3505019C8169}.Release|Win32.Build.0 = Release|Win32
+                {490C6444-6931-4D69-9EC0-B104920591ED}.Debug|Win32.ActiveCfg = Debug|Win32
+                {490C6444-6931-4D69-9EC0-B104920591ED}.Debug|Win32.Build.0 = Debug|Win32
+                {490C6444-6931-4D69-9EC0-B104920591ED}.Release|Win32.ActiveCfg = Release|Win32
+                {490C6444-6931-4D69-9EC0-B104920591ED}.Release|Win32.Build.0 = Release|Win32
+                {AC842F24-4342-42D1-928D-19176B22917C}.Debug|Win32.ActiveCfg = Debug|Win32
+                {AC842F24-4342-42D1-928D-19176B22917C}.Debug|Win32.Build.0 = Debug|Win32
+                {AC842F24-4342-42D1-928D-19176B22917C}.Release|Win32.ActiveCfg = Release|Win32
+                {AC842F24-4342-42D1-928D-19176B22917C}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

branches/windows-client/projects/OrangeFS/bmi_wintcp/bmi_wintcp.vcxproj

@@ -66 +66 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\src\io\bmi\bmi_wintcp\bmi-wintcp.c" />
+    <ClCompile Include="..\..\..\src\io\bmi\bmi_wintcp\socket-collection.c" />
     <ClCompile Include="..\..\..\src\io\bmi\bmi_wintcp\sockio.c" />
   </ItemGroup>

branches/windows-client/src/common/quicklist/quicklist.h

@@ -196 +196 @@
  * @member:     the name of the list_struct within the struct.
  */
-#define qlist_for_each_entry(pos, head, member)                         \
+#ifdef WIN32
+#define qlist_for_each_entry(pos, head, member, type)        \
+    for (pos = qlist_entry((head)->next, type, member);      \
+         &pos->member != (head);                             \
+         pos = qlist_entry(pos->member.next, type, member))  
+#else
+#define qlist_for_each_entry(pos, head, member)                 \
     for (pos = qlist_entry((head)->next, typeof(*pos), member); \
-         &pos->member != (head);                                        \
-         pos = qlist_entry(pos->member.next, typeof(*pos), member))     \
-
+         &pos->member != (head);                                \
+         pos = qlist_entry(pos->member.next, typeof(*pos), member))     
+#endif
 /**
  * qlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry

branches/windows-client/src/common/windows/wincommon.h

@@ -31 +31 @@
     if (ret == 0)
     {
-        tv->tv_sec = timebuffer.time;
+        tv->tv_sec = (long) timebuffer.time;
         tv->tv_usec = timebuffer.millitm * 1000;
     }

branches/windows-client/src/io/bmi/bmi.c

@@ -15 +15 @@
 #include <assert.h>
 #include <time.h>
+#ifndef WIN32
 #include <sys/time.h>
+#endif
 #include <stdio.h>
 
@@ -29 +31 @@
 #include "pvfs2-internal.h"
 #include "pvfs2-debug.h"
+
+#ifdef WIN32
+#include "wincommon.h"
+
+#define EREMOTE       66
+#define EHOSTDOWN    112
+#endif
 
 static int bmi_initialized_count = 0;
@@ -991 +1000 @@
     int position = 0;
     int tmp_outcount = 0;
+#ifdef WIN32
+    struct bmi_method_unexpected_info *sub_info = 
+        (struct bmi_method_unexpected_info *) 
+        malloc(sizeof(struct bmi_method_unexpected_info) * incount);
+#else
     struct bmi_method_unexpected_info sub_info[incount];
+#endif
     ref_st_p tmp_ref = NULL;
     int tmp_active_method_count = 0;
@@ -1004 +1019 @@
 
     if (max_idle_time_ms < 0)
+    {
+#ifdef WIN32
+        free(sub_info);
+#endif
         return (bmi_errno_to_pvfs(-EINVAL));
+    }
 
     *outcount = 0;
@@ -1020 +1040 @@
             {
                 /* can't recover from this */
+#ifdef WIN32
+                free(sub_info);
+#endif
                 gossip_lerr("Error: critical BMI_testunexpected failure.\n");
                 return (ret);
@@ -1044 +1067 @@
         {
             /* yeah, right */
+#ifdef WIN32
+            free(sub_info);
+#endif
             gossip_lerr("Error: critical BMI_testunexpected failure.\n");
             gen_mutex_unlock(&ref_mutex);
@@ -1055 +1081 @@
         info_array[i].addr = tmp_ref->bmi_addr;
     }
+#ifdef WIN32
+    free(sub_info);
+#endif
     /* return 1 if anything completed */
     if (ret == 0 && *outcount > 0)
@@ -1083 +1112 @@
     int tmp_outcount = 0;
     int tmp_active_method_count = 0;
+#ifndef WIN32
     struct timespec ts;
+#endif
 
     gen_mutex_lock(&active_method_count_mutex);
@@ -1099 +1130 @@
         if(max_idle_time_ms > 0)
         {
-            ts.tv_sec = 0;
+#ifdef WIN32
+            Sleep(2);
+#else
+            ts.tv_sec = 0;
             ts.tv_nsec = 2000;
             nanosleep(&ts, NULL);
+#endif
         }
         return(0);
@@ -2277 +2312 @@
 {
     struct method_drop_addr_query query;
+    int ret = 0;
     query.response = 0;
     query.addr = tmp_ref->method_addr;
-    int ret = 0;
 
     /* reference count is zero; ask module if it wants us to discard
@@ -2340 +2375 @@
         gen_mutex_unlock(&bmi_addr_force_drop_list_mutex);
         gen_mutex_lock(&ref_mutex);
+#ifdef WIN32
+        qlist_for_each_entry(ref_item, cur_ref_list, list_link, ref_st)
+#else
         qlist_for_each_entry(ref_item, cur_ref_list, list_link)
+#endif
         {
              if ((ref_item->ref_count == 0) &&

branches/windows-client/src/io/bmi/bmi_wintcp/bmi-wintcp.c

@@ -2390 +2390 @@
 
     tcp_op_data = (struct tcp_op *) new_method_op->method_data;
-    tcp_op_data->tcp_op_state = (bmi_tcp_state) tcp_op_state;
+    tcp_op_data->tcp_op_state = (enum bmi_tcp_state) tcp_op_state;
     tcp_op_data->env = header;
 

branches/windows-client/src/io/bmi/bmi_wintcp/socket-collection.c

@@ -16 +16 @@
  */
 #include <stdio.h>
-#include <sys/poll.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
 

branches/windows-client/src/io/bmi/reference-list.h

@@ -19 +19 @@
 #include "quicklist.h"
 #include "quickhash.h"
+
+#ifdef WIN32
+/* interface is a macro on Windows */
+#undef  interface
+#define interface    _interface
+#endif
 
 typedef struct qlist_head *ref_list_p;

branches/windows-client/test/io/bmi/test-bmi-client.c

@@ -15 +15 @@
 #include <stdio.h>
 #include <errno.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
@@ -298 +300 @@
 }
 
-
+#ifdef WIN32
+static struct options *parse_args(
+    int argc,
+    char *argv[])
+{
+    int argi = 1, len, ret;
+    struct options *tmp_opts = malloc(sizeof(struct options));
+    if (!tmp_opts)
+    {
+        goto parse_args_error;
+    }
+
+    /* defaults */
+    tmp_opts->hostid = NULL;
+    tmp_opts->message_size = 32000;
+
+    while (argi < argc)
+    {
+        if (strcmp(argv[argi], "-h") == 0)
+        {
+            len = strlen(argv[++argi]) + 1;
+            tmp_opts->hostid = (char *) malloc(len);
+            if (tmp_opts->hostid == NULL)
+            {
+                goto parse_args_error;
+            }
+            memcpy(tmp_opts->hostid, argv[argi], len);
+            argi++;
+        }
+        else if (strcmp(argv[argi], "-s") == 0)
+        {
+            ret = sscanf(argv[++argi], "%d", &tmp_opts->message_size);
+            if (ret < -1)
+            {
+                goto parse_args_error;
+            }
+            argi++;
+        }
+        else {
+            goto parse_args_error;
+        }
+    }
+
+    /* if we didn't get a host argument, fill in a default: */
+    if (tmp_opts->hostid == NULL) {
+        len = (strlen(DEFAULT_HOSTID)) + 1;
+        if ((tmp_opts->hostid = malloc(len)) == NULL)
+        {
+            goto parse_args_error;
+        }
+        memcpy(tmp_opts->hostid, DEFAULT_HOSTID, len);
+    }
+
+    return (tmp_opts);
+
+  parse_args_error:
+
+    /* if an error occurs, just free everything and return NULL */
+    if (tmp_opts)
+    {
+        if (tmp_opts->hostid)
+        {
+            free(tmp_opts->hostid);
+        }
+        free(tmp_opts);
+    }
+    return (NULL);
+}
+#else
 static struct options *parse_args(
     int argc,
@@ -371 +441 @@
     return (NULL);
 }
+#endif /* WIN32 */
 
 /*

branches/windows-client/test/io/bmi/test-bmi-server.c

@@ -15 +15 @@
 #include <stdio.h>
 #include <errno.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
@@ -240 +242 @@
 
 
+#ifdef WIN32
+static struct options *parse_args(
+    int argc,
+    char *argv[])
+{
+    int argi = 1, len;
+    struct options *tmp_opts = malloc(sizeof(struct options));
+    if (!tmp_opts)
+    {
+        goto parse_args_error;
+    }
+
+    /* defaults */
+    tmp_opts->hostid = NULL;
+
+    while (argi < argc)
+    {
+        if (strcmp(argv[argi], "-h") == 0)
+        {
+            len = strlen(argv[++argi]) + 1;
+            tmp_opts->hostid = (char *) malloc(len);
+            if (tmp_opts->hostid == NULL)
+            {
+                goto parse_args_error;
+            }
+            memcpy(tmp_opts->hostid, argv[argi], len);
+            argi++;
+        }
+        else {
+            goto parse_args_error;
+        }
+    }
+
+    /* if we didn't get a host argument, fill in a default: */
+    if (tmp_opts->hostid == NULL) {
+        len = (strlen(DEFAULT_HOSTID)) + 1;
+        if ((tmp_opts->hostid = malloc(len)) == NULL)
+        {
+            goto parse_args_error;
+        }
+        memcpy(tmp_opts->hostid, DEFAULT_HOSTID, len);
+    }
+
+    return (tmp_opts);
+
+  parse_args_error:
+
+    /* if an error occurs, just free everything and return NULL */
+    if (tmp_opts)
+    {
+        if (tmp_opts->hostid)
+        {
+            free(tmp_opts->hostid);
+        }
+        free(tmp_opts);
+    }
+    return (NULL);
+}
+#else
 static struct options *parse_args(
     int argc,
@@ -301 +362 @@
     return (NULL);
 }
+#endif
 
 /*