diff options
| author | George Hazan <ghazan@miranda.im> | 2020-05-22 20:25:34 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-05-22 20:25:34 +0300 |
| commit | 4ba812b71eb6e3cbefcea50d71dd8b7b98779a73 (patch) | |
| tree | 89f8527d0e01ccaa96b3f9498dad1073e512b8c6 | |
| parent | e705d77b5ce00ddcddb4584b6b3df3e538a86b46 (diff) | |
Database
- libmdbx inlined not to change the code of utilities
- libmdbx.mir removed from build scripts
28 files changed, 131 insertions, 2726 deletions
diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln index 1aa9f38270..f408f6217d 100644 --- a/bin15/mir_full.sln +++ b/bin15/mir_full.sln @@ -431,9 +431,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProxySwitch", "..\plugins\P EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\tools\mdbx_dump\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_load\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}" EndProject @@ -447,7 +447,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\tools\mdbx_chk\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln index ea883f8494..9df3c9ee10 100644 --- a/bin15/miranda32.sln +++ b/bin15/miranda32.sln @@ -125,9 +125,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "..\libs\sqlite3\sqlite3.vcxproj", "{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\tools\mdbx_dump\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_load\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}" EndProject @@ -141,7 +141,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsig EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pcre16.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\tools\mdbx_chk\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject diff --git a/bin16/mir_full.sln b/bin16/mir_full.sln index 27b08c4bd8..0ca41e51f8 100644 --- a/bin16/mir_full.sln +++ b/bin16/mir_full.sln @@ -431,9 +431,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProxySwitch", "..\plugins\P EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\tools\mdbx_dump\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_load\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}" EndProject @@ -447,7 +447,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\tools\mdbx_chk\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject diff --git a/bin16/miranda32.sln b/bin16/miranda32.sln index 8490e5b56a..ad3eaa2265 100644 --- a/bin16/miranda32.sln +++ b/bin16/miranda32.sln @@ -125,9 +125,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "..\libs\sqlite3\sqlite3.vcxproj", "{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\tools\mdbx_dump\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\libs\libmdbx\mdbx_dump.vcxproj", "{EE383404-7976-4E87-BD13-A9B7B47C0C10}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_load\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\libs\libmdbx\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}" EndProject @@ -141,7 +141,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StdPopup", "..\src\core\std EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\tools\mdbx_chk\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_chk", "..\libs\libmdbx\mdbx_chk.vcxproj", "{EE383404-4E87-7976-BD13-A9B7B47C0C10}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\Facebook\facebook.vcxproj", "{86033E58-A1E3-43AD-AE8E-305E15E72A91}" EndProject diff --git a/build/vc.common/slib.props b/build/vc.common/slib.props new file mode 100644 index 0000000000..1b3720bfcd --- /dev/null +++ b/build/vc.common/slib.props @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + </ImportGroup> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup> + <GenerateManifest>false</GenerateManifest> + <EmbedManifest>false</EmbedManifest> + <ConfigurationType>StaticLibrary</ConfigurationType> + <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir> + <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir> + </PropertyGroup> + <Import Project="common.props"/> +</Project> diff --git a/libs/libmdbx/libmdbx.vcxproj b/libs/libmdbx/libmdbx.vcxproj index c8d2780e20..8990b4cc57 100644 --- a/libs/libmdbx/libmdbx.vcxproj +++ b/libs/libmdbx/libmdbx.vcxproj @@ -22,31 +22,34 @@ <ProjectGuid>{6D19209B-ECE7-4B9C-941C-0AA2B484F199}</ProjectGuid> <ProjectName>libmdbx</ProjectName> <TargetName>libmdbx</TargetName> + <ConfigurationType>StaticLibrary</ConfigurationType> + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> </PropertyGroup> - <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" /> + <Import Project="$(ProjectDir)..\..\build\vc.common\slib.props" /> <ItemDefinitionGroup> <ClCompile> - <PreprocessorDefinitions>MDBX_DEBUG=1;LIBMDBX_EXPORTS;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="src\version.c"> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - </ClCompile> <ClInclude Include="src\config.h" /> <ClInclude Include="src\mdbx.h" /> - <ClInclude Include="src\stdafx.h" /> - <ClCompile Include="src\src\lck-windows.c"> + </ItemGroup> + <ItemGroup> + <ClCompile Include="src\src\core.c"> <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> - <ClCompile Include="src\src\core.c"> + <ClCompile Include="src\src\lck-windows.c"> <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> <ClCompile Include="src\src\osal.c"> <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> + <ClCompile Include="src\version.c"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/libs/libmdbx/libmdbx.vcxproj.filters b/libs/libmdbx/libmdbx.vcxproj.filters index 6715e53aa2..df68382a06 100644 --- a/libs/libmdbx/libmdbx.vcxproj.filters +++ b/libs/libmdbx/libmdbx.vcxproj.filters @@ -2,9 +2,6 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> <ItemGroup> - <ClCompile Include="src\stdafx.cxx"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="src\src\lck-windows.c"> <Filter>Source Files</Filter> </ClCompile> diff --git a/tools/mdbx_chk/mdbx_chk.vcxproj b/libs/libmdbx/mdbx_chk.vcxproj index 60c3005609..8ef370cbd9 100644 --- a/tools/mdbx_chk/mdbx_chk.vcxproj +++ b/libs/libmdbx/mdbx_chk.vcxproj @@ -25,25 +25,31 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\app.props" /> </ImportGroup> + <ItemDefinitionGroup> + <ClCompile> + <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Console</SubSystem> + <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> + <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> + </Link> + </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="src\mdbx_chk.cc"> + <ClCompile Include="src\src\mdbx_chk.c"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + </ClCompile> + <ClCompile Include="src\src\wingetopt.c"> <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> - <ClCompile Include="src\stdafx.cxx"> - <PrecompiledHeader>Create</PrecompiledHeader> + <ClCompile Include="..\..\build\appstub\appstub.cpp"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> - <ClInclude Include="src\stdafx.h" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\libs\libmdbx\libmdbx.vcxproj"> + <ProjectReference Include="libmdbx.vcxproj"> <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project> </ProjectReference> </ItemGroup> - <ItemDefinitionGroup> - <Link> - <SubSystem>Console</SubSystem> - <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">libmdbx.mir;ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> - <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">libmdbx.mir;ucrtbase.dll;api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/tools/mdbx_chk/mdbx_chk.vcxproj.filters b/libs/libmdbx/mdbx_chk.vcxproj.filters index 39a7790bae..500e140c9b 100644 --- a/tools/mdbx_chk/mdbx_chk.vcxproj.filters +++ b/libs/libmdbx/mdbx_chk.vcxproj.filters @@ -2,16 +2,14 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> <ItemGroup> - <ClCompile Include="src\stdafx.cxx"> + <ClCompile Include="..\..\build\appstub\appstub.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="src\mdbx_chk.cc"> + <ClCompile Include="src\src\mdbx_chk.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\src\wingetopt.c"> <Filter>Source Files</Filter> </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="src\stdafx.h"> - <Filter>Header Files</Filter> - </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/tools/mdbx_dump/mdbx_dump.vcxproj b/libs/libmdbx/mdbx_dump.vcxproj index 9b608a4fa1..6589036b21 100644 --- a/tools/mdbx_dump/mdbx_dump.vcxproj +++ b/libs/libmdbx/mdbx_dump.vcxproj @@ -25,25 +25,31 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\app.props" /> </ImportGroup> + <ItemDefinitionGroup> + <ClCompile> + <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Console</SubSystem> + <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> + <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> + </Link> + </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="src\mdbx_dump.cc"> + <ClCompile Include="src\src\mdbx_dump.c"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + </ClCompile> + <ClCompile Include="src\src\wingetopt.c"> <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> - <ClCompile Include="src\stdafx.cxx"> - <PrecompiledHeader>Create</PrecompiledHeader> + <ClCompile Include="..\..\build\appstub\appstub.cpp"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> - <ClInclude Include="src\stdafx.h" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\libs\libmdbx\libmdbx.vcxproj"> + <ProjectReference Include="libmdbx.vcxproj"> <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project> </ProjectReference> </ItemGroup> - <ItemDefinitionGroup> - <Link> - <SubSystem>Console</SubSystem> - <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">libmdbx.mir;ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> - <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">libmdbx.mir;ucrtbase.dll;api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/tools/mdbx_dump/mdbx_dump.vcxproj.filters b/libs/libmdbx/mdbx_dump.vcxproj.filters index 59fc2eb498..78f363a9a3 100644 --- a/tools/mdbx_dump/mdbx_dump.vcxproj.filters +++ b/libs/libmdbx/mdbx_dump.vcxproj.filters @@ -2,16 +2,14 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> <ItemGroup> - <ClCompile Include="src\stdafx.cxx"> + <ClCompile Include="src\src\mdbx_dump.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="src\mdbx_dump.cc"> + <ClCompile Include="src\src\wingetopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\build\appstub\appstub.cpp"> <Filter>Source Files</Filter> </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="src\stdafx.h"> - <Filter>Header Files</Filter> - </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/tools/mdbx_load/mdbx_load.vcxproj b/libs/libmdbx/mdbx_load.vcxproj index 01a3886306..b0545c6dc1 100644 --- a/tools/mdbx_load/mdbx_load.vcxproj +++ b/libs/libmdbx/mdbx_load.vcxproj @@ -25,23 +25,31 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\app.props" /> </ImportGroup> + <ItemDefinitionGroup> + <ClCompile> + <PreprocessorDefinitions>MDBX_DEBUG=1;__STDC_FORMAT_MACROS=1;__STDC_LIMIT_MACROS=1;__STDC_CONSTANT_MACROS=1;_HAS_EXCEPTIONS=1;MDBX_CONFIG_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Console</SubSystem> + <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> + <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> + </Link> + </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="src\mdbx_load.cc" /> - <ClCompile Include="src\stdafx.cxx"> - <PrecompiledHeader>Create</PrecompiledHeader> + <ClCompile Include="src\src\mdbx_load.c"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + </ClCompile> + <ClCompile Include="src\src\wingetopt.c"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + </ClCompile> + <ClCompile Include="..\..\build\appstub\appstub.cpp"> + <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> - <ClInclude Include="src\stdafx.h" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\libs\libmdbx\libmdbx.vcxproj"> + <ProjectReference Include="libmdbx.vcxproj"> <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project> </ProjectReference> </ItemGroup> - <ItemDefinitionGroup> - <Link> - <SubSystem>Console</SubSystem> - <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">libmdbx.mir;ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> - <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">libmdbx.mir;ucrtbase.dll;api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/tools/mdbx_load/mdbx_load.vcxproj.filters b/libs/libmdbx/mdbx_load.vcxproj.filters index 9e52002c3c..e74c9bac63 100644 --- a/tools/mdbx_load/mdbx_load.vcxproj.filters +++ b/libs/libmdbx/mdbx_load.vcxproj.filters @@ -2,16 +2,14 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> <ItemGroup> - <ClCompile Include="src\stdafx.cxx"> + <ClCompile Include="src\src\mdbx_load.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="src\mdbx_load.cc"> + <ClCompile Include="src\src\wingetopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\build\appstub\appstub.cpp"> <Filter>Source Files</Filter> </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="src\stdafx.h"> - <Filter>Header Files</Filter> - </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj index 9e8db3f9e2..f79541e90f 100644 --- a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj +++ b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj @@ -53,4 +53,9 @@ <ResourceCompile Include="res\dbx_mdbx.rc" />
<ResourceCompile Include="res\version.rc" />
</ItemGroup>
+ <ItemDefinitionGroup>
+ <Link>
+ <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 37357ceed3..6e9532f480 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -565,6 +565,7 @@ static renameTable[] = { L"gtalkext.dll", nullptr },
{ L"importtxt.dll", nullptr },
{ L"langman.dll", nullptr },
+ { L"libmdbx.mir", nullptr },
{ L"libtox.dll", nullptr },
{ L"metacontacts.dll", nullptr },
{ L"mra.dll", nullptr },
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt index 4bfa092444..9e7ffc5bcd 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt @@ -188,7 +188,6 @@ Libs\hunspell.mir Libs\libeay32.mir Libs\libcurl.mir Libs\libjson.mir -Libs\libmdbx.mir Libs\libsignal.mir Libs\libssh2.mir Libs\mir_app.mir diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt index 4906892e0e..83935282aa 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt @@ -187,7 +187,6 @@ Libs\hunspell.mir Libs\libeay32.mir Libs\libcurl.mir Libs\libjson.mir -Libs\libmdbx.mir Libs\libsignal.mir Libs\libssh2.mir Libs\mir_app.mir diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt index 1bb9dd3496..209259021d 100644 --- a/tools/build_scripts/bin15/z3_PackArchives.txt +++ b/tools/build_scripts/bin15/z3_PackArchives.txt @@ -63,7 +63,6 @@ Core\StdUserOnline.dll Libs\freeimage.mir Libs\libeay32.mir Libs\libjson.mir -Libs\libmdbx.mir Libs\libsignal.mir Libs\mir_app.mir Libs\mir_core.mir diff --git a/tools/build_scripts/z2_PackPluginUpdater.txt b/tools/build_scripts/z2_PackPluginUpdater.txt index 5011bb6d09..655ac12274 100644 --- a/tools/build_scripts/z2_PackPluginUpdater.txt +++ b/tools/build_scripts/z2_PackPluginUpdater.txt @@ -68,7 +68,6 @@ Libs\FreeImage.mir Libs\mir_app.mir Libs\mir_core.mir Libs\libjson.mir -Libs\libmdbx.mir Libs\Pcre16.mir Libs\sqlite3.mir Libs\Zlib.mir diff --git a/tools/mdbx_chk/src/mdbx_chk.cc b/tools/mdbx_chk/src/mdbx_chk.cc deleted file mode 100644 index f2725bd37f..0000000000 --- a/tools/mdbx_chk/src/mdbx_chk.cc +++ /dev/null @@ -1,1476 +0,0 @@ -/* mdbx_chk.c - memory-mapped database check tool */ - -/* - * Copyright 2015-2020 Leonid Yuriev <leo@yuriev.ru> - * and other libmdbx authors: please see AUTHORS file. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted only as authorized by the OpenLDAP - * Public License. - * - * A copy of this license is available in the file LICENSE in the - * top-level directory of the distribution or, alternatively, at - * <http://www.OpenLDAP.org/license.html>. */ - -#include "stdafx.h" - -#ifdef _MSC_VER -#if _MSC_VER > 1800 -#pragma warning(disable : 4464) /* relative include path contains '..' */ -#endif -#pragma warning(disable : 4996) /* The POSIX name is deprecated... */ -#endif /* _MSC_VER (warnings) */ - -#define MDBX_TOOLS /* Avoid using internal mdbx_assert() */ -#include "../../libs/libmdbx/src/src/internals.h" - -typedef struct flagbit { - int bit; - const char *name; -} flagbit; - -const flagbit dbflags[] = {{MDBX_DUPSORT, "dupsort"}, - {MDBX_INTEGERKEY, "integerkey"}, - {MDBX_REVERSEKEY, "reversekey"}, - {MDBX_DUPFIXED, "dupfixed"}, - {MDBX_REVERSEDUP, "reversedup"}, - {MDBX_INTEGERDUP, "integerdup"}, - {0, NULL}}; - -#if defined(_WIN32) || defined(_WIN64) -#include "../../libs/libmdbx/src/src/wingetopt.h" -#include "../../libs/libmdbx/src/src/wingetopt.c" - -static volatile BOOL user_break; -static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { - (void)dwCtrlType; - user_break = 1; - return true; -} - -#else /* WINDOWS */ - -static volatile sig_atomic_t user_break; -static void signal_handler(int sig) { - (void)sig; - user_break = 1; -} - -#endif /* !WINDOWS */ - -#define EXIT_INTERRUPTED (EXIT_FAILURE + 4) -#define EXIT_FAILURE_SYS (EXIT_FAILURE + 3) -#define EXIT_FAILURE_MDB (EXIT_FAILURE + 2) -#define EXIT_FAILURE_CHECK_MAJOR (EXIT_FAILURE + 1) -#define EXIT_FAILURE_CHECK_MINOR EXIT_FAILURE - -typedef struct { - const char *name; - struct { - uint64_t branch, large_count, large_volume, leaf; - uint64_t subleaf_dupsort, leaf_dupfixed, subleaf_dupfixed; - uint64_t total, empty, other; - } pages; - uint64_t payload_bytes; - uint64_t lost_bytes; -} walk_dbi_t; - -struct { - short *pagemap; - uint64_t total_payload_bytes; - uint64_t pgcount; - walk_dbi_t dbi[MAX_DBI + CORE_DBS + /* account pseudo-entry for meta */ 1]; -} walk; - -#define dbi_free walk.dbi[FREE_DBI] -#define dbi_main walk.dbi[MAIN_DBI] -#define dbi_meta walk.dbi[CORE_DBS] - -int envflags = MDBX_RDONLY | MDBX_EXCLUSIVE; -MDBX_env *env; -MDBX_txn *txn; -MDBX_envinfo envinfo; -MDBX_stat envstat; -size_t userdb_count, skipped_subdb; -uint64_t total_unused_bytes, reclaimable_pages, gc_pages, alloc_pages, - unused_pages, backed_pages; -unsigned verbose; -bool ignore_wrong_order, quiet, dont_traversal; -const char *only_subdb; - -struct problem { - struct problem *pr_next; - size_t count; - const char *caption; -}; - -struct problem *problems_list; -uint64_t total_problems; - -static void __printf_args(1, 2) print(const char *msg, ...) { - if (!quiet) { - va_list args; - - fflush(stderr); - va_start(args, msg); - vfprintf(stdout, msg, args); - va_end(args); - } -} - -static void __printf_args(1, 2) error(const char *msg, ...) { - total_problems++; - - if (!quiet) { - va_list args; - - fflush(NULL); - va_start(args, msg); - fputs(" ! ", stderr); - vfprintf(stderr, msg, args); - va_end(args); - fflush(NULL); - } -} - -static int check_user_break(void) { - switch (user_break) { - case 0: - return MDBX_SUCCESS; - case 1: - print(" - interrupted by signal\n"); - fflush(NULL); - user_break = 2; - } - return MDBX_EINTR; -} - -static void pagemap_cleanup(void) { - for (size_t i = CORE_DBS + /* account pseudo-entry for meta */ 1; - i < ARRAY_LENGTH(walk.dbi); ++i) { - if (walk.dbi[i].name) { - mdbx_free((void *)walk.dbi[i].name); - walk.dbi[i].name = NULL; - } - } - - mdbx_free(walk.pagemap); - walk.pagemap = NULL; -} - -static walk_dbi_t *pagemap_lookup_dbi(const char *dbi_name, bool silent) { - static walk_dbi_t *last; - - if (dbi_name == MDBX_PGWALK_MAIN) - return &dbi_main; - if (dbi_name == MDBX_PGWALK_GC) - return &dbi_free; - if (dbi_name == MDBX_PGWALK_META) - return &dbi_meta; - - if (last && strcmp(last->name, dbi_name) == 0) - return last; - - walk_dbi_t *dbi = walk.dbi + CORE_DBS + /* account pseudo-entry for meta */ 1; - for (; dbi < ARRAY_END(walk.dbi) && dbi->name; ++dbi) { - if (strcmp(dbi->name, dbi_name) == 0) - return last = dbi; - } - - if (verbose > 0 && !silent) { - print(" - found '%s' area\n", dbi_name); - fflush(NULL); - } - - if (dbi == ARRAY_END(walk.dbi)) - return NULL; - - dbi->name = mdbx_strdup(dbi_name); - return last = dbi; -} - -static void __printf_args(4, 5) - - problem_add(const char *object, uint64_t entry_number, const char *msg, - const char *extra, ...) { - total_problems++; - - if (!quiet) { - int need_fflush = 0; - struct problem *p; - - for (p = problems_list; p; p = p->pr_next) - if (p->caption == msg) - break; - - if (!p) { - p = (problem *)mdbx_calloc(1, sizeof(*p)); - p->caption = msg; - p->pr_next = problems_list; - problems_list = p; - need_fflush = 1; - } - - p->count++; - if (verbose > 1) { - print(" %s #%" PRIu64 ": %s", object, entry_number, msg); - if (extra) { - va_list args; - printf(" ("); - va_start(args, extra); - vfprintf(stdout, extra, args); - va_end(args); - printf(")"); - } - printf("\n"); - if (need_fflush) - fflush(NULL); - } - } -} - -static struct problem *problems_push(void) { - struct problem *p = problems_list; - problems_list = NULL; - return p; -} - -static size_t problems_pop(struct problem *list) { - size_t count = 0; - - if (problems_list) { - int i; - - print(" - problems: "); - for (i = 0; problems_list; ++i) { - struct problem *p = problems_list->pr_next; - count += problems_list->count; - print("%s%s (%" PRIuPTR ")", i ? ", " : "", problems_list->caption, - problems_list->count); - mdbx_free(problems_list); - problems_list = p; - } - print("\n"); - fflush(NULL); - } - - problems_list = list; - return count; -} - -static int pgvisitor(const uint64_t pgno, const unsigned pgnumber, - void *const ctx, const int deep, - const char *const dbi_name_or_tag, const size_t page_size, - const MDBX_page_type_t pagetype, const size_t nentries, - const size_t payload_bytes, const size_t header_bytes, - const size_t unused_bytes) { - (void)ctx; - if (deep > 42) { - problem_add("deep", deep, "too large", nullptr); - return MDBX_CORRUPTED /* avoid infinite loop/recursion */; - } - - if (pagetype == MDBX_page_void) - return MDBX_SUCCESS; - - walk_dbi_t *dbi = pagemap_lookup_dbi(dbi_name_or_tag, false); - if (!dbi) - return MDBX_ENOMEM; - - const size_t page_bytes = payload_bytes + header_bytes + unused_bytes; - walk.pgcount += pgnumber; - - const char *pagetype_caption; - bool branch = false; - switch (pagetype) { - default: - problem_add("page", pgno, "unknown page-type", "type %u, deep %i", - (unsigned)pagetype, deep); - pagetype_caption = "unknown"; - dbi->pages.other += pgnumber; - break; - case MDBX_page_meta: - pagetype_caption = "meta"; - dbi->pages.other += pgnumber; - break; - case MDBX_page_large: - pagetype_caption = "large"; - dbi->pages.large_volume += pgnumber; - dbi->pages.large_count += 1; - break; - case MDBX_page_branch: - pagetype_caption = "branch"; - dbi->pages.branch += pgnumber; - branch = true; - break; - case MDBX_page_leaf: - pagetype_caption = "leaf"; - dbi->pages.leaf += pgnumber; - break; - case MDBX_page_dupfixed_leaf: - pagetype_caption = "leaf-dupfixed"; - dbi->pages.leaf_dupfixed += pgnumber; - break; - case MDBX_subpage_leaf: - pagetype_caption = "subleaf-dupsort"; - dbi->pages.subleaf_dupsort += 1; - break; - case MDBX_subpage_dupfixed_leaf: - pagetype_caption = "subleaf-dupfixed"; - dbi->pages.subleaf_dupfixed += 1; - break; - } - - if (pgnumber) { - if (verbose > 3 && (!only_subdb || strcmp(only_subdb, dbi->name) == 0)) { - if (pgnumber == 1) - print(" %s-page %" PRIu64, pagetype_caption, pgno); - else - print(" %s-span %" PRIu64 "[%u]", pagetype_caption, pgno, pgnumber); - print(" of %s: header %" PRIiPTR ", payload %" PRIiPTR - ", unused %" PRIiPTR ", deep %i\n", - dbi->name, header_bytes, payload_bytes, unused_bytes, deep); - } - - bool already_used = false; - for (unsigned n = 0; n < pgnumber; ++n) { - uint64_t spanpgno = pgno + n; - if (spanpgno >= alloc_pages) - problem_add("page", spanpgno, "wrong page-no", - "%s-page: %" PRIu64 " > %" PRIu64 ", deep %i", - pagetype_caption, spanpgno, alloc_pages, deep); - else if (walk.pagemap[spanpgno]) { - walk_dbi_t *coll_dbi = &walk.dbi[walk.pagemap[spanpgno] - 1]; - problem_add("page", spanpgno, - (branch && coll_dbi == dbi) ? "loop" : "already used", - "%s-page: by %s, deep %i", pagetype_caption, coll_dbi->name, - deep); - already_used = true; - } else { - walk.pagemap[spanpgno] = (short)(dbi - walk.dbi + 1); - dbi->pages.total += 1; - } - } - - if (already_used) - return branch ? MDBX_RESULT_TRUE /* avoid infinite loop/recursion */ - : MDBX_SUCCESS; - } - - if (unused_bytes > page_size) - problem_add("page", pgno, "illegal unused-bytes", - "%s-page: %u < %" PRIuPTR " < %u", pagetype_caption, 0, - unused_bytes, envstat.ms_psize); - - if (header_bytes < (int)sizeof(long) || - (size_t)header_bytes >= envstat.ms_psize - sizeof(long)) - problem_add("page", pgno, "illegal header-length", - "%s-page: %" PRIuPTR " < %" PRIuPTR " < %" PRIuPTR, - pagetype_caption, sizeof(long), header_bytes, - envstat.ms_psize - sizeof(long)); - if (payload_bytes < 1) { - if (nentries > 1) { - problem_add("page", pgno, "zero size-of-entry", - "%s-page: payload %" PRIuPTR " bytes, %" PRIuPTR " entries", - pagetype_caption, payload_bytes, nentries); - /* if ((size_t)header_bytes + unused_bytes < page_size) { - // LY: hush a misuse error - page_bytes = page_size; - } */ - } else { - problem_add("page", pgno, "empty", - "%s-page: payload %" PRIuPTR " bytes, %" PRIuPTR - " entries, deep %i", - pagetype_caption, payload_bytes, nentries, deep); - dbi->pages.empty += 1; - } - } - - if (pgnumber) { - if (page_bytes != page_size) { - problem_add("page", pgno, "misused", - "%s-page: %" PRIuPTR " != %" PRIuPTR " (%" PRIuPTR - "h + %" PRIuPTR "p + %" PRIuPTR "u), deep %i", - pagetype_caption, page_size, page_bytes, header_bytes, - payload_bytes, unused_bytes, deep); - if (page_size > page_bytes) - dbi->lost_bytes += page_size - page_bytes; - } else { - dbi->payload_bytes += payload_bytes + header_bytes; - walk.total_payload_bytes += payload_bytes + header_bytes; - } - } - - return check_user_break(); -} - -typedef int(visitor)(const uint64_t record_number, const MDBX_val *key, - const MDBX_val *data); -static int process_db(MDBX_dbi dbi_handle, char *dbi_name, visitor *handler, - bool silent); - -static int handle_userdb(const uint64_t record_number, const MDBX_val *key, - const MDBX_val *data) { - (void)record_number; - (void)key; - (void)data; - return check_user_break(); -} - -static int handle_freedb(const uint64_t record_number, const MDBX_val *key, - const MDBX_val *data) { - char *bad = ""; - pgno_t *iptr = (pgno_t *)data->iov_base; - - if (key->iov_len != sizeof(txnid_t)) - problem_add("entry", record_number, "wrong txn-id size", - "key-size %" PRIiPTR, key->iov_len); - else { - txnid_t txnid; - memcpy(&txnid, key->iov_base, sizeof(txnid)); - if (txnid < 1 || txnid > envinfo.mi_recent_txnid) - problem_add("entry", record_number, "wrong txn-id", "%" PRIaTXN, txnid); - else { - if (data->iov_len < sizeof(pgno_t) || data->iov_len % sizeof(pgno_t)) - problem_add("entry", txnid, "wrong idl size", "%" PRIuPTR, - data->iov_len); - size_t number = (data->iov_len >= sizeof(pgno_t)) ? *iptr++ : 0; - if (number < 1 || number > MDBX_PNL_MAX) - problem_add("entry", txnid, "wrong idl length", "%" PRIuPTR, number); - else if ((number + 1) * sizeof(pgno_t) > data->iov_len) { - problem_add("entry", txnid, "trimmed idl", - "%" PRIuSIZE " > %" PRIuSIZE " (corruption)", - (number + 1) * sizeof(pgno_t), data->iov_len); - number = data->iov_len / sizeof(pgno_t) - 1; - } else if (data->iov_len - (number + 1) * sizeof(pgno_t) >= - /* LY: allow gap upto one page. it is ok - * and better than shink-and-retry inside mdbx_update_gc() */ - envstat.ms_psize) - problem_add("entry", txnid, "extra idl space", - "%" PRIuSIZE " < %" PRIuSIZE " (minor, not a trouble)", - (number + 1) * sizeof(pgno_t), data->iov_len); - - gc_pages += number; - if (envinfo.mi_latter_reader_txnid > txnid) - reclaimable_pages += number; - - pgno_t prev = MDBX_PNL_ASCENDING ? NUM_METAS - 1 : txn->mt_next_pgno; - pgno_t span = 1; - for (unsigned i = 0; i < number; ++i) { - if (check_user_break()) - return MDBX_EINTR; - const pgno_t pgno = iptr[i]; - if (pgno < NUM_METAS) - problem_add("entry", txnid, "wrong idl entry", - "pgno %" PRIaPGNO " < meta-pages %u", pgno, NUM_METAS); - else if (pgno >= backed_pages) - problem_add("entry", txnid, "wrong idl entry", - "pgno %" PRIaPGNO " > backed-pages %" PRIu64, pgno, - backed_pages); - else if (pgno >= alloc_pages) - problem_add("entry", txnid, "wrong idl entry", - "pgno %" PRIaPGNO " > alloc-pages %" PRIu64, pgno, - alloc_pages - 1); - else { - if (MDBX_PNL_DISORDERED(prev, pgno)) { - bad = " [bad sequence]"; - problem_add("entry", txnid, "bad sequence", - "%" PRIaPGNO " %c [%u].%" PRIaPGNO, prev, - (prev == pgno) ? '=' : (MDBX_PNL_ASCENDING ? '>' : '<'), - i, pgno); - } - if (walk.pagemap) { - int idx = walk.pagemap[pgno]; - if (idx == 0) - walk.pagemap[pgno] = -1; - else if (idx > 0) - problem_add("page", pgno, "already used", "by %s", - walk.dbi[idx - 1].name); - else - problem_add("page", pgno, "already listed in GC", nullptr); - } - } - prev = pgno; - while (i + span < number && - iptr[i + span] == (MDBX_PNL_ASCENDING ? pgno_add(pgno, span) - : pgno_sub(pgno, span))) - ++span; - } - if (verbose > 3 && !only_subdb) { - print(" transaction %" PRIaTXN ", %" PRIuPTR - " pages, maxspan %" PRIaPGNO "%s\n", - txnid, number, span, bad); - if (verbose > 4) { - for (unsigned i = 0; i < number; i += span) { - const pgno_t pgno = iptr[i]; - for (span = 1; - i + span < number && - iptr[i + span] == (MDBX_PNL_ASCENDING ? pgno_add(pgno, span) - : pgno_sub(pgno, span)); - ++span) - ; - if (span > 1) { - print(" %9" PRIaPGNO "[%" PRIaPGNO "]\n", pgno, span); - } else - print(" %9" PRIaPGNO "\n", pgno); - } - } - } - } - } - - return check_user_break(); -} - -static int handle_maindb(const uint64_t record_number, const MDBX_val *key, - const MDBX_val *data) { - char *name; - int rc; - size_t i; - - name = (char*)key->iov_base; - for (i = 0; i < key->iov_len; ++i) { - if (name[i] < ' ') - return handle_userdb(record_number, key, data); - } - - name = (char *)mdbx_malloc(key->iov_len + 1); - memcpy(name, key->iov_base, key->iov_len); - name[key->iov_len] = '\0'; - userdb_count++; - - rc = process_db(~0u, name, handle_userdb, false); - mdbx_free(name); - if (rc != MDBX_INCOMPATIBLE) - return rc; - - return handle_userdb(record_number, key, data); -} - -static int process_db(MDBX_dbi dbi_handle, char *dbi_name, visitor *handler, - bool silent) { - MDBX_cursor *mc; - MDBX_stat ms; - MDBX_val key, data; - MDBX_val prev_key, prev_data; - unsigned flags; - int rc, i; - struct problem *saved_list; - uint64_t problems_count; - - uint64_t record_count = 0, dups = 0; - uint64_t key_bytes = 0, data_bytes = 0; - - if ((MDBX_TXN_FINISHED | MDBX_TXN_ERROR) & mdbx_txn_flags(txn)) { - print(" ! abort processing '%s' due to a previous error\n", - dbi_name ? dbi_name : "@MAIN"); - return MDBX_BAD_TXN; - } - - if (dbi_handle == ~0u) { - rc = mdbx_dbi_open(txn, dbi_name, 0, &dbi_handle); - if (rc) { - if (!dbi_name || - rc != - MDBX_INCOMPATIBLE) /* LY: mainDB's record is not a user's DB. */ { - error("mdbx_open '%s' failed, error %d %s\n", - dbi_name ? dbi_name : "main", rc, mdbx_strerror(rc)); - } - return rc; - } - } - - if (dbi_handle >= CORE_DBS && dbi_name && only_subdb && - strcmp(only_subdb, dbi_name) != 0) { - if (verbose) { - print("Skip processing '%s'...\n", dbi_name); - fflush(NULL); - } - skipped_subdb++; - return MDBX_SUCCESS; - } - - if (!silent && verbose) { - print("Processing '%s'...\n", dbi_name ? dbi_name : "@MAIN"); - fflush(NULL); - } - - rc = mdbx_dbi_flags(txn, dbi_handle, &flags); - if (rc) { - error("mdbx_dbi_flags failed, error %d %s\n", rc, mdbx_strerror(rc)); - return rc; - } - - rc = mdbx_dbi_stat(txn, dbi_handle, &ms, sizeof(ms)); - if (rc) { - error("mdbx_dbi_stat failed, error %d %s\n", rc, mdbx_strerror(rc)); - return rc; - } - - if (!silent && verbose) { - print(" - dbi-id %d, flags:", dbi_handle); - if (!flags) - print(" none"); - else { - for (i = 0; dbflags[i].bit; i++) - if (flags & dbflags[i].bit) - print(" %s", dbflags[i].name); - } - print(" (0x%02X)\n", flags); - if (verbose > 1) { - print(" - page size %u, entries %" PRIu64 "\n", ms.ms_psize, - ms.ms_entries); - print(" - b-tree depth %u, pages: branch %" PRIu64 ", leaf %" PRIu64 - ", overflow %" PRIu64 "\n", - ms.ms_depth, ms.ms_branch_pages, ms.ms_leaf_pages, - ms.ms_overflow_pages); - } - } - - walk_dbi_t *dbi = (dbi_handle < CORE_DBS) - ? &walk.dbi[dbi_handle] - : pagemap_lookup_dbi(dbi_name, true); - if (!dbi) { - error("too many DBIs or out of memory\n"); - return MDBX_ENOMEM; - } - if (!dont_traversal) { - const uint64_t subtotal_pages = - ms.ms_branch_pages + ms.ms_leaf_pages + ms.ms_overflow_pages; - if (subtotal_pages != dbi->pages.total) - error("%s pages mismatch (%" PRIu64 " != walked %" PRIu64 ")\n", - "subtotal", subtotal_pages, dbi->pages.total); - if (ms.ms_branch_pages != dbi->pages.branch) - error("%s pages mismatch (%" PRIu64 " != walked %" PRIu64 ")\n", "branch", - ms.ms_branch_pages, dbi->pages.branch); - const uint64_t allleaf_pages = dbi->pages.leaf + dbi->pages.leaf_dupfixed; - if (ms.ms_leaf_pages != allleaf_pages) - error("%s pages mismatch (%" PRIu64 " != walked %" PRIu64 ")\n", - "all-leaf", ms.ms_leaf_pages, allleaf_pages); - if (ms.ms_overflow_pages != dbi->pages.large_volume) - error("%s pages mismatch (%" PRIu64 " != walked %" PRIu64 ")\n", - "large/overlow", ms.ms_overflow_pages, dbi->pages.large_volume); - } - rc = mdbx_cursor_open(txn, dbi_handle, &mc); - if (rc) { - error("mdbx_cursor_open failed, error %d %s\n", rc, mdbx_strerror(rc)); - return rc; - } - - const size_t maxkeysize = mdbx_env_get_maxkeysize_ex(env, flags); - - saved_list = problems_push(); - prev_key.iov_base = NULL; - prev_key.iov_len = 0; - prev_data.iov_base = NULL; - prev_data.iov_len = 0; - rc = mdbx_cursor_get(mc, &key, &data, MDBX_FIRST); - while (rc == MDBX_SUCCESS) { - rc = check_user_break(); - if (rc) - goto bailout; - - bool bad_key = false; - if (key.iov_len > maxkeysize) { - problem_add("entry", record_count, "key length exceeds max-key-size", - "%" PRIuPTR " > %" PRIuPTR, key.iov_len, maxkeysize); - bad_key = true; - } else if ((flags & MDBX_INTEGERKEY) && key.iov_len != sizeof(uint64_t) && - key.iov_len != sizeof(uint32_t)) { - problem_add("entry", record_count, "wrong key length", - "%" PRIuPTR " != 4or8", key.iov_len); - bad_key = true; - } - - bool bad_data = false; - if ((flags & MDBX_INTEGERDUP) && data.iov_len != sizeof(uint64_t) && - data.iov_len != sizeof(uint32_t)) { - problem_add("entry", record_count, "wrong data length", - "%" PRIuPTR " != 4or8", data.iov_len); - bad_data = true; - } - - if (prev_key.iov_base && !bad_data) { - if ((flags & MDBX_DUPFIXED) && prev_data.iov_len != data.iov_len) { - problem_add("entry", record_count, "different data length", - "%" PRIuPTR " != %" PRIuPTR, prev_data.iov_len, - data.iov_len); - bad_data = true; - } - - if (!bad_key) { - int cmp = mdbx_cmp(txn, dbi_handle, &prev_key, &key); - if (cmp == 0) { - ++dups; - if ((flags & MDBX_DUPSORT) == 0) { - problem_add("entry", record_count, "duplicated entries", NULL); - if (data.iov_len == prev_data.iov_len && - memcmp(data.iov_base, prev_data.iov_base, data.iov_len) == 0) { - problem_add("entry", record_count, "complete duplicate", NULL); - } - } else if (!bad_data) { - cmp = mdbx_dcmp(txn, dbi_handle, &prev_data, &data); - if (cmp == 0) { - problem_add("entry", record_count, "complete duplicate", NULL); - } else if (cmp > 0 && !ignore_wrong_order) { - problem_add("entry", record_count, "wrong order of multi-values", - NULL); - } - } - } else if (cmp > 0 && !ignore_wrong_order) { - problem_add("entry", record_count, "wrong order of entries", NULL); - } - } - } else if (verbose) { - if (flags & MDBX_INTEGERKEY) - print(" - fixed key-size %" PRIuPTR "\n", key.iov_len); - if (flags & (MDBX_INTEGERDUP | MDBX_DUPFIXED)) - print(" - fixed data-size %" PRIuPTR "\n", data.iov_len); - } - - if (handler) { - rc = handler(record_count, &key, &data); - if (MDBX_IS_ERROR(rc)) - goto bailout; - } - - record_count++; - key_bytes += key.iov_len; - data_bytes += data.iov_len; - - if (!bad_key) - prev_key = key; - if (!bad_data) - prev_data = data; - rc = mdbx_cursor_get(mc, &key, &data, MDBX_NEXT); - } - if (rc != MDBX_NOTFOUND) - error("mdbx_cursor_get failed, error %d %s\n", rc, mdbx_strerror(rc)); - else - rc = 0; - - if (record_count != ms.ms_entries) - problem_add("entry", record_count, "differentent number of entries", - "%" PRIu64 " != %" PRIu64, record_count, ms.ms_entries); -bailout: - problems_count = problems_pop(saved_list); - if (!silent && verbose) { - print(" - summary: %" PRIu64 " records, %" PRIu64 " dups, %" PRIu64 - " key's bytes, %" PRIu64 " data's " - "bytes, %" PRIu64 " problems\n", - record_count, dups, key_bytes, data_bytes, problems_count); - fflush(NULL); - } - - mdbx_cursor_close(mc); - return (rc || problems_count) ? MDBX_RESULT_TRUE : MDBX_SUCCESS; -} - -static void usage(char *prog) { - fprintf( - stderr, - "usage: %s [-V] [-v] [-n] [-q] [-c] [-w] [-d] [-i] [-s subdb] dbpath\n" - " -V\t\tprint version and exit\n" - " -v\t\tmore verbose, could be used multiple times\n" - " -n\t\tNOSUBDIR mode for open\n" - " -q\t\tbe quiet\n" - " -c\t\tforce cooperative mode (don't try exclusive)\n" - " -w\t\tlock DB for writing while checking\n" - " -d\t\tdisable page-by-page traversal of B-tree\n" - " -i\t\tignore wrong order errors (for custom comparators case)\n" - " -s subdb\tprocess a specific subdatabase only\n", - prog); - exit(EXIT_INTERRUPTED); -} - -const char *meta_synctype(uint64_t sign) { - switch (sign) { - case MDBX_DATASIGN_NONE: - return "no-sync/legacy"; - case MDBX_DATASIGN_WEAK: - return "weak"; - default: - return "steady"; - } -} - -static __inline bool meta_ot(txnid_t txn_a, uint64_t sign_a, txnid_t txn_b, - uint64_t sign_b, const bool roolback2steady) { - if (txn_a == txn_b) - return SIGN_IS_STEADY(sign_b); - - if (roolback2steady && SIGN_IS_STEADY(sign_a) != SIGN_IS_STEADY(sign_b)) - return SIGN_IS_STEADY(sign_b); - - return txn_a < txn_b; -} - -static __inline bool meta_eq(txnid_t txn_a, uint64_t sign_a, txnid_t txn_b, - uint64_t sign_b) { - if (txn_a != txn_b) - return false; - - if (SIGN_IS_STEADY(sign_a) != SIGN_IS_STEADY(sign_b)) - return false; - - return true; -} - -static __inline int meta_recent(const bool roolback2steady) { - - if (meta_ot(envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign, - envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign, roolback2steady)) - return meta_ot(envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign, - envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign, - roolback2steady) - ? 1 - : 2; - - return meta_ot(envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign, - envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign, roolback2steady) - ? 2 - : 0; -} - -static __inline int meta_tail(int head) { - - if (head == 0) - return meta_ot(envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign, - envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign, true) - ? 1 - : 2; - if (head == 1) - return meta_ot(envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign, - envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign, true) - ? 0 - : 2; - if (head == 2) - return meta_ot(envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign, - envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign, true) - ? 0 - : 1; - assert(false); - return -1; -} - -static int meta_steady(void) { return meta_recent(true); } - -static int meta_head(void) { return meta_recent(false); } - -void verbose_meta(int num, txnid_t txnid, uint64_t sign, uint64_t bootid_h, - uint64_t bootid_l) { - print(" - meta-%d: %s %" PRIu64, num, meta_synctype(sign), txnid); - bool stay = true; - const bool bootid_match = bootid_h == envinfo.mi_bootid.current.h && - bootid_l == envinfo.mi_bootid.current.l && - (bootid_h | bootid_l) != 0; - - const int steady = meta_steady(); - const int head = meta_head(); - if (num == steady && num == head) { - print(", head"); - stay = false; - } else if (num == steady) { - print(", head-steady"); - stay = false; - } else if (num == head) { - print(", head-weak%s", bootid_match ? "-intact (same boot-id)" : ""); - stay = false; - } - if (num == meta_tail(head)) { - print(", tail"); - stay = false; - } - if (stay) - print(", stay"); - - if (txnid > envinfo.mi_recent_txnid && - (envflags & (MDBX_EXCLUSIVE | MDBX_RDONLY)) == MDBX_EXCLUSIVE) - print(", rolled-back %" PRIu64 " (%" PRIu64 " >>> %" PRIu64 ")", - txnid - envinfo.mi_recent_txnid, txnid, envinfo.mi_recent_txnid); - print("\n"); -} - -static uint64_t get_meta_txnid(const unsigned meta_id) { - switch (meta_id) { - default: - assert(false); - error("unexpected meta_id %u\n", meta_id); - return 0; - case 0: - return envinfo.mi_meta0_txnid; - case 1: - return envinfo.mi_meta1_txnid; - case 2: - return envinfo.mi_meta2_txnid; - } -} - -static void print_size(const char *prefix, const uint64_t value, - const char *suffix) { - const char sf[] = - "KMGTPEZY"; /* LY: Kilo, Mega, Giga, Tera, Peta, Exa, Zetta, Yotta! */ - double k = 1024.0; - size_t i; - for (i = 0; sf[i + 1] && value / k > 1000.0; ++i) - k *= 1024; - print("%s%" PRIu64 " (%.2f %cb)%s", prefix, value, value / k, sf[i], suffix); -} - -int main(int argc, char *argv[]) { - int rc; - char *prog = argv[0]; - char *envname; - int problems_maindb = 0, problems_freedb = 0, problems_meta = 0; - bool locked = false; - - double elapsed; -#if defined(_WIN32) || defined(_WIN64) - uint64_t timestamp_start, timestamp_finish; - timestamp_start = GetTickCount64(); -#else - struct timespec timestamp_start, timestamp_finish; - if (clock_gettime(CLOCK_MONOTONIC, ×tamp_start)) { - rc = errno; - error("clock_gettime failed, error %d %s\n", rc, mdbx_strerror(rc)); - return EXIT_FAILURE_SYS; - } -#endif - DECLARE_VERSION(); - - dbi_meta.name = "@META"; - dbi_free.name = "@GC"; - dbi_main.name = "@MAIN"; - atexit(pagemap_cleanup); - - if (argc < 2) - usage(prog); - - for (int i; (i = getopt(argc, argv, "Vvqnwcdsi:")) != EOF;) { - switch (i) { - case 'V': - printf("mdbx_chk version %d.%d.%d.%d\n" - " - source: %s %s, commit %s, tree %s\n" - " - anchor: %s\n" - " - build: %s for %s by %s\n" - " - flags: %s\n" - " - options: %s\n", - MDBX_version.major, MDBX_version.minor, MDBX_version.release, - MDBX_version.revision, MDBX_version.git.describe, - MDBX_version.git.datetime, MDBX_version.git.commit, - MDBX_version.git.tree, MDBX_sourcery_anchor, MDBX_build.datetime, - MDBX_build.target, MDBX_build.compiler, MDBX_build.flags, - MDBX_build.options); - return EXIT_SUCCESS; - case 'v': - verbose++; - break; - case 'q': - quiet = true; - break; - case 'n': - envflags |= MDBX_NOSUBDIR; - break; - case 'w': - envflags &= ~MDBX_RDONLY; - break; - case 'c': - envflags = (envflags & ~MDBX_EXCLUSIVE) | MDBX_ACCEDE; - break; - case 'd': - dont_traversal = true; - break; - case 's': - if (only_subdb && strcmp(only_subdb, optarg)) - usage(prog); - only_subdb = optarg; - break; - case 'i': - ignore_wrong_order = true; - break; - default: - usage(prog); - } - } - - if (optind != argc - 1) - usage(prog); - -#if defined(_WIN32) || defined(_WIN64) - SetConsoleCtrlHandler(ConsoleBreakHandlerRoutine, true); -#else -#ifdef SIGPIPE - signal(SIGPIPE, signal_handler); -#endif -#ifdef SIGHUP - signal(SIGHUP, signal_handler); -#endif - signal(SIGINT, signal_handler); - signal(SIGTERM, signal_handler); -#endif /* !WINDOWS */ - - envname = argv[optind]; - print("mdbx_chk %s (%s, T-%s)\nRunning for %s in 'read-%s' mode...\n", - MDBX_version.git.describe, MDBX_version.git.datetime, - MDBX_version.git.tree, envname, - (envflags & MDBX_RDONLY) ? "only" : "write"); - fflush(NULL); - - rc = mdbx_env_create(&env); - if (rc) { - error("mdbx_env_create failed, error %d %s\n", rc, mdbx_strerror(rc)); - return rc < 0 ? EXIT_FAILURE_MDB : EXIT_FAILURE_SYS; - } - - rc = mdbx_env_set_maxdbs(env, MAX_DBI); - if (rc) { - error("mdbx_env_set_maxdbs failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - rc = mdbx_env_open(env, envname, envflags, 0); - if ((envflags & MDBX_EXCLUSIVE) && - (rc == MDBX_BUSY || -#if defined(_WIN32) || defined(_WIN64) - rc == ERROR_LOCK_VIOLATION || rc == ERROR_SHARING_VIOLATION -#else - rc == EBUSY || rc == EAGAIN -#endif - )) { - envflags &= ~MDBX_EXCLUSIVE; - rc = mdbx_env_open(env, envname, envflags | MDBX_ACCEDE, 0); - } - - if (rc) { - error("mdbx_env_open failed, error %d %s\n", rc, mdbx_strerror(rc)); - if (rc == MDBX_WANNA_RECOVERY && (envflags & MDBX_RDONLY)) - print("Please run %s in the read-write mode (with '-w' option).\n", prog); - goto bailout; - } - if (verbose) - print(" - %s mode\n", - (envflags & MDBX_EXCLUSIVE) ? "monopolistic" : "cooperative"); - - if ((envflags & MDBX_RDONLY) == 0) { - rc = mdbx_txn_lock(env, false); - if (rc != MDBX_SUCCESS) { - error("mdbx_txn_lock failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - locked = true; - } - - rc = mdbx_txn_begin(env, NULL, MDBX_RDONLY, &txn); - if (rc) { - error("mdbx_txn_begin() failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - rc = mdbx_env_info_ex(env, txn, &envinfo, sizeof(envinfo)); - if (rc) { - error("mdbx_env_info failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - rc = mdbx_env_stat_ex(env, txn, &envstat, sizeof(envstat)); - if (rc) { - error("mdbx_env_stat failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - mdbx_filehandle_t dxb_fd; - rc = mdbx_env_get_fd(env, &dxb_fd); - if (rc) { - error("mdbx_env_get_fd failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - uint64_t dxb_filesize = 0; -#if defined(_WIN32) || defined(_WIN64) - { - BY_HANDLE_FILE_INFORMATION info; - if (!GetFileInformationByHandle(dxb_fd, &info)) - rc = GetLastError(); - else - dxb_filesize = info.nFileSizeLow | (uint64_t)info.nFileSizeHigh << 32; - } -#else - { - struct stat st; - STATIC_ASSERT_MSG(sizeof(off_t) <= sizeof(uint64_t), - "libmdbx requires 64-bit file I/O on 64-bit systems"); - if (fstat(dxb_fd, &st)) - rc = errno; - else - dxb_filesize = st.st_size; - } -#endif - if (rc) { - error("mdbx_filesize failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - errno = 0; - const uint64_t dxbfile_pages = dxb_filesize / envinfo.mi_dxb_pagesize; - alloc_pages = txn->mt_next_pgno; - backed_pages = envinfo.mi_geo.current / envinfo.mi_dxb_pagesize; - if (backed_pages > dxbfile_pages) { - print(" ! backed-pages %" PRIu64 " > file-pages %" PRIu64 "\n", - backed_pages, dxbfile_pages); - ++problems_meta; - } - if (dxbfile_pages < NUM_METAS) - print(" ! file-pages %" PRIu64 " < %u\n", dxbfile_pages, NUM_METAS); - if (backed_pages < NUM_METAS) - print(" ! backed-pages %" PRIu64 " < %u\n", backed_pages, NUM_METAS); - if (backed_pages < NUM_METAS || dxbfile_pages < NUM_METAS) - goto bailout; - if (backed_pages > MAX_PAGENO) { - print(" ! backed-pages %" PRIu64 " > max-pages %" PRIaPGNO "\n", - backed_pages, MAX_PAGENO); - ++problems_meta; - backed_pages = MAX_PAGENO; - } - - if ((envflags & (MDBX_EXCLUSIVE | MDBX_RDONLY)) != MDBX_RDONLY) { - if (backed_pages > dxbfile_pages) { - print(" ! backed-pages %" PRIu64 " > file-pages %" PRIu64 "\n", - backed_pages, dxbfile_pages); - ++problems_meta; - backed_pages = dxbfile_pages; - } - if (alloc_pages > backed_pages) { - print(" ! alloc-pages %" PRIu64 " > backed-pages %" PRIu64 "\n", - alloc_pages, backed_pages); - ++problems_meta; - alloc_pages = backed_pages; - } - } else { - /* LY: DB may be shrinked by writer downto the allocated pages. */ - if (alloc_pages > backed_pages) { - print(" ! alloc-pages %" PRIu64 " > backed-pages %" PRIu64 "\n", - alloc_pages, backed_pages); - ++problems_meta; - alloc_pages = backed_pages; - } - if (alloc_pages > dxbfile_pages) { - print(" ! alloc-pages %" PRIu64 " > file-pages %" PRIu64 "\n", - alloc_pages, dxbfile_pages); - ++problems_meta; - alloc_pages = dxbfile_pages; - } - if (backed_pages > dxbfile_pages) - backed_pages = dxbfile_pages; - } - - if (verbose) { - print(" - pagesize %u (%u system), max keysize %d..%d" - ", max readers %u\n", - envinfo.mi_dxb_pagesize, envinfo.mi_sys_pagesize, - mdbx_env_get_maxkeysize_ex(env, MDBX_DUPSORT), - mdbx_env_get_maxkeysize_ex(env, 0), envinfo.mi_maxreaders); - print_size(" - mapsize ", envinfo.mi_mapsize, "\n"); - if (envinfo.mi_geo.lower == envinfo.mi_geo.upper) - print_size(" - fixed datafile: ", envinfo.mi_geo.current, ""); - else { - print_size(" - dynamic datafile: ", envinfo.mi_geo.lower, ""); - print_size(" .. ", envinfo.mi_geo.upper, ", "); - print_size("+", envinfo.mi_geo.grow, ", "); - print_size("-", envinfo.mi_geo.shrink, "\n"); - print_size(" - current datafile: ", envinfo.mi_geo.current, ""); - } - printf(", %" PRIu64 " pages\n", - envinfo.mi_geo.current / envinfo.mi_dxb_pagesize); -#if defined(_WIN32) || defined(_WIN64) - if (envinfo.mi_geo.shrink && envinfo.mi_geo.current != envinfo.mi_geo.upper) - print(" WARNING: Due Windows system limitations a " - "file couldn't\n be truncated while database " - "is opened. So, the size of\n database file " - "may by large than the database itself,\n " - "until it will be closed or reopened in read-write mode.\n"); -#endif - print(" - transactions: recent %" PRIu64 ", latter reader %" PRIu64 - ", lag %" PRIi64 "\n", - envinfo.mi_recent_txnid, envinfo.mi_latter_reader_txnid, - envinfo.mi_recent_txnid - envinfo.mi_latter_reader_txnid); - - verbose_meta(0, envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign, - envinfo.mi_bootid.meta0.h, envinfo.mi_bootid.meta0.l); - verbose_meta(1, envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign, - envinfo.mi_bootid.meta1.h, envinfo.mi_bootid.meta1.l); - verbose_meta(2, envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign, - envinfo.mi_bootid.meta2.h, envinfo.mi_bootid.meta2.l); - } - - if (verbose > 1) - print(" - performs check for meta-pages clashes\n"); - if (meta_eq(envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign, - envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign)) { - print(" ! meta-%d and meta-%d are clashed\n", 0, 1); - ++problems_meta; - } - if (meta_eq(envinfo.mi_meta1_txnid, envinfo.mi_meta1_sign, - envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign)) { - print(" ! meta-%d and meta-%d are clashed\n", 1, 2); - ++problems_meta; - } - if (meta_eq(envinfo.mi_meta2_txnid, envinfo.mi_meta2_sign, - envinfo.mi_meta0_txnid, envinfo.mi_meta0_sign)) { - print(" ! meta-%d and meta-%d are clashed\n", 2, 0); - ++problems_meta; - } - - const unsigned steady_meta_id = meta_recent(true); - const uint64_t steady_meta_txnid = get_meta_txnid(steady_meta_id); - const unsigned weak_meta_id = meta_recent(false); - const uint64_t weak_meta_txnid = get_meta_txnid(weak_meta_id); - if (envflags & MDBX_EXCLUSIVE) { - if (verbose > 1) - print(" - performs full check recent-txn-id with meta-pages\n"); - if (steady_meta_txnid != envinfo.mi_recent_txnid) { - print(" ! steady meta-%d txn-id mismatch recent-txn-id (%" PRIi64 - " != %" PRIi64 ")\n", - steady_meta_id, steady_meta_txnid, envinfo.mi_recent_txnid); - ++problems_meta; - } - } else if (locked) { - if (verbose > 1) - print(" - performs lite check recent-txn-id with meta-pages (not a " - "monopolistic mode)\n"); - if (weak_meta_txnid != envinfo.mi_recent_txnid) { - print(" ! weak meta-%d txn-id mismatch recent-txn-id (%" PRIi64 - " != %" PRIi64 ")\n", - weak_meta_id, weak_meta_txnid, envinfo.mi_recent_txnid); - ++problems_meta; - } - } else if (verbose) { - print(" - skip check recent-txn-id with meta-pages (monopolistic or " - "read-write mode only)\n"); - } - total_problems += problems_meta; - - if (!dont_traversal) { - struct problem *saved_list; - size_t traversal_problems; - uint64_t empty_pages, lost_bytes; - - print("Traversal b-tree by txn#%" PRIaTXN "...\n", txn->mt_txnid); - fflush(NULL); - walk.pagemap = (short *)mdbx_calloc((size_t)backed_pages, sizeof(*walk.pagemap)); - if (!walk.pagemap) { - rc = errno ? errno : MDBX_ENOMEM; - error("calloc failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - saved_list = problems_push(); - rc = mdbx_env_pgwalk(txn, pgvisitor, NULL); - traversal_problems = problems_pop(saved_list); - - if (rc) { - if (rc != MDBX_EINTR || !check_user_break()) - error("mdbx_env_pgwalk failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto bailout; - } - - for (uint64_t n = 0; n < alloc_pages; ++n) - if (!walk.pagemap[n]) - unused_pages += 1; - - empty_pages = lost_bytes = 0; - for (walk_dbi_t *dbi = &dbi_main; dbi < ARRAY_END(walk.dbi) && dbi->name; - ++dbi) { - empty_pages += dbi->pages.empty; - lost_bytes += dbi->lost_bytes; - } - - if (verbose) { - uint64_t total_page_bytes = walk.pgcount * envstat.ms_psize; - print(" - pages: total %" PRIu64 ", unused %" PRIu64 "\n", walk.pgcount, - unused_pages); - if (verbose > 1) { - for (walk_dbi_t *dbi = walk.dbi; dbi < ARRAY_END(walk.dbi) && dbi->name; - ++dbi) { - print(" %s: subtotal %" PRIu64, dbi->name, dbi->pages.total); - if (dbi->pages.other && dbi->pages.other != dbi->pages.total) - print(", other %" PRIu64, dbi->pages.other); - if (dbi->pages.branch) - print(", branch %" PRIu64, dbi->pages.branch); - if (dbi->pages.large_count) - print(", large %" PRIu64, dbi->pages.large_count); - uint64_t all_leaf = dbi->pages.leaf + dbi->pages.leaf_dupfixed; - if (all_leaf) { - print(", leaf %" PRIu64, all_leaf); - if (verbose > 2 && - (dbi->pages.leaf_dupfixed | dbi->pages.subleaf_dupsort | - dbi->pages.subleaf_dupsort)) - print(" (usual %" PRIu64 ", sub-dupsort %" PRIu64 - ", dupfixed %" PRIu64 ", sub-dupfixed %" PRIu64 ")", - dbi->pages.leaf, dbi->pages.subleaf_dupsort, - dbi->pages.leaf_dupfixed, dbi->pages.subleaf_dupfixed); - } - print("\n"); - } - } - - if (verbose > 1) - print(" - usage: total %" PRIu64 " bytes, payload %" PRIu64 - " (%.1f%%), unused " - "%" PRIu64 " (%.1f%%)\n", - total_page_bytes, walk.total_payload_bytes, - walk.total_payload_bytes * 100.0 / total_page_bytes, - total_page_bytes - walk.total_payload_bytes, - (total_page_bytes - walk.total_payload_bytes) * 100.0 / - total_page_bytes); - if (verbose > 2) { - for (walk_dbi_t *dbi = walk.dbi; dbi < ARRAY_END(walk.dbi) && dbi->name; - ++dbi) - if (dbi->pages.total) { - uint64_t dbi_bytes = dbi->pages.total * envstat.ms_psize; - print(" %s: subtotal %" PRIu64 " bytes (%.1f%%)," - " payload %" PRIu64 " (%.1f%%), unused %" PRIu64 " (%.1f%%)", - dbi->name, dbi_bytes, dbi_bytes * 100.0 / total_page_bytes, - dbi->payload_bytes, dbi->payload_bytes * 100.0 / dbi_bytes, - dbi_bytes - dbi->payload_bytes, - (dbi_bytes - dbi->payload_bytes) * 100.0 / dbi_bytes); - if (dbi->pages.empty) - print(", %" PRIu64 " empty pages", dbi->pages.empty); - if (dbi->lost_bytes) - print(", %" PRIu64 " bytes lost", dbi->lost_bytes); - print("\n"); - } else - print(" %s: empty\n", dbi->name); - } - print(" - summary: average fill %.1f%%", - walk.total_payload_bytes * 100.0 / total_page_bytes); - if (empty_pages) - print(", %" PRIu64 " empty pages", empty_pages); - if (lost_bytes) - print(", %" PRIu64 " bytes lost", lost_bytes); - print(", %" PRIuPTR " problems\n", traversal_problems); - } - } else if (verbose) { - print("Skipping b-tree walk...\n"); - fflush(NULL); - } - - if (!verbose) - print("Iterating DBIs...\n"); - problems_maindb = process_db(~0u, /* MAIN_DBI */ NULL, NULL, false); - problems_freedb = process_db(FREE_DBI, "@GC", handle_freedb, false); - - if (verbose) { - uint64_t value = envinfo.mi_mapsize / envstat.ms_psize; - double percent = value / 100.0; - print(" - space: %" PRIu64 " total pages", value); - print(", backed %" PRIu64 " (%.1f%%)", backed_pages, - backed_pages / percent); - print(", allocated %" PRIu64 " (%.1f%%)", alloc_pages, - alloc_pages / percent); - - if (verbose > 1) { - value = envinfo.mi_mapsize / envstat.ms_psize - alloc_pages; - print(", remained %" PRIu64 " (%.1f%%)", value, value / percent); - - value = alloc_pages - gc_pages; - print(", used %" PRIu64 " (%.1f%%)", value, value / percent); - - print(", gc %" PRIu64 " (%.1f%%)", gc_pages, gc_pages / percent); - - value = gc_pages - reclaimable_pages; - print(", detained %" PRIu64 " (%.1f%%)", value, value / percent); - - print(", reclaimable %" PRIu64 " (%.1f%%)", reclaimable_pages, - reclaimable_pages / percent); - } - - value = - envinfo.mi_mapsize / envstat.ms_psize - alloc_pages + reclaimable_pages; - print(", available %" PRIu64 " (%.1f%%)\n", value, value / percent); - } - - if (problems_maindb == 0 && problems_freedb == 0) { - if (!dont_traversal && - (envflags & (MDBX_EXCLUSIVE | MDBX_RDONLY)) != MDBX_RDONLY) { - if (walk.pgcount != alloc_pages - gc_pages) { - error("used pages mismatch (%" PRIu64 "(walked) != %" PRIu64 - "(allocated - GC))\n", - walk.pgcount, alloc_pages - gc_pages); - } - if (unused_pages != gc_pages) { - error("gc pages mismatch (%" PRIu64 "(walked) != %" PRIu64 "(GC))\n", - unused_pages, gc_pages); - } - } else if (verbose) { - print(" - skip check used and gc pages (btree-traversal with " - "monopolistic or read-write mode only)\n"); - } - - if (!process_db(MAIN_DBI, NULL, handle_maindb, true)) { - if (!userdb_count && verbose) - print(" - does not contain multiple databases\n"); - } - } - - if (rc == 0 && total_problems == 1 && problems_meta == 1 && !dont_traversal && - (envflags & MDBX_RDONLY) == 0 && !only_subdb && - steady_meta_txnid < envinfo.mi_recent_txnid) { - print("Perform sync-to-disk for make steady checkpoint at txn-id #%" PRIi64 - "\n", - envinfo.mi_recent_txnid); - fflush(NULL); - if (locked) { - mdbx_txn_unlock(env); - locked = false; - } - rc = mdbx_env_sync_ex(env, true, false); - if (rc != MDBX_SUCCESS) - error("mdbx_env_pgwalk failed, error %d %s\n", rc, mdbx_strerror(rc)); - else { - total_problems -= 1; - problems_meta -= 1; - } - } - -bailout: - if (txn) - mdbx_txn_abort(txn); - if (locked) { - mdbx_txn_unlock(env); - locked = false; - } - if (env) { - const bool dont_sync = rc != 0 || total_problems; - mdbx_env_close_ex(env, dont_sync); - } - fflush(NULL); - if (rc) { - if (rc < 0) - return user_break ? EXIT_INTERRUPTED : EXIT_FAILURE_SYS; - return EXIT_FAILURE_MDB; - } - -#if defined(_WIN32) || defined(_WIN64) - timestamp_finish = GetTickCount64(); - elapsed = (timestamp_finish - timestamp_start) * 1e-3; -#else - if (clock_gettime(CLOCK_MONOTONIC, ×tamp_finish)) { - rc = errno; - error("clock_gettime failed, error %d %s\n", rc, mdbx_strerror(rc)); - return EXIT_FAILURE_SYS; - } - elapsed = timestamp_finish.tv_sec - timestamp_start.tv_sec + - (timestamp_finish.tv_nsec - timestamp_start.tv_nsec) * 1e-9; -#endif /* !WINDOWS */ - - if (total_problems) { - print("Total %" PRIu64 " error%s detected, elapsed %.3f seconds.\n", - total_problems, (total_problems > 1) ? "s are" : " is", elapsed); - if (problems_meta || problems_maindb || problems_freedb) - return EXIT_FAILURE_CHECK_MAJOR; - return EXIT_FAILURE_CHECK_MINOR; - } - print("No error is detected, elapsed %.3f seconds\n", elapsed); - return EXIT_SUCCESS; -} diff --git a/tools/mdbx_chk/src/stdafx.cxx b/tools/mdbx_chk/src/stdafx.cxx deleted file mode 100644 index 77a6bea7ef..0000000000 --- a/tools/mdbx_chk/src/stdafx.cxx +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright (C) 2018-20 Miranda NG team (https://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdafx.h" - -#include "..\..\build\appstub\appstub.cpp" diff --git a/tools/mdbx_chk/src/stdafx.h b/tools/mdbx_chk/src/stdafx.h deleted file mode 100644 index f22afc24b5..0000000000 --- a/tools/mdbx_chk/src/stdafx.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright (C) 2018-20 Miranda NG team (https://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include <stdio.h> -#include <windows.h> - -#define DECLARE_VERSION() \ - mdbx_version_info MDBX_version; \ - mdbx_build_info MDBX_build; \ - char* MDBX_sourcery_anchor; \ - HINSTANCE hDll = LoadLibraryA("libmdbx.mir"); \ - MDBX_version = *(mdbx_version_info *)GetProcAddress(hDll, "mdbx_version"); \ - MDBX_build = *(mdbx_build_info*)GetProcAddress(hDll, "mdbx_build"); \ - MDBX_sourcery_anchor = (char*)GetProcAddress(hDll, "mdbx_sourcery_MDBX_BUILD_SOURCERY"); diff --git a/tools/mdbx_dump/src/mdbx_dump.cc b/tools/mdbx_dump/src/mdbx_dump.cc deleted file mode 100644 index 138650d8e7..0000000000 --- a/tools/mdbx_dump/src/mdbx_dump.cc +++ /dev/null @@ -1,393 +0,0 @@ -/* mdbx_dump.c - memory-mapped database dump tool */ - -/* - * Copyright 2015-2020 Leonid Yuriev <leo@yuriev.ru> - * and other libmdbx authors: please see AUTHORS file. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted only as authorized by the OpenLDAP - * Public License. - * - * A copy of this license is available in the file LICENSE in the - * top-level directory of the distribution or, alternatively, at - * <http://www.OpenLDAP.org/license.html>. */ - -#include "stdafx.h" - -#ifdef _MSC_VER -#if _MSC_VER > 1800 -#pragma warning(disable : 4464) /* relative include path contains '..' */ -#endif -#pragma warning(disable : 4996) /* The POSIX name is deprecated... */ -#endif /* _MSC_VER (warnings) */ - -#define MDBX_TOOLS /* Avoid using internal mdbx_assert() */ -#include "../../libs/libmdbx/src/src/internals.h" - -#include <ctype.h> - -#define PRINT 1 -static int mode; - -typedef struct flagbit { - int bit; - char *name; -} flagbit; - -flagbit dbflags[] = {{MDBX_REVERSEKEY, "reversekey"}, - {MDBX_DUPSORT, "dupsort"}, - {MDBX_INTEGERKEY, "integerkey"}, - {MDBX_DUPFIXED, "dupfixed"}, - {MDBX_INTEGERDUP, "integerdup"}, - {MDBX_REVERSEDUP, "reversedup"}, - {0, NULL}}; - -#if defined(_WIN32) || defined(_WIN64) -#include "../../libs/libmdbx/src/src/wingetopt.h" -#include "../../libs/libmdbx/src/src/wingetopt.c" - -static volatile BOOL user_break; -static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { - (void)dwCtrlType; - user_break = true; - return true; -} - -#else /* WINDOWS */ - -static volatile sig_atomic_t user_break; -static void signal_handler(int sig) { - (void)sig; - user_break = 1; -} - -#endif /* !WINDOWS */ - -static const char hexc[] = "0123456789abcdef"; - -static void dumpbyte(unsigned char c) { - putchar(hexc[c >> 4]); - putchar(hexc[c & 0xf]); -} - -static void text(MDBX_val *v) { - unsigned char *c, *end; - - putchar(' '); - c = (BYTE*)v->iov_base; - end = c + v->iov_len; - while (c < end) { - if (isprint(*c) && *c != '\\') { - putchar(*c); - } else { - putchar('\\'); - dumpbyte(*c); - } - c++; - } - putchar('\n'); -} - -static void dumpval(MDBX_val *v) { - unsigned char *c, *end; - - putchar(' '); - c = (BYTE*)v->iov_base; - end = c + v->iov_len; - while (c < end) { - dumpbyte(*c++); - } - putchar('\n'); -} - -/* Dump in BDB-compatible format */ -static int dumpit(MDBX_txn *txn, MDBX_dbi dbi, char *name) { - MDBX_cursor *mc; - MDBX_stat ms; - MDBX_val key, data; - MDBX_envinfo info; - unsigned int flags; - int rc, i; - - rc = mdbx_dbi_flags(txn, dbi, &flags); - if (rc) - return rc; - - rc = mdbx_dbi_stat(txn, dbi, &ms, sizeof(ms)); - if (rc) - return rc; - - rc = mdbx_env_info_ex(mdbx_txn_env(txn), txn, &info, sizeof(info)); - if (rc) - return rc; - - printf("VERSION=3\n"); - printf("format=%s\n", mode & PRINT ? "print" : "bytevalue"); - if (name) - printf("database=%s\n", name); - printf("type=btree\n"); - printf("mapsize=%" PRIu64 "\n", info.mi_geo.upper); - printf("maxreaders=%u\n", info.mi_maxreaders); - - for (i = 0; dbflags[i].bit; i++) - if (flags & dbflags[i].bit) - printf("%s=1\n", dbflags[i].name); - - printf("db_pagesize=%d\n", ms.ms_psize); - printf("HEADER=END\n"); - - rc = mdbx_cursor_open(txn, dbi, &mc); - if (rc) - return rc; - - while ((rc = mdbx_cursor_get(mc, &key, &data, MDBX_NEXT)) == MDBX_SUCCESS) { - if (user_break) { - rc = MDBX_EINTR; - break; - } - if (mode & PRINT) { - text(&key); - text(&data); - } else { - dumpval(&key); - dumpval(&data); - } - } - printf("DATA=END\n"); - if (rc == MDBX_NOTFOUND) - rc = MDBX_SUCCESS; - - return rc; -} - -static void usage(char *prog) { - fprintf(stderr, - "usage: %s [-V] [-q] [-f file] [-l] [-p] [-a|-s subdb] [-r] [-n] " - "dbpath\n" - " -V\t\tprint version and exit\n" - " -q\t\tbe quiet\n" - " -f\t\twrite to file instead of stdout\n" - " -l\t\tlist subDBs and exit\n" - " -p\t\tuse printable characters\n" - " -a\t\tdump main DB and all subDBs,\n" - " \t\tby default dump only the main DB\n" - " -s\t\tdump only the named subDB\n" - " -r\t\trescure mode (ignore errors to dump corrupted DB)\n" - " -n\t\tNOSUBDIR mode for open\n", - prog); - exit(EXIT_FAILURE); -} - -int main(int argc, char *argv[]) { - int i, rc; - MDBX_env *env; - MDBX_txn *txn; - MDBX_dbi dbi; - char *prog = argv[0]; - char *envname; - char *subname = NULL; - int alldbs = 0, envflags = 0, list = 0, quiet = 0, rescue = 0; - DECLARE_VERSION(); - - if (argc < 2) - usage(prog); - - while ((i = getopt(argc, argv, "af:lnps:Vrq")) != EOF) { - switch (i) { - case 'V': - printf("mdbx_dump version %d.%d.%d.%d\n" - " - source: %s %s, commit %s, tree %s\n" - " - anchor: %s\n" - " - build: %s for %s by %s\n" - " - flags: %s\n" - " - options: %s\n", - MDBX_version.major, MDBX_version.minor, MDBX_version.release, - MDBX_version.revision, MDBX_version.git.describe, - MDBX_version.git.datetime, MDBX_version.git.commit, - MDBX_version.git.tree, MDBX_sourcery_anchor, MDBX_build.datetime, - MDBX_build.target, MDBX_build.compiler, MDBX_build.flags, - MDBX_build.options); - return EXIT_SUCCESS; - case 'l': - list = 1; - /*FALLTHROUGH*/; - __fallthrough; - case 'a': - if (subname) - usage(prog); - alldbs++; - break; - case 'f': - if (freopen(optarg, "w", stdout) == NULL) { - fprintf(stderr, "%s: %s: reopen: %s\n", prog, optarg, - mdbx_strerror(errno)); - exit(EXIT_FAILURE); - } - break; - case 'n': - envflags |= MDBX_NOSUBDIR; - break; - case 'p': - mode |= PRINT; - break; - case 's': - if (alldbs) - usage(prog); - subname = optarg; - break; - case 'q': - quiet = 1; - break; - case 'r': - rescue = 1; - break; - default: - usage(prog); - } - } - - if (optind != argc - 1) - usage(prog); - -#if defined(_WIN32) || defined(_WIN64) - SetConsoleCtrlHandler(ConsoleBreakHandlerRoutine, true); -#else -#ifdef SIGPIPE - signal(SIGPIPE, signal_handler); -#endif -#ifdef SIGHUP - signal(SIGHUP, signal_handler); -#endif - signal(SIGINT, signal_handler); - signal(SIGTERM, signal_handler); -#endif /* !WINDOWS */ - - envname = argv[optind]; - if (!quiet) { - fprintf(stderr, "mdbx_dump %s (%s, T-%s)\nRunning for %s...\n", - MDBX_version.git.describe, MDBX_version.git.datetime, - MDBX_version.git.tree, envname); - fflush(NULL); - } - - rc = mdbx_env_create(&env); - if (rc) { - fprintf(stderr, "mdbx_env_create failed, error %d %s\n", rc, - mdbx_strerror(rc)); - return EXIT_FAILURE; - } - - if (alldbs || subname) { - mdbx_env_set_maxdbs(env, 2); - } - - rc = mdbx_env_open( - env, envname, - envflags | (rescue ? MDBX_RDONLY | MDBX_EXCLUSIVE : MDBX_RDONLY), 0); - if (rc) { - fprintf(stderr, "mdbx_env_open failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - - rc = mdbx_txn_begin(env, NULL, MDBX_RDONLY, &txn); - if (rc) { - fprintf(stderr, "mdbx_txn_begin failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - - rc = mdbx_dbi_open(txn, subname, 0, &dbi); - if (rc) { - fprintf(stderr, "mdbx_open failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto txn_abort; - } - - if (alldbs) { - MDBX_cursor *cursor; - MDBX_val key; - int count = 0; - - rc = mdbx_cursor_open(txn, dbi, &cursor); - if (rc) { - fprintf(stderr, "mdbx_cursor_open failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto txn_abort; - } - while ((rc = mdbx_cursor_get(cursor, &key, NULL, MDBX_NEXT_NODUP)) == 0) { - if (user_break) { - rc = MDBX_EINTR; - break; - } - char *str; - MDBX_dbi db2; - if (memchr(key.iov_base, '\0', key.iov_len)) - continue; - count++; - str = (char*)mdbx_malloc(key.iov_len + 1); - memcpy(str, key.iov_base, key.iov_len); - str[key.iov_len] = '\0'; - rc = mdbx_dbi_open(txn, str, 0, &db2); - if (rc == MDBX_SUCCESS) { - if (list) { - printf("%s\n", str); - list++; - } else { - rc = dumpit(txn, db2, str); - if (rc) { - if (!rescue) - break; - fprintf(stderr, "%s: %s: ignore %s for `%s` and continue\n", prog, - envname, mdbx_strerror(rc), str); - /* Here is a hack for rescue mode, don't do that: - * - we should restart transaction in case error due - * database corruption; - * - but we won't close cursor, reopen and re-positioning it - * for new a transaction; - * - this is possible since DB is opened in read-only exclusive - * mode and transaction is the same, i.e. has the same address - * and so on. */ - rc = mdbx_txn_reset(txn); - if (rc) { - fprintf(stderr, "mdbx_txn_reset failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - rc = mdbx_txn_renew(txn); - if (rc) { - fprintf(stderr, "mdbx_txn_renew failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - } - } - mdbx_dbi_close(env, db2); - } - mdbx_free(str); - if (rc) - continue; - } - mdbx_cursor_close(cursor); - if (!count) { - fprintf(stderr, "%s: %s does not contain multiple databases\n", prog, - envname); - rc = MDBX_NOTFOUND; - } else if (rc == MDBX_INCOMPATIBLE) { - /* LY: the record it not a named sub-db. */ - rc = MDBX_SUCCESS; - } - } else { - rc = dumpit(txn, dbi, subname); - } - if (rc && rc != MDBX_NOTFOUND) - fprintf(stderr, "%s: %s: %s\n", prog, envname, mdbx_strerror(rc)); - - mdbx_dbi_close(env, dbi); -txn_abort: - mdbx_txn_abort(txn); -env_close: - mdbx_env_close(env); - - return rc ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/tools/mdbx_dump/src/stdafx.cxx b/tools/mdbx_dump/src/stdafx.cxx deleted file mode 100644 index 77a6bea7ef..0000000000 --- a/tools/mdbx_dump/src/stdafx.cxx +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright (C) 2018-20 Miranda NG team (https://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdafx.h" - -#include "..\..\build\appstub\appstub.cpp" diff --git a/tools/mdbx_dump/src/stdafx.h b/tools/mdbx_dump/src/stdafx.h deleted file mode 100644 index f22afc24b5..0000000000 --- a/tools/mdbx_dump/src/stdafx.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright (C) 2018-20 Miranda NG team (https://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include <stdio.h> -#include <windows.h> - -#define DECLARE_VERSION() \ - mdbx_version_info MDBX_version; \ - mdbx_build_info MDBX_build; \ - char* MDBX_sourcery_anchor; \ - HINSTANCE hDll = LoadLibraryA("libmdbx.mir"); \ - MDBX_version = *(mdbx_version_info *)GetProcAddress(hDll, "mdbx_version"); \ - MDBX_build = *(mdbx_build_info*)GetProcAddress(hDll, "mdbx_build"); \ - MDBX_sourcery_anchor = (char*)GetProcAddress(hDll, "mdbx_sourcery_MDBX_BUILD_SOURCERY"); diff --git a/tools/mdbx_load/src/mdbx_load.cc b/tools/mdbx_load/src/mdbx_load.cc deleted file mode 100644 index d9f7f872bd..0000000000 --- a/tools/mdbx_load/src/mdbx_load.cc +++ /dev/null @@ -1,622 +0,0 @@ -/* mdbx_load.c - memory-mapped database load tool */ - -/* - * Copyright 2015-2020 Leonid Yuriev <leo@yuriev.ru> - * and other libmdbx authors: please see AUTHORS file. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted only as authorized by the OpenLDAP - * Public License. - * - * A copy of this license is available in the file LICENSE in the - * top-level directory of the distribution or, alternatively, at - * <http://www.OpenLDAP.org/license.html>. */ - -#include "stdafx.h" - -#ifdef _MSC_VER -#if _MSC_VER > 1800 -#pragma warning(disable : 4464) /* relative include path contains '..' */ -#endif -#pragma warning(disable : 4996) /* The POSIX name is deprecated... */ -#endif /* _MSC_VER (warnings) */ - -#define MDBX_TOOLS /* Avoid using internal mdbx_assert() */ -#include "../../libs/libmdbx/src/src/internals.h" - -#include <ctype.h> - -#if defined(_WIN32) || defined(_WIN64) -#include "../../libs/libmdbx/src/src/wingetopt.h" -#include "../../libs/libmdbx/src/src/wingetopt.c" - -static volatile BOOL user_break; -static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { - (void)dwCtrlType; - user_break = true; - return true; -} - -#else /* WINDOWS */ - -static volatile sig_atomic_t user_break; -static void signal_handler(int sig) { - (void)sig; - user_break = 1; -} - -#endif /* !WINDOWS */ - -#define PRINT 1 -#define NOHDR 2 -static int mode; - -static char *subname = NULL; -static size_t lineno; -static int version; - -static int dbi_flags; -static char *prog; -static bool Eof; - -static MDBX_envinfo envinfo; -static MDBX_val kbuf, dbuf; -static MDBX_val k0buf; - -#define STRLENOF(s) (sizeof(s) - 1) - -typedef struct flagbit { - int bit; - char *name; - int len; -} flagbit; - -#define S(s) s, STRLENOF(s) - -flagbit dbflags[] = {{MDBX_REVERSEKEY, S("reversekey")}, - {MDBX_DUPSORT, S("dupsort")}, - {MDBX_INTEGERKEY, S("integerkey")}, - {MDBX_DUPFIXED, S("dupfixed")}, - {MDBX_INTEGERDUP, S("integerdup")}, - {MDBX_REVERSEDUP, S("reversedup")}, - {0, NULL, 0}}; - -static void readhdr(void) { - char *ptr; - - dbi_flags = 0; - while (fgets((char*)dbuf.iov_base, (int)dbuf.iov_len, stdin) != NULL) { - lineno++; - - if (!strncmp((char *)dbuf.iov_base, "db_pagesize=", STRLENOF("db_pagesize="))) { - envinfo.mi_dxb_pagesize = - atoi((char *)dbuf.iov_base + STRLENOF("db_pagesize=")); - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "duplicates=", STRLENOF("duplicates="))) { - dbi_flags |= MDBX_DUPSORT; - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "VERSION=", STRLENOF("VERSION="))) { - version = atoi((char *)dbuf.iov_base + STRLENOF("VERSION=")); - if (version > 3) { - fprintf(stderr, "%s: line %" PRIiSIZE ": unsupported VERSION %d\n", - prog, lineno, version); - exit(EXIT_FAILURE); - } - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "HEADER=END", STRLENOF("HEADER=END"))) - return; - - if (!strncmp((char *)dbuf.iov_base, "format=", STRLENOF("format="))) { - if (!strncmp((char *)dbuf.iov_base + STRLENOF("FORMAT="), "print", - STRLENOF("print"))) - mode |= PRINT; - else if (strncmp((char *)dbuf.iov_base + STRLENOF("FORMAT="), "bytevalue", - STRLENOF("bytevalue"))) { - fprintf(stderr, "%s: line %" PRIiSIZE ": unsupported FORMAT %s\n", prog, - lineno, (char *)dbuf.iov_base + STRLENOF("FORMAT=")); - exit(EXIT_FAILURE); - } - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "database=", STRLENOF("database="))) { - ptr = (char *)memchr(dbuf.iov_base, '\n', dbuf.iov_len); - if (ptr) - *ptr = '\0'; - if (subname) - mdbx_free(subname); - subname = mdbx_strdup((char *)dbuf.iov_base + STRLENOF("database=")); - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "type=", STRLENOF("type="))) { - if (strncmp((char *)dbuf.iov_base + STRLENOF("type="), "btree", - STRLENOF("btree"))) { - fprintf(stderr, "%s: line %" PRIiSIZE ": unsupported type %s\n", prog, - lineno, (char *)dbuf.iov_base + STRLENOF("type=")); - exit(EXIT_FAILURE); - } - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "mapaddr=", STRLENOF("mapaddr="))) { - int i; - ptr = (char *)memchr(dbuf.iov_base, '\n', dbuf.iov_len); - if (ptr) - *ptr = '\0'; - void *unused; - i = sscanf((char *)dbuf.iov_base + STRLENOF("mapaddr="), "%p", &unused); - if (i != 1) { - fprintf(stderr, "%s: line %" PRIiSIZE ": invalid mapaddr %s\n", prog, - lineno, (char *)dbuf.iov_base + STRLENOF("mapaddr=")); - exit(EXIT_FAILURE); - } - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "mapsize=", STRLENOF("mapsize="))) { - int i; - ptr = (char *)memchr(dbuf.iov_base, '\n', dbuf.iov_len); - if (ptr) - *ptr = '\0'; - i = sscanf((char *)dbuf.iov_base + STRLENOF("mapsize="), "%" PRIu64, - &envinfo.mi_mapsize); - if (i != 1) { - fprintf(stderr, "%s: line %" PRIiSIZE ": invalid mapsize %s\n", prog, - lineno, (char *)dbuf.iov_base + STRLENOF("mapsize=")); - exit(EXIT_FAILURE); - } - continue; - } - - if (!strncmp((char *)dbuf.iov_base, "maxreaders=", STRLENOF("maxreaders="))) { - int i; - ptr = (char *)memchr(dbuf.iov_base, '\n', dbuf.iov_len); - if (ptr) - *ptr = '\0'; - i = sscanf((char *)dbuf.iov_base + STRLENOF("maxreaders="), "%u", - &envinfo.mi_maxreaders); - if (i != 1) { - fprintf(stderr, "%s: line %" PRIiSIZE ": invalid maxreaders %s\n", prog, - lineno, (char *)dbuf.iov_base + STRLENOF("maxreaders=")); - exit(EXIT_FAILURE); - } - continue; - } - - int i; - for (i = 0; dbflags[i].bit; i++) { - if (!strncmp((char *)dbuf.iov_base, dbflags[i].name, dbflags[i].len) && - ((char *)dbuf.iov_base)[dbflags[i].len] == '=') { - if (((char *)dbuf.iov_base)[dbflags[i].len + 1] == '1') - dbi_flags |= dbflags[i].bit; - break; - } - } - if (!dbflags[i].bit) { - ptr = (char *)memchr(dbuf.iov_base, '=', dbuf.iov_len); - if (!ptr) { - fprintf(stderr, "%s: line %" PRIiSIZE ": unexpected format\n", prog, - lineno); - exit(EXIT_FAILURE); - } else { - *ptr = '\0'; - fprintf(stderr, - "%s: line %" PRIiSIZE ": unrecognized keyword ignored: %s\n", - prog, lineno, (char *)dbuf.iov_base); - } - } - } - Eof = true; -} - -static void badend(void) { - fprintf(stderr, "%s: line %" PRIiSIZE ": unexpected end of input\n", prog, - lineno); -} - -static int unhex(unsigned char *c2) { - int x, c; - x = *c2++ & 0x4f; - if (x & 0x40) - x -= 55; - c = x << 4; - x = *c2 & 0x4f; - if (x & 0x40) - x -= 55; - c |= x; - return c; -} - -static int readline(MDBX_val *out, MDBX_val *buf) { - unsigned char *c1, *c2, *end; - size_t len, l2; - int c; - - if (!(mode & NOHDR)) { - c = fgetc(stdin); - if (c == EOF) { - Eof = true; - return EOF; - } - if (c != ' ') { - lineno++; - if (fgets((char *)buf->iov_base, (int)buf->iov_len, stdin) == NULL) { - badend: - Eof = true; - badend(); - return EOF; - } - if (c == 'D' && !strncmp((char *)buf->iov_base, "ATA=END", STRLENOF("ATA=END"))) - return EOF; - goto badend; - } - } - if (fgets((char *)buf->iov_base, (int)buf->iov_len, stdin) == NULL) { - Eof = true; - return EOF; - } - lineno++; - - c1 = (unsigned char *)buf->iov_base; - len = strlen((char *)c1); - l2 = len; - - /* Is buffer too short? */ - while (c1[len - 1] != '\n') { - buf->iov_base = mdbx_realloc(buf->iov_base, buf->iov_len * 2); - if (!buf->iov_base) { - Eof = true; - fprintf(stderr, "%s: line %" PRIiSIZE ": out of memory, line too long\n", - prog, lineno); - return EOF; - } - c1 = (unsigned char *)buf->iov_base; - c1 += l2; - if (fgets((char *)c1, (int)buf->iov_len + 1, stdin) == NULL) { - Eof = true; - badend(); - return EOF; - } - buf->iov_len *= 2; - len = strlen((char *)c1); - l2 += len; - } - c1 = c2 = (unsigned char *)buf->iov_base; - len = l2; - c1[--len] = '\0'; - end = c1 + len; - - if (mode & PRINT) { - while (c2 < end) { - if (unlikely(*c2 == '\\')) { - if (c2[1] == '\\') { - *c1++ = '\\'; - } else { - if (c2 + 3 > end || !isxdigit(c2[1]) || !isxdigit(c2[2])) { - Eof = true; - badend(); - return EOF; - } - *c1++ = (char)unhex(++c2); - } - c2 += 2; - } else { - /* copies are redundant when no escapes were used */ - *c1++ = *c2++; - } - } - } else { - /* odd length not allowed */ - if (len & 1) { - Eof = true; - badend(); - return EOF; - } - while (c2 < end) { - if (!isxdigit(*c2) || !isxdigit(c2[1])) { - Eof = true; - badend(); - return EOF; - } - *c1++ = (char)unhex(c2); - c2 += 2; - } - } - c2 = (unsigned char *)(out->iov_base = buf->iov_base); - out->iov_len = c1 - c2; - - return 0; -} - -static void usage(void) { - fprintf(stderr, - "usage: %s [-V] [-q] [-a] [-f file] [-s name] [-N] [-T] [-r] [-n] " - "dbpath\n" - " -V\t\tprint version and exit\n" - " -q\t\tbe quiet\n" - " -a\t\tappend records in input order (required for custom " - "comparators)\n" - " -f file\tread from file instead of stdin\n" - " -s name\tload into named subDB\n" - " -N\t\tuse NOOVERWRITE on puts\n" - " -T\t\tread plaintext\n" - " -r\t\trescure mode (ignore errors to load corrupted DB dump)\n" - " -n\t\tNOSUBDIR mode for open\n", - prog); - exit(EXIT_FAILURE); -} - -static int anyway_greater(const MDBX_val *a, const MDBX_val *b) { - (void)a; - (void)b; - return 1; -} - -int main(int argc, char *argv[]) { - int i, rc; - MDBX_env *env = NULL; - MDBX_txn *txn = NULL; - MDBX_cursor *mc = NULL; - MDBX_dbi dbi; - char *envname = NULL; - int envflags = MDBX_UTTERLY_NOSYNC, putflags = 0; - int append = 0; - int quiet = 0; - int rescue = 0; - MDBX_val prevk; - DECLARE_VERSION(); - - prog = argv[0]; - if (argc < 2) - usage(); - - while ((i = getopt(argc, argv, "af:ns:NTVrq")) != EOF) { - switch (i) { - case 'V': - printf("mdbx_load version %d.%d.%d.%d\n" - " - source: %s %s, commit %s, tree %s\n" - " - anchor: %s\n" - " - build: %s for %s by %s\n" - " - flags: %s\n" - " - options: %s\n", - MDBX_version.major, MDBX_version.minor, MDBX_version.release, - MDBX_version.revision, MDBX_version.git.describe, - MDBX_version.git.datetime, MDBX_version.git.commit, - MDBX_version.git.tree, MDBX_sourcery_anchor, MDBX_build.datetime, - MDBX_build.target, MDBX_build.compiler, MDBX_build.flags, - MDBX_build.options); - return EXIT_SUCCESS; - case 'a': - append = 1; - break; - case 'f': - if (freopen(optarg, "r", stdin) == NULL) { - fprintf(stderr, "%s: %s: open: %s\n", prog, optarg, - mdbx_strerror(errno)); - exit(EXIT_FAILURE); - } - break; - case 'n': - envflags |= MDBX_NOSUBDIR; - break; - case 's': - subname = mdbx_strdup(optarg); - break; - case 'N': - putflags = MDBX_NOOVERWRITE | MDBX_NODUPDATA; - break; - case 'T': - mode |= NOHDR | PRINT; - break; - case 'q': - quiet = 1; - break; - case 'r': - rescue = 1; - break; - default: - usage(); - } - } - - if (optind != argc - 1) - usage(); - -#if defined(_WIN32) || defined(_WIN64) - SetConsoleCtrlHandler(ConsoleBreakHandlerRoutine, true); -#else -#ifdef SIGPIPE - signal(SIGPIPE, signal_handler); -#endif -#ifdef SIGHUP - signal(SIGHUP, signal_handler); -#endif - signal(SIGINT, signal_handler); - signal(SIGTERM, signal_handler); -#endif /* !WINDOWS */ - - envname = argv[optind]; - if (!quiet) - printf("mdbx_load %s (%s, T-%s)\nRunning for %s...\n", - MDBX_version.git.describe, MDBX_version.git.datetime, - MDBX_version.git.tree, envname); - fflush(NULL); - - dbuf.iov_len = 4096; - dbuf.iov_base = mdbx_malloc(dbuf.iov_len); - - /* read first header for mapsize= */ - if (!(mode & NOHDR)) - readhdr(); - - rc = mdbx_env_create(&env); - if (rc) { - fprintf(stderr, "mdbx_env_create failed, error %d %s\n", rc, - mdbx_strerror(rc)); - return EXIT_FAILURE; - } - - mdbx_env_set_maxdbs(env, 2); - -#ifdef MDBX_FIXEDMAP - if (info.mi_mapaddr) - envflags |= MDBX_FIXEDMAP; -#endif - - if (envinfo.mi_mapsize) { - if (envinfo.mi_mapsize > INTPTR_MAX) { - fprintf(stderr, - "Database size is too large for current system (mapsize=%" PRIu64 - " is great than system-limit %zi)\n", - envinfo.mi_mapsize, INTPTR_MAX); - goto env_close; - } - rc = mdbx_env_set_geometry(env, 0, 0, (intptr_t)envinfo.mi_mapsize, -1, -1, - -1); - if (rc) { - fprintf(stderr, "mdbx_env_set_geometry failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - } - - rc = mdbx_env_open(env, envname, envflags, 0664); - if (rc) { - fprintf(stderr, "mdbx_env_open failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - - kbuf.iov_len = mdbx_env_get_maxvalsize_ex(env, MDBX_DUPSORT); - if (kbuf.iov_len >= INTPTR_MAX / 4) { - fprintf(stderr, "mdbx_env_get_maxkeysize failed, returns %zu\n", - kbuf.iov_len); - goto env_close; - } - kbuf.iov_len = (kbuf.iov_len + 1) * 2; - kbuf.iov_base = malloc(kbuf.iov_len * 2); - k0buf.iov_len = kbuf.iov_len; - k0buf.iov_base = (char *)kbuf.iov_base + kbuf.iov_len; - prevk.iov_base = k0buf.iov_base; - - while (!Eof) { - if (user_break) { - rc = MDBX_EINTR; - break; - } - - rc = mdbx_txn_begin(env, NULL, 0, &txn); - if (rc) { - fprintf(stderr, "mdbx_txn_begin failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - - rc = mdbx_dbi_open_ex(txn, subname, dbi_flags | MDBX_CREATE, &dbi, - append ? anyway_greater : NULL, - append ? anyway_greater : NULL); - if (rc) { - fprintf(stderr, "mdbx_open failed, error %d %s\n", rc, mdbx_strerror(rc)); - goto txn_abort; - } - - rc = mdbx_cursor_open(txn, dbi, &mc); - if (rc) { - fprintf(stderr, "mdbx_cursor_open failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto txn_abort; - } - - int batch = 0; - prevk.iov_len = 0; - while (1) { - MDBX_val key; - rc = readline(&key, &kbuf); - if (rc) /* rc == EOF */ - break; - - MDBX_val data; - rc = readline(&data, &dbuf); - if (rc) { - fprintf(stderr, "%s: line %" PRIiSIZE ": failed to read key value\n", - prog, lineno); - goto txn_abort; - } - - int appflag = 0; - if (append) { - appflag = MDBX_APPEND; - if (dbi_flags & MDBX_DUPSORT) { - if (prevk.iov_len == key.iov_len && - memcmp(prevk.iov_base, key.iov_base, key.iov_len) == 0) - appflag = MDBX_APPEND | MDBX_APPENDDUP; - else - memcpy(prevk.iov_base, key.iov_base, prevk.iov_len = key.iov_len); - } - } - rc = mdbx_cursor_put(mc, &key, &data, putflags | appflag); - if (rc == MDBX_KEYEXIST && putflags) - continue; - if (rc == MDBX_BAD_VALSIZE && rescue) { - fprintf(stderr, "%s: skip line %" PRIiSIZE ": due %s\n", prog, lineno, - mdbx_strerror(rc)); - continue; - } - if (rc) { - fprintf(stderr, "mdbx_cursor_put failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto txn_abort; - } - batch++; - if (batch == 100) { - rc = mdbx_txn_commit(txn); - if (rc) { - fprintf(stderr, "%s: line %" PRIiSIZE ": txn_commit: %s\n", prog, - lineno, mdbx_strerror(rc)); - goto env_close; - } - rc = mdbx_txn_begin(env, NULL, 0, &txn); - if (rc) { - fprintf(stderr, "mdbx_txn_begin failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto env_close; - } - rc = mdbx_cursor_open(txn, dbi, &mc); - if (rc) { - fprintf(stderr, "mdbx_cursor_open failed, error %d %s\n", rc, - mdbx_strerror(rc)); - goto txn_abort; - } - batch = 0; - } - } - rc = mdbx_txn_commit(txn); - txn = NULL; - if (rc) { - fprintf(stderr, "%s: line %" PRIiSIZE ": txn_commit: %s\n", prog, lineno, - mdbx_strerror(rc)); - goto env_close; - } - mdbx_dbi_close(env, dbi); - subname = NULL; - - /* try read next header */ - if (!(mode & NOHDR)) - readhdr(); - } - -txn_abort: - mdbx_txn_abort(txn); -env_close: - mdbx_env_close(env); - - return rc ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/tools/mdbx_load/src/stdafx.cxx b/tools/mdbx_load/src/stdafx.cxx deleted file mode 100644 index 22c4818d32..0000000000 --- a/tools/mdbx_load/src/stdafx.cxx +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright (C) 2018-20 Miranda NG team (https://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdafx.h" - -#include "..\..\build\appstub\appstub.cpp"
\ No newline at end of file diff --git a/tools/mdbx_load/src/stdafx.h b/tools/mdbx_load/src/stdafx.h deleted file mode 100644 index 518027200a..0000000000 --- a/tools/mdbx_load/src/stdafx.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright (C) 2018-20 Miranda NG team (https://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include <stdio.h> -#include <stdint.h> -#include <windows.h> - -#define DECLARE_VERSION() \ - mdbx_version_info MDBX_version; \ - mdbx_build_info MDBX_build; \ - char* MDBX_sourcery_anchor; \ - HINSTANCE hDll = LoadLibraryA("libmdbx.mir"); \ - MDBX_version = *(mdbx_version_info *)GetProcAddress(hDll, "mdbx_version"); \ - MDBX_build = *(mdbx_build_info*)GetProcAddress(hDll, "mdbx_build"); \ - MDBX_sourcery_anchor = (char*)GetProcAddress(hDll, "mdbx_sourcery_MDBX_BUILD_SOURCERY"); |