Changeset 8614

Timestamp:

11/08/10 17:30:38 (3 years ago)

Author:

sampson

Message:

Porting client

Location:

branches/windows-client

Files:

• projects/OrangeFS/misc/misc.vcxproj (modified) (5 diffs)
• projects/OrangeFS/sysint-client/sysint-client.vcxproj (modified) (3 diffs)
• src/client/sysint/perf-count-timer.sm (modified) (1 diff)
• src/client/sysint/server-get-config.sm (modified) (2 diffs)
• src/common/gossip/gossip.h (modified) (1 diff)
• src/common/misc/pvfs2-util.c (modified) (1 diff)

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

@@ -67 +67 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\io\job;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\src\client\sysint;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -78 +78 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\io\job;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\src\client\sysint;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -91 +91 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\io\job;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\src\client\sysint;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -106 +106 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\common\gen-locks;..\..\..\src\io\bmi;..\..\..\src\io\job;..\..\..\src\common\gossip;..\..\..\src\proto;..\..\..\src\io\trove;..\..\..\src\io\description;..\..\..\src\common\windows;..\..\..\src\client\sysint;..\..\..\;..\..\..\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -117 +117 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\src\common\misc\pint-util.c" />
+    <ClCompile Include="..\..\..\src\common\misc\pvfs2-util.c" />
   </ItemGroup>
   <ItemGroup>

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

@@ -51 +51 @@
     <CustomBuild>
       <Command>..\..\pvfscommon\Release\statecomp %(FullPath)</Command>
-      <Outputs>%(FileName).c</Outputs>
+      <Outputs>%(RootDir)%(Directory)%(FileName).c</Outputs>
       <Message>..\..\pvfscommon\Release\statecomp %(FullPath)</Message>
     </CustomBuild>
@@ -72 +72 @@
     <CustomBuild>
       <Command>..\..\pvfscommon\Release\statecomp %(FullPath)</Command>
-      <Outputs>%(FileName).c</Outputs>
+      <Outputs>%(RootDir)%(Directory)%(FileName).c</Outputs>
       <Message>..\..\pvfscommon\Release\statecomp %(FullPath)</Message>
     </CustomBuild>
@@ -135 +135 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\pvfscommon\Release\statecomp %(FullPath)</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\pvfscommon\Release\statecomp %(FullPath)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).c</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).c</Outputs>
       <FileType>Document</FileType>
     </CustomBuild>

branches/windows-client/src/client/sysint/perf-count-timer.sm

@@ -83 +83 @@
         if(tmp_text)
         {
+#ifdef WIN32
+            token = strtok(tmp_text, delim);  /* thread-safe */
+#else
             token = strtok_r(tmp_text, delim, &ptr);
+#endif
             while(token)
             {
                 gossip_perf_log("%s\n", token);
+#ifdef WIN32
+                token = strtok(NULL, delim);
+#else
                 token = strtok_r(NULL, delim, &ptr);
+#endif
             }
             free(tmp_text);

branches/windows-client/src/client/sysint/server-get-config.sm

@@ -157 +157 @@
 }
 
+#ifdef WIN32
+static int server_parse_config(
+    struct server_configuration_s *config,
+    char *fs_config_buf,
+    uint32_t fs_config_buf_size)
+{
+    int ret = 1, template_index = 1;
+    char temp_path[MAX_PATH], temp_file[MAX_PATH];
+    DWORD rc = 1, use_temp_path, bytes;
+    HANDLE hFile;
+
+    if (config == NULL)
+    {
+        return ret;
+    }
+
+    assert(fs_config_buf);
+
+    /* get the path to the TEMP directory */
+    use_temp_path = GetTempPath(MAX_PATH, temp_path);
+    if (use_temp_path)
+    {
+        /* get temporary file name in TEMP directory */
+        use_temp_path = GetTempFileName(temp_path, 
+                                        "__pvfs_fs_config", 0, temp_file);
+    }
+
+    if (!use_temp_path)
+    {
+        /* get temporary file name in current directory */
+        rc = GetTempFileName(".", "__pvfs_fs_config", 0, temp_file);
+    }
+
+    if (!rc)
+    {
+        gossip_err("Error: Cannot create temporary "
+                   "configuration files!\n");
+        return ret;
+    }
+
+    hFile = CreateFile(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                       FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        gossip_err("Error: Cannot create temporary "
+                   "configuration files!\n");
+        return ret;
+    }
+
+    assert(!fs_config_buf[fs_config_buf_size - 1]);
+
+    rc = WriteFile(hFile, fs_config_buf, fs_config_buf_size - 1, &bytes, NULL);
+    if (rc && (bytes == fs_config_buf_size - 1))
+    {
+        ret = PINT_parse_config(config, temp_file, NULL);
+    }
+    else
+    {
+        gossip_err("Failed to write fs.conf buffer to temp file: %s: %d\n",
+                   temp_file, GetLastError());
+    }
+
+    CloseHandle(hFile);
+
+    DeleteFile(temp_file);
+
+    return ret;
+}
+#else
 static int server_parse_config(
     struct server_configuration_s *config,
@@ -212 +282 @@
     return ret;
 }
+#endif
 
 static PINT_sm_action server_get_config_setup_msgpair(

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

@@ -177 +177 @@
 extern uint64_t gossip_debug_mask;
 
+#define gossip_perf_log(format, ...)                     \
+do {                                                      \
+    if ((gossip_debug_on) &&                              \
+        (gossip_debug_mask & GOSSIP_PERFCOUNTER_DEBUG) && \
+        (gossip_facility))                                \
+    {                                                     \
+        __gossip_debug(GOSSIP_PERFCOUNTER_DEBUG, 'P',     \
+            format, __VA_ARGS__);                         \
+    }                                                     \
+} while(0)
+
 int __gossip_debug(
     uint64_t mask,

branches/windows-client/src/common/misc/pvfs2-util.c

@@ -15 +15 @@
 #include <ctype.h>
 #include <assert.h>
+#include <sys/types.h>
+#ifndef WIN32
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/time.h>
 #include <libgen.h>
+#endif
 
 #include "pvfs2-config.h"