Skip to content

Commit

Permalink
prepwork for jimmejardine/qiqqa-open-source#257 : designed new networ…
Browse files Browse the repository at this point in the history 
…k file locking primitives for Sync: lib_nas_lockfile. TODO: additional tools for performing the new Sync concept and testing viability on multiple platforms.
  • Loading branch information
@GerHobbelt
GerHobbelt committed Jun 2, 2021
1 parent c6e8840 commit 40bcf78
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 125 deletions.
153 changes: 29 additions & 124 deletions platform/win32/sync_nas_filelock.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,49 +28,27 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>






<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>





<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>






<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>





<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand All @@ -87,14 +65,7 @@
<OutDir>$(SolutionDir)bin\$(Configuration)-$(CharacterSet)-$(PlatformArchitecture)bit-$(PlatformShortname)\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)-$(CharacterSet)-$(PlatformArchitecture)bit-$(PlatformShortname)\$(RootNamespace)-$(ConfigurationType)-$(ProjectName)\</IntDir>
</PropertyGroup>







<ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<Optimization>Custom</Optimization>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand Down Expand Up @@ -123,50 +94,33 @@
<ConformanceMode>true</ConformanceMode>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>

<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;..\..\thirdparty\owemdjee\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>










<DisableSpecificWarnings>4244;4018;4244;4267;5105</DisableSpecificWarnings>



</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<Bscmake>

<OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<Link>
Expand All @@ -175,50 +129,34 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>

<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>

<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<Optimization>Custom</Optimization>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;..\..\thirdparty\owemdjee\boost;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;_CRTDBG_MAP_ALLOC;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>









<DisableSpecificWarnings>4244;4018;4244;4267;5105</DisableSpecificWarnings>


</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<Bscmake>

<OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<Link>
Expand All @@ -234,45 +172,28 @@
<Midl>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>

<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;..\..\thirdparty\owemdjee\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>










<DisableSpecificWarnings>4244;4018;4244;4267;5105</DisableSpecificWarnings>



</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<Bscmake>

<OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<Link>
Expand All @@ -281,50 +202,34 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>

<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>

<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>$(OutDir)$(TargetName).tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<Optimization>Custom</Optimization>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;..\..\thirdparty\owemdjee\boost;..\..\thirdparty\owemdjee\lib_nas_lockfile\src;../../thirdparty/owemdjee/googletest/googletest/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;_CRTDBG_MAP_ALLOC;WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>









<DisableSpecificWarnings>4244;4018;4244;4267;5105</DisableSpecificWarnings>


</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_SYNC_NAS_FILELOCK;SYNC_NAS_FILELOCK_STATICLIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
<Bscmake>

<OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<Link>
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/owemdjee
Submodule owemdjee updated 5 files
+3 −0 .gitmodules
+1 −0 apophenia
+1 −1 boost
+1 −1 lib_nas_lockfile
+1 −1 replxx

0 comments on commit 40bcf78

Please sign in to comment.