diff options
Diffstat (limited to 'plugins')
388 files changed, 1103 insertions, 18979 deletions
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 766c758af6..c082c6d43e 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -71,7 +71,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/AVS/src/version.h b/plugins/AVS/src/version.h index 0475c9ef0c..3473705c14 100644 --- a/plugins/AVS/src/version.h +++ b/plugins/AVS/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "AVS.dll"
#define __DESCRIPTION "Loads and manages contact pictures for other plugins."
#define __AUTHOR "Nightwish, Pescuma"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/AVS/"
#define __COPYRIGHT "© 2000-2012 Miranda-IM project, 2012-17 Miranda NG team"
diff --git a/plugins/Actman/actman.dpr b/plugins/Actman/actman.dpr index 3608e7d906..c22251e46a 100644 --- a/plugins/Actman/actman.dpr +++ b/plugins/Actman/actman.dpr @@ -76,7 +76,6 @@ begin PluginInfo.description:='Plugin for manage hotkeys to open contact window, insert text, '+
'run program and call services';
PluginInfo.author :='Awkward';
- PluginInfo.authorEmail:='panda75@bk.ru; awk1975@ya.ru';
PluginInfo.copyright :='(c) 2007-2013 Awkward';
PluginInfo.homepage :='http://code.google.com/p/delphi-miranda-plugins/';
PluginInfo.flags :=UNICODE_AWARE;
diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index 85bab9265a..44ce81bad8 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -25,7 +25,6 @@ struct AddDialogParam : public MZeroedObject {
AddDialogParam() {}
- int handleType;
HANDLE handle;
CMStringA proto;
PROTOSEARCHRESULT *psr;
@@ -155,7 +154,6 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM) switch (msg) {
case WM_INITDIALOG:
acs = new AddDialogParam();
- acs->handleType = HANDLE_SEARCHRESULT;
SetWindowLongPtr(hdlg, GWLP_USERDATA, (LONG_PTR)acs);
Utils_RestoreWindowPositionNoSize(hdlg, NULL, "AddContact", "");
diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index cfe6f2e09c..0220d8cdf9 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -39,7 +39,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/AddContactPlus/src/stdafx.h b/plugins/AddContactPlus/src/stdafx.h index db8647b8b6..bd1c6996d8 100644 --- a/plugins/AddContactPlus/src/stdafx.h +++ b/plugins/AddContactPlus/src/stdafx.h @@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <m_langpack.h>
#include <m_message.h>
#include <m_protosvc.h>
-#include <m_addcontact.h>
+#include <m_contacts.h>
#include <m_string.h>
#include "m_toptoolbar.h"
diff --git a/plugins/AddContactPlus/src/version.h b/plugins/AddContactPlus/src/version.h index b713e1b69f..e80935759d 100644 --- a/plugins/AddContactPlus/src/version.h +++ b/plugins/AddContactPlus/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "AddContactPlus.dll" #define __DESCRIPTION "Provides the ability to quickly add new contacts." #define __AUTHOR "Bartosz 'Dezeath' Białek" -#define __AUTHOREMAIL "dezred@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/AddContactPlus/" #define __COPYRIGHT "© 2007-17 Bartosz 'Dezeath' Białek, Miranda NG Team" diff --git a/plugins/AdvaImg/src/main.cpp b/plugins/AdvaImg/src/main.cpp index d2294db9a9..9becaa631c 100644 --- a/plugins/AdvaImg/src/main.cpp +++ b/plugins/AdvaImg/src/main.cpp @@ -41,7 +41,6 @@ static const PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE | STATIC_PLUGIN,
diff --git a/plugins/AdvaImg/src/version.h b/plugins/AdvaImg/src/version.h index e2da56456d..7fd84ae00a 100644 --- a/plugins/AdvaImg/src/version.h +++ b/plugins/AdvaImg/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "AdvaImg.dll"
#define __DESCRIPTION "Generic image services for Miranda NG."
#define __AUTHOR "Nightwish, The FreeImage project (http://freeimage.sourceforge.net/)"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/AdvaImg/"
#define __COPYRIGHT "© 2000-2012 Miranda-IM project, 2012-17 Miranda NG project uses the FreeImage distribution"
diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index 0e3139bc50..81de39ed09 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -30,7 +30,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Alarms/src/version.h b/plugins/Alarms/src/version.h index 3c291c46d3..682c6f7df3 100755 --- a/plugins/Alarms/src/version.h +++ b/plugins/Alarms/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Alarms.dll" #define __DESCRIPTION "Sets once-off, daily, weekly and weekday alarms." #define __AUTHOR "Scott Ellis" -#define __AUTHOREMAIL "mail@scottellis.com.au" #define __AUTHORWEB "https://miranda-ng.org/p/Alarms/" #define __COPYRIGHT "© 2005 Scott Ellis" diff --git a/plugins/AsSingleWindow/src/AsSingleWindow.cpp b/plugins/AsSingleWindow/src/AsSingleWindow.cpp index 371db5e7f3..a2447bdd7b 100644 --- a/plugins/AsSingleWindow/src/AsSingleWindow.cpp +++ b/plugins/AsSingleWindow/src/AsSingleWindow.cpp @@ -13,7 +13,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/AsSingleWindow/src/version.h b/plugins/AsSingleWindow/src/version.h index 751dc2b189..e482a3d770 100644 --- a/plugins/AsSingleWindow/src/version.h +++ b/plugins/AsSingleWindow/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "AsSingleWindow.dll" #define __DESCRIPTION "Allows you to move, minimize and activate Miranda's windows as if it were a single window." #define __AUTHOR "Aleksey Smyrnov aka Soar" -#define __AUTHOREMAIL "i@soar.name" #define __AUTHORWEB "https://miranda-ng.org/p/AsSingleWindow/" #define __COPYRIGHT "© 2010-2011 Soar, 2017 Miranda NG team" diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp index 5f7d515073..a5287b7a4c 100644 --- a/plugins/AssocMgr/src/main.cpp +++ b/plugins/AssocMgr/src/main.cpp @@ -33,7 +33,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index 1175e20807..cce177b15f 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
/*
-#define AIM_SUPPORT_TEST
#define ICQ_SUPPORT_TEST
#define YAHOO_SUPPORT_TEST
#define MSN_SUPPORT_TEST
@@ -66,138 +65,6 @@ static int __inline AssocMgr_AddNewUrlType(const char *prefix, const char *desc, // -----------------------------------------
-#ifdef AIM_SUPPORT_TEST
-
-#define AIM_PROTOCOL_NAME "AIM"
-#define IDI_AOL 28
-#define MOD_KEY_CL "CList"
-#define AIM_KEY_NL "NotOnList"
-struct oscar_data { HINSTANCE hInstance; } static conn;
-static __inline HANDLE find_contact(const char *nick) { nick; return NULL; }
-static __inline HANDLE add_contact(const char *nick) { nick; return db_find_first(); }
-static __inline void aim_gchat_joinrequest(const char *room, int exchange) { room; exchange; MessageBoxA(NULL, "Join group chat!", room, MB_OK); return; }
-#include <m_protosvc.h>
-#include <m_message.h>
-
-#include "m_assocmgr.h"
-static HANDLE hHookModulesLoaded;
-static HANDLE hServiceParseLink;
-
-static int ServiceParseAimLink(WPARAM, LPARAM lParam)
-{
- char *arg = (char*)lParam;
- if (arg == NULL) return 1; /* sanity check */
- /* skip leading prefix */
- arg = strchr(arg, ':');
- if (arg == NULL) return 1; /* parse failed */
- for (++arg; *arg == '/'; ++arg);
- /*
- add user: aim:addbuddy?screenname=NICK&groupname=GROUP
- send message: aim:goim?screenname=NICK&message=MSG
- open chatroom: aim:gochat?roomname=ROOM&exchange=NUM
- */
- /* add a contact to the list */
- if (!_strnicmp(arg, "addbuddy?", 9)) {
- char *tok, *sn = NULL, *group = NULL;
- ADDCONTACTSTRUCT acs;
- PROTOSEARCHRESULT psr;
- if (*(arg += 9) == 0) return 1; /* parse failed */
- tok = strtok(arg, "&"); /* first token */
- while (tok != NULL) {
- if (!_strnicmp(tok, "screenname=", 11) && *(tok + 11) != 0)
- sn = Netlib_UrlDecode(tok + 11);
- if (!_strnicmp(tok, "groupname=", 10) && *(tok + 10) != 0)
- group = Netlib_UrlDecode(tok + 10); /* group is currently ignored */
- tok = strtok(NULL, "&"); /* next token */
- }
- if (sn == NULL) return 1; /* parse failed */
- if (find_contact(sn) == NULL) { /* does not yet check if sn is current user */
- acs.handleType = HANDLE_SEARCHRESULT;
- acs.szProto = AIM_PROTOCOL_NAME;
- acs.psr = &psr;
- memset(&psr, 0, sizeof(PROTOSEARCHRESULT));
- psr.cbSize = sizeof(PROTOSEARCHRESULT);
- psr.nick.w = sn;
- CallService(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);
- }
- return 0;
- }
- /* send a message to a contact */
- else if (!_strnicmp(arg, "goim?", 5)) {
- char *tok, *sn = NULL, *msg = NULL;
- MCONTACT hContact;
- if (*(arg += 5) == 0) return 1; /* parse failed */
- tok = strtok(arg, "&"); /* first token */
- while (tok != NULL) {
- if (!_strnicmp(tok, "screenname=", 11) && *(tok + 11) != 0)
- sn = Netlib_UrlDecode(tok + 11);
- if (!_strnicmp(tok, "message=", 8) && *(tok + 8) != 0)
- msg = Netlib_UrlDecode(tok + 8);
- tok = strtok(NULL, "&"); /* next token */
- }
- if (sn == NULL) return 1; /* parse failed */
- if (ServiceExists(MS_MSG_SENDMESSAGE)) {
- hContact = find_contact(sn);
- if (hContact == NULL) {
- hContact = add_contact(sn); /* does not yet check if sn is current user */
- if (hContact != NULL)
- db_set_b(hContact, MOD_KEY_CL, AIM_KEY_NL, 1);
- }
- if (hContact != NULL)
- CallService(MS_MSG_SENDMESSAGE, hContact, (LPARAM)msg);
- }
- return 0;
- }
- /* open a chatroom */
- else if (!_strnicmp(arg, "gochat?", 7)) {
- char *tok, *rm = NULL;
- int exchange = 0;
- if (*(arg += 7) == 0) return 1; /* parse failed */
- tok = strtok(arg, "&"); /* first token */
- while (tok != NULL) {
- if (!_strnicmp(tok, "roomname=", 9) && *(tok + 9) != 0)
- rm = Netlib_UrlDecode(tok + 9);
- if (!_strnicmp(tok, "exchange=", 9))
- exchange = atoi(Netlib_UrlDecode(tok + 9));
- tok = strtok(NULL, "&"); /* next token */
- }
- if (rm == NULL || exchange <= 0) return 1; /* parse failed */
- aim_gchat_joinrequest(rm, exchange);
- return 0;
- }
- return 1; /* parse failed */
-}
-
-static int AimLinksModulesLoaded(WPARAM wParam, LPARAM lParam)
-{
- char service_name[MAXMODULELABELLENGTH];
- UNREFERENCED_PARAMETER(wParam);
- UNREFERENCED_PARAMETER(lParam);
- mir_snprintf(service_name, _countof(service_name), "%s%s", AIM_PROTOCOL_NAME, "ParseAimLink");
- /* or "AOL Instant Messenger Links" */
- AssocMgr_AddNewUrlType("aim:", Translate("AIM link protocol"), conn.hInstance, IDI_AOL, service_name, 0);
- return 0;
-}
-
-void aim_links_init()
-{
- char service_name[MAXMODULELABELLENGTH];
- //LOG(LOG_DEBUG,"Links: init");
- mir_snprintf(service_name, _countof(service_name), "%s%s", AIM_PROTOCOL_NAME, "ParseAimLink");
- hServiceParseLink = CreateServiceFunction(service_name, ServiceParseAimLink);
- hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, AimLinksModulesLoaded);
-}
-
-void aim_links_destroy()
-{
- //LOG(LOG_DEBUG,"Links: destroy");
- UnhookEvent(hHookModulesLoaded);
- DestroyServiceFunction(hServiceParseLink);
-}
-#endif
-
-// -----------------------------------------
-
#ifdef ICQ_SUPPORT_TEST
#define gpszICQProtoName "ICQ"
@@ -808,10 +675,6 @@ int JabberLinksUninit() void InitTest(void)
{
- #ifdef AIM_SUPPORT_TEST
- conn.hInstance = GetModuleHandleA("AIM");
- aim_links_init();
- #endif
#ifdef ICQ_SUPPORT_TEST
InitIcqFiles();
#endif
@@ -833,9 +696,6 @@ void InitTest(void) void UninitTest(void)
{
- #ifdef AIM_SUPPORT_TEST
- aim_links_destroy();
- #endif
#ifdef ICQ_SUPPORT_TEST
UninitIcqFiles();
#endif
diff --git a/plugins/AssocMgr/src/version.h b/plugins/AssocMgr/src/version.h index a44ef73797..34cd557e93 100644 --- a/plugins/AssocMgr/src/version.h +++ b/plugins/AssocMgr/src/version.h @@ -28,8 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __PLUGIN_NAME "File association manager"
#define __FILENAME "AssocMgr.dll"
-#define __DESCRIPTION "Handles file type associations and URLs like aim, gg, mirpu, wpmsg, xmpp, ymsgr."
+#define __DESCRIPTION "Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr."
#define __AUTHOR "H. Herkenrath"
-#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
#define __AUTHORWEB "https://miranda-ng.org/p/AssocMgr/"
#define __COPYRIGHT "© 2005-2007 H. Herkenrath"
diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp index db2de1db13..25f3810ac0 100644 --- a/plugins/AuthState/src/main.cpp +++ b/plugins/AuthState/src/main.cpp @@ -47,7 +47,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/AuthState/src/version.h b/plugins/AuthState/src/version.h index 2c5e7c555e..4150d6ab48 100644 --- a/plugins/AuthState/src/version.h +++ b/plugins/AuthState/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "AuthState.dll"
#define __DESCRIPTION "If a contact didn't authorize you, this plugin puts an icon in front of the contact's name."
#define __AUTHOR "Thief, idea by snwbrdr"
-#define __AUTHOREMAIL "thief@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/AuthState/"
#define __COPYRIGHT "© 2006-2010 Alexander Turyak"
diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp index 559f636240..3ff33f1192 100644 --- a/plugins/AutoRun/src/main.cpp +++ b/plugins/AutoRun/src/main.cpp @@ -10,7 +10,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/AutoRun/src/version.h b/plugins/AutoRun/src/version.h index f20a747e70..c3cc5bf0d3 100644 --- a/plugins/AutoRun/src/version.h +++ b/plugins/AutoRun/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "AutoRun.dll" #define __DESCRIPTION "This plugin is a simple way to enable/disable to launch Miranda NG with system startup." #define __AUTHOR "Sergey V. Gershovich a.k.a. Jazzy$ (fixed by Wolfram3D)" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/AutoRun/" #define __COPYRIGHT "© 2002-2007 Sergey V. Gershovich a.k.a. Jazzy$" diff --git a/plugins/AutoShutdown/src/main.cpp b/plugins/AutoShutdown/src/main.cpp index 2d68004d38..8f7b49e539 100644 --- a/plugins/AutoShutdown/src/main.cpp +++ b/plugins/AutoShutdown/src/main.cpp @@ -30,7 +30,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/AutoShutdown/src/version.h b/plugins/AutoShutdown/src/version.h index f5d42980ae..70bd98da09 100644 --- a/plugins/AutoShutdown/src/version.h +++ b/plugins/AutoShutdown/src/version.h @@ -30,6 +30,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __FILENAME "AutoShutdown.dll"
#define __DESCRIPTION "Adds the possibility to shutdown the computer when a specified event occurs."
#define __AUTHOR "H. Herkenrath"
-#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
#define __AUTHORWEB "https://miranda-ng.org/p/AutoShutdown/"
#define __COPYRIGHT "© 2004-2007 H. Herkenrath"
diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp index cc4704a7c2..3e1d86f3f8 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.cpp +++ b/plugins/AvatarHistory/src/AvatarHistory.cpp @@ -49,7 +49,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/AvatarHistory/src/version.h b/plugins/AvatarHistory/src/version.h index e5d722027d..1845c37b13 100644 --- a/plugins/AvatarHistory/src/version.h +++ b/plugins/AvatarHistory/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "AvatarHistory.dll" #define __DESCRIPTION "This plugin keeps backups of all your contacts' avatar changes and/or shows popups." #define __AUTHOR "Matthew Wild (MattJ), Ricardo Pescuma Domenecci" -#define __AUTHOREMAIL "mwild1@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/AvatarHistory/" #define __COPYRIGHT "© 2006-2012 Matthew Wild, Ricardo Pescuma Domenecci" diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 372bfb8d1a..a7277ed097 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -40,7 +40,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/BASS_interface/src/version.h b/plugins/BASS_interface/src/version.h index 0e5ddf90f1..3e759149d5 100644 --- a/plugins/BASS_interface/src/version.h +++ b/plugins/BASS_interface/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "BASS_interface.dll" #define __DESCRIPTION "Un4seen's BASS interface Miranda NG plugin." #define __AUTHOR "tico-tico" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/BASS_interface/" #define __COPYRIGHT "© 2010, 2011 tico-tico" diff --git a/plugins/BasicHistory/res/BasicHistory.rc b/plugins/BasicHistory/res/BasicHistory.rc index c32965b95b..3cc23aeebf 100644 --- a/plugins/BasicHistory/res/BasicHistory.rc +++ b/plugins/BasicHistory/res/BasicHistory.rc @@ -150,7 +150,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Export to txt",IDC_STATIC,4,5,298,37
+ GROUPBOX "Export to text file",IDC_STATIC,4,5,298,37
COMBOBOX IDC_TXTENC,142,20,152,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "File encoding*",IDC_STATIC,12,23,115,8
GROUPBOX "Export to plain HTML",IDC_STATIC,4,47,298,50
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index ee6d36e9a7..9240b619aa 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -45,7 +45,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index abb6c6dcf2..900ff701a1 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -220,7 +220,7 @@ static HotkeyOptionsList g_HotkeyOptionsList[] = { { "basichistory_hot_delete", LPGENW("Delete"), LPGENW("History"), nullptr, VK_DELETE, HISTORY_HK_DELETE },
{ "basichistory_hot_exrhtml", LPGENW("Export to rich HTML"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXRHTML },
{ "basichistory_hot_exphtml", LPGENW("Export to plain HTML"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXPHTML },
- { "basichistory_hot_extxt", LPGENW("Export to txt"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXTXT },
+ { "basichistory_hot_extxt", LPGENW("Export to text file"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXTXT },
{ "basichistory_hot_exbin", LPGENW("Export to binary"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXBIN },
{ "basichistory_hot_impbin", LPGENW("Import from binary"), LPGENW("History"), nullptr, 0, HISTORY_HK_IMPBIN },
{ "basichistory_hot_exdat", LPGENW("Export to dat (mContacts)"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXDAT },
diff --git a/plugins/BasicHistory/src/version.h b/plugins/BasicHistory/src/version.h index c35aa19fb6..c5dd484953 100644 --- a/plugins/BasicHistory/src/version.h +++ b/plugins/BasicHistory/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "BasicHistory.dll"
#define __DESCRIPTION "History viewer for Miranda NG."
#define __AUTHOR "Krzysztof Kral"
-#define __AUTHOREMAIL "krzysztof.kral@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/BasicHistory/"
#define __COPYRIGHT "© 2011-2012 Krzysztof Kral"
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index c0efda901f..09e2949a95 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -38,7 +38,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Boltun/src/version.h b/plugins/Boltun/src/version.h index 7b357643f1..2597b1cf34 100644 --- a/plugins/Boltun/src/version.h +++ b/plugins/Boltun/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Boltun.dll" #define __DESCRIPTION "Boltun, the chat bot in the russian language." #define __AUTHOR "Alexander S. Kiselev, Valentin Pavlyuchenko" -#define __AUTHOREMAIL "Valentin.Pavlyuchenko@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/Boltun/" #define __COPYRIGHT "© 2003-2008 Alexander S. Kiselev A.K.A. KAS, Valentin Pavlyuchenko" diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 9d7df65878..f5b7dfca1a 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -47,7 +47,6 @@ static PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/BossKeyPlus/src/version.h b/plugins/BossKeyPlus/src/version.h index e945144c80..8bae3d9f5d 100644 --- a/plugins/BossKeyPlus/src/version.h +++ b/plugins/BossKeyPlus/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "BossKey.dll"
#define __DESCRIPTION "Anti-Boss plugin. Makes your Miranda NG hidden or password-protected."
#define __AUTHOR "Goblineye Entertainment, Billy_Bons"
-#define __AUTHOREMAIL "tatarinov.sergey@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/BossKey/"
#define __COPYRIGHT "© 2002-2003 Goblineye Entertainment, 2007-2010 Billy_Bons"
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index d8b1ef3749..23ff90150d 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -44,7 +44,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/BuddyExpectator/src/version.h b/plugins/BuddyExpectator/src/version.h index 1fa45b1cbd..b273356d67 100644 --- a/plugins/BuddyExpectator/src/version.h +++ b/plugins/BuddyExpectator/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "BuddyExpectator.dll" #define __DESCRIPTION "Reacts to the return of contacts, or to the extended absence of contacts, with notifications and other actions." #define __AUTHOR "Anar Ibragimoff, sje, Thief" -#define __AUTHOREMAIL "thief@miranda.im" #define __AUTHORWEB "https://miranda-ng.org/p/BuddyExpectator/" #define __COPYRIGHT "© 2005 Anar Ibragimoff, 2006 Scott Ellis, 2007-2009 Alexander Turyak" diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index 250e76658f..7b9a7d2087 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -11,7 +11,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/BuddyPounce/src/version.h b/plugins/BuddyPounce/src/version.h index 2d34dbc48c..a6bd8c6de4 100644 --- a/plugins/BuddyPounce/src/version.h +++ b/plugins/BuddyPounce/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "BuddyPounce.dll" #define __DESCRIPTION "Allows you to send a message to contacts if they change status." #define __AUTHOR "Jonathan Gordon" -#define __AUTHOREMAIL "jdgordy@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/BuddyPounce/" #define __COPYRIGHT "© 2004 Jonathan Gordon" diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index eda2793387..d90e0181d4 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -1,28 +1,28 @@ /* ======================================================================== - Custom Status List - __________________ - - Custom Status List plugin for Miranda-IM (www.miranda-im.org) - Follower of Custom Status History List by HANAX - Copyright © 2006-2008 HANAX - Copyright © 2007-2009 jarvis - Occasionally rewritten in 2012 by George Hazan - - 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; either version 2 - of the License, or (at your option) any later version. - - 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, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - ======================================================================== */ +Custom Status List +__________________ + +Custom Status List plugin for Miranda-IM (www.miranda-im.org) +Follower of Custom Status History List by HANAX +Copyright © 2006-2008 HANAX +Copyright © 2007-2009 jarvis +Occasionally rewritten in 2012 by George Hazan + +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; either version 2 +of the License, or (at your option) any later version. + +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, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +======================================================================== */ #include "stdafx.h" #include "strpos.h" @@ -40,7 +40,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/CSList/src/version.h b/plugins/CSList/src/version.h index 5f304453c5..075828514c 100644 --- a/plugins/CSList/src/version.h +++ b/plugins/CSList/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "CSList.dll" #define __DESCRIPTION "This plugin offers simple management functions to keep your extra statuses on one place." #define __AUTHOR "Mataes, jarvis" -#define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/CSList/" #define __COPYRIGHT "© 2010-17 Mataes, 2007-09 jarvis" diff --git a/plugins/ChangeKeyboardLayout/src/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp index 7aeb901eeb..5286a2f871 100644 --- a/plugins/ChangeKeyboardLayout/src/main.cpp +++ b/plugins/ChangeKeyboardLayout/src/main.cpp @@ -17,7 +17,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ChangeKeyboardLayout/src/version.h b/plugins/ChangeKeyboardLayout/src/version.h index 6af003e08e..7e728b45e1 100644 --- a/plugins/ChangeKeyboardLayout/src/version.h +++ b/plugins/ChangeKeyboardLayout/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "ChangeKeyboardLayout.dll" #define __DESCRIPTION "Plugin for changing keyboard layout of text (multilayout)." #define __AUTHOR "Yasnovidyashii" -#define __AUTHOREMAIL "Yasnovidyashii@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/ChangeKeyboardLayout/" #define __COPYRIGHT "© 2006-2009 Mikhail Yur'ev" diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 05a4423f30..13d278ad16 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ClientChangeNotify/src/version.h b/plugins/ClientChangeNotify/src/version.h index c47192ad2f..1c2ba5b5d1 100644 --- a/plugins/ClientChangeNotify/src/version.h +++ b/plugins/ClientChangeNotify/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "ClientChangeNotify.dll" #define __DESCRIPTION "Shows a notification when someone in your contact list changes his client." #define __AUTHOR "Deathdemon" -#define __AUTHOREMAIL "dchervov@yahoo.com" #define __AUTHORWEB "https://miranda-ng.org/p/ClientChangeNotify/" #define __COPYRIGHT "© 2006-2008 Chervov Dmitry" diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index 2d9bc0046c..d26e31f06c 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -69,7 +69,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Clist_blind/src/version.h b/plugins/Clist_blind/src/version.h index acdb1e35d7..fe89420bb4 100644 --- a/plugins/Clist_blind/src/version.h +++ b/plugins/Clist_blind/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Clist_blind.dll" #define __DESCRIPTION "A contact list for blind folks." #define __AUTHOR "Ricardo Pescuma Domenecci, based on previous work from Miranda IM project" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/Clist_blind/" #define __COPYRIGHT "© 2000-2009 Miranda IM project, Ricardo Pescuma Domenecci, 2013-17 Miranda NG project" diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 93ba4e9d21..7adc9acd78 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -48,7 +48,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Clist_modern/src/version.h b/plugins/Clist_modern/src/version.h index 31af1f54d3..4d7628f1f1 100644 --- a/plugins/Clist_modern/src/version.h +++ b/plugins/Clist_modern/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Clist_modern.dll"
#define __DESCRIPTION "Displays contacts, event notifications, protocol status with advanced visual modifications. Supported multi-window modifications, enhanced metacontact cooperation."
#define __AUTHOR "Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven"
-#define __AUTHOREMAIL "ashpynov@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/Clist_modern/"
#define __COPYRIGHT "© 2000-2010 Miranda-IM project"
diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index 5076f93f09..f1a57c2dac 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -173,13 +173,8 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA break;
case IDC_IGN_ADDPERMANENTLY:
- {
- ADDCONTACTSTRUCT acs = { 0 };
- acs.hContact = hContact;
- acs.handleType = HANDLE_CONTACT;
- CallService(MS_ADDCONTACT_SHOW, (WPARAM)hWnd, (LPARAM)&acs);
- Utils::enableDlgControl(hWnd, IDC_IGN_ADDPERMANENTLY, db_get_b(hContact, "CList", "NotOnList", 0));
- }
+ Contact_Add(hContact, hWnd);
+ Utils::enableDlgControl(hWnd, IDC_IGN_ADDPERMANENTLY, db_get_b(hContact, "CList", "NotOnList", 0));
break;
case IDC_DSP_LOADDEFAULT:
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index 48628a673b..3d99ee7197 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -69,7 +69,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h index 9754475682..71ccf05041 100644 --- a/plugins/Clist_nicer/src/stdafx.h +++ b/plugins/Clist_nicer/src/stdafx.h @@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_options.h>
#include <m_protosvc.h>
#include <m_skin.h>
-#include <m_addcontact.h>
+#include <m_contacts.h>
#include <m_timezones.h>
#include <m_cluiframes.h>
#include <m_icolib.h>
diff --git a/plugins/Clist_nicer/src/version.h b/plugins/Clist_nicer/src/version.h index 13f6690c71..982fee189e 100644 --- a/plugins/Clist_nicer/src/version.h +++ b/plugins/Clist_nicer/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Clist_nicer.dll"
#define __DESCRIPTION "Displays contacts, event notifications, protocol status."
#define __AUTHOR "Pixel, egoDust, cyreve, Nightwish"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Clist_nicer/"
#define __COPYRIGHT "© 2000-2010 Miranda-IM project"
diff --git a/plugins/Cln_skinedit/src/main.cpp b/plugins/Cln_skinedit/src/main.cpp index 4f1fbd08fe..70e1916972 100644 --- a/plugins/Cln_skinedit/src/main.cpp +++ b/plugins/Cln_skinedit/src/main.cpp @@ -32,7 +32,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/Cln_skinedit/src/version.h b/plugins/Cln_skinedit/src/version.h index 49d9d2c68f..bd97cdf19e 100644 --- a/plugins/Cln_skinedit/src/version.h +++ b/plugins/Cln_skinedit/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Cln_skinedit.dll" #define __DESCRIPTION "Allows inline skin item editing for Clist nicer." #define __AUTHOR "Nightwish, Pixel" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/Cln_skinedit/" #define __COPYRIGHT "© 2000-2006 Miranda-IM project" diff --git a/plugins/CloudFile/src/http_request.h b/plugins/CloudFile/src/http_request.h index 39d0d98b57..aed8167b98 100644 --- a/plugins/CloudFile/src/http_request.h +++ b/plugins/CloudFile/src/http_request.h @@ -60,7 +60,7 @@ protected: szLogin, szPassword); - ptrA ePair(mir_base64_encode((BYTE*)(char*)cPair, length)); + ptrA ePair(mir_base64_encode(cPair, length)); length = mir_strlen(ePair) + 7; char *value = (char*)mir_calloc(length + 1); diff --git a/plugins/CloudFile/src/main.cpp b/plugins/CloudFile/src/main.cpp index 15f87f8bf3..ffdf7bfeb5 100644 --- a/plugins/CloudFile/src/main.cpp +++ b/plugins/CloudFile/src/main.cpp @@ -11,7 +11,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/CloudFile/src/version.h b/plugins/CloudFile/src/version.h index 23b1f2094f..a528b9ed70 100644 --- a/plugins/CloudFile/src/version.h +++ b/plugins/CloudFile/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "CloudFile.dll" #define __DESCRIPTION "Allows you to transfer files via cloud services." #define __AUTHOR "Miranda NG Team" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/CloudFile/" #define __COPYRIGHT "© 2017 Miranda NG project" diff --git a/plugins/CmdLine/src/CmdLine.cpp b/plugins/CmdLine/src/CmdLine.cpp index 6c6bf029c2..b84d0e75e5 100644 --- a/plugins/CmdLine/src/CmdLine.cpp +++ b/plugins/CmdLine/src/CmdLine.cpp @@ -31,7 +31,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/CmdLine/src/version.h b/plugins/CmdLine/src/version.h index 6f9d7a7e52..489988db0c 100644 --- a/plugins/CmdLine/src/version.h +++ b/plugins/CmdLine/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "CmdLine.dll"
#define __DESCRIPTION "This plugin lets you control Miranda from the command line."
#define __AUTHOR "Cristian Libotean"
-#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/CmdLine/"
#define __COPYRIGHT "© 2007-2011 Cristian Libotean"
diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp index a989e81651..c0b09a621a 100644 --- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp +++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp @@ -47,7 +47,6 @@ PLUGININFOEX pluginInfo = { __VERSION_DWORD,
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE, //not transient
diff --git a/plugins/ConnectionNotify/src/version.h b/plugins/ConnectionNotify/src/version.h index a147192ba9..fbfc5a21c5 100644 --- a/plugins/ConnectionNotify/src/version.h +++ b/plugins/ConnectionNotify/src/version.h @@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __DESCRIPTION "Notify with popup if some connection established"
#define __AUTHOR "MaKaR"
-#define __AUTHOREMAIL "makar@poczta.of.pl"
#define __COPYRIGHT "© 2011-2013 MaKaRSoFT"
#define __AUTHORWEB "https://miranda-ng.org/p/ConnectionNotify/"
#define __PLUGIN_DISPLAY_NAME "ConnectionNotify"
diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp index 096090c674..ce90769d08 100644 --- a/plugins/Console/src/init.cpp +++ b/plugins/Console/src/init.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Console/src/version.h b/plugins/Console/src/version.h index 57d5d11c65..f0f464486b 100644 --- a/plugins/Console/src/version.h +++ b/plugins/Console/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Console.dll"
#define __DESCRIPTION "Console log window for Miranda."
#define __AUTHOR "Bio"
-#define __AUTHOREMAIL "bio@ktaspb.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/Console/"
#define __COPYRIGHT "© 2005-2012 Bio"
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index 5a878c8c05..fed2bd4394 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -43,7 +43,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp index 67b2290358..5b919d71fe 100644 --- a/plugins/ContactsPlus/src/receive.cpp +++ b/plugins/ContactsPlus/src/receive.cpp @@ -355,7 +355,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara case ID_POPUP_ADDUSER:
hContact = CreateTemporaryContactForItem(hwndDlg, wndData, wndData->iPopupItem);
if (hContact)
- DialogAddContactExecute(hwndDlg, hContact);
+ Contact_Add(hContact, hwndDlg);
break;
case ID_POPUP_USERDETAILS:
@@ -389,7 +389,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara break;
case IDC_ADD:
- DialogAddContactExecute(hwndDlg, wndData->mhContact);
+ Contact_Add(wndData->mhContact, hwndDlg);
break;
}
}
diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index 9887b10071..6176597a39 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -372,7 +372,7 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara break;
case IDC_ADD:
- DialogAddContactExecute(hwndDlg, wndData->hContact);
+ Contact_Add(wndData->hContact, hwndDlg);
break;
}
break;
diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h index 14b3a280b9..6ae4c02e89 100644 --- a/plugins/ContactsPlus/src/stdafx.h +++ b/plugins/ContactsPlus/src/stdafx.h @@ -35,7 +35,7 @@ #include "m_clist.h"
#include "m_clistint.h"
#include "m_clc.h"
-#include "m_addcontact.h"
+#include "m_contacts.h"
#include "m_history.h"
#include "m_userinfo.h"
#include "m_button.h"
diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp index c6c079cf3a..acc2c47a16 100644 --- a/plugins/ContactsPlus/src/utils.cpp +++ b/plugins/ContactsPlus/src/utils.cpp @@ -87,15 +87,6 @@ wchar_t* GetContactUID(MCONTACT hContact) return nullptr;
}
-void DialogAddContactExecute(HWND hwndDlg, MCONTACT hNewContact)
-{
- ADDCONTACTSTRUCT acs = { 0 };
- acs.hContact = hNewContact;
- acs.handleType = HANDLE_CONTACT;
- CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);
-}
-
-
void DrawProtocolIcon(HWND hwndDlg, LPARAM lParam, MCONTACT hContact)
{
LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
diff --git a/plugins/ContactsPlus/src/utils.h b/plugins/ContactsPlus/src/utils.h index 01eee73411..6a15ed06c9 100644 --- a/plugins/ContactsPlus/src/utils.h +++ b/plugins/ContactsPlus/src/utils.h @@ -40,8 +40,6 @@ void UpdateDialogAddButton(HWND hwndDlg, MCONTACT hContact); HICON InitMButton(HWND hDlg, int idButton, int idIcon, wchar_t *szTip);
-void DialogAddContactExecute(HWND hwndDlg, MCONTACT hNewContact);
-
HICON LoadContactProtoIcon(MCONTACT hContact);
void EnableDlgItem(HWND hwndDlg, UINT control, int state);
diff --git a/plugins/ContactsPlus/src/version.h b/plugins/ContactsPlus/src/version.h index 0e8658af31..0fc50cc6ba 100644 --- a/plugins/ContactsPlus/src/version.h +++ b/plugins/ContactsPlus/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Contacts.dll" #define __DESCRIPTION "Allows you to send and receive contacts." #define __AUTHOR "Joe Kucera, Todor Totev" -#define __AUTHOREMAIL "jokusoftware@miranda-im.org" #define __AUTHORWEB "https://miranda-ng.org/p/Contacts/" #define __COPYRIGHT "© 2004-2008 Joe Kucera, Original code © 2002 Dominus Procellarum" diff --git a/plugins/ContextHelp/src/main.cpp b/plugins/ContextHelp/src/main.cpp index a5bd86455e..b5dff62eb1 100644 --- a/plugins/ContextHelp/src/main.cpp +++ b/plugins/ContextHelp/src/main.cpp @@ -32,7 +32,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ContextHelp/src/stdafx.h b/plugins/ContextHelp/src/stdafx.h index 98cea224c5..ca918fd4f0 100644 --- a/plugins/ContextHelp/src/stdafx.h +++ b/plugins/ContextHelp/src/stdafx.h @@ -47,7 +47,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HINSTANCE hInstance;
-#define USERAGENT_VERSION "0.2.1.2"
-
#endif //CONTEXTHELP_COMMONHEADERS_H
\ No newline at end of file diff --git a/plugins/ContextHelp/src/version.h b/plugins/ContextHelp/src/version.h index 482a4d75f3..7338062bf1 100644 --- a/plugins/ContextHelp/src/version.h +++ b/plugins/ContextHelp/src/version.h @@ -17,26 +17,6 @@ along with this program (Help-License.txt); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/*
-#define NEEDED_MIRANDA_VERSION PLUGIN_MAKE_VERSION(0,6,0,0)
-#define NEEDED_MIRANDA_VERSION_STR "0.6"
-#define PLUGIN_VERSION PLUGIN_MAKE_VERSION(0,2,1,2)
-#define FILE_VERSION 0,2,1,2
-
-#ifdef _DEBUG
- #define FILE_VERSION_STR "0.2.1.3 alpha"
- #define USERAGENT_VERSION "0.2.1.3 (alpha)"
-#else
- #define FILE_VERSION_STR "0.2.1.2"
- #define USERAGENT_VERSION "0.2.1.2"
-#endif
-
-#define PLUGIN_EMAIL "hrathh users.sourceforge.net"
-#define PLUGIN_EMAIL_ATT_POS 7 // position of the @-sign in the email adress above
-
- #define PLUGIN_WEBSITE "http://addons.miranda-im.org/details.php?action=viewfile&id=3475"
-*/
-
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 2
#define __RELEASE_NUM 1
@@ -48,6 +28,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __FILENAME "ContextHelp.dll"
#define __DESCRIPTION "Provides context sensitive help in all of the Miranda NG dialog boxes."
#define __AUTHOR "Richard Hughes, H. Herkenrath, Miranda NG Team"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/ContextHelp/"
#define __COPYRIGHT "© 2002 Richard Hughes, 2005-2007 H. Herkenrath, 2016-17 Miranda NG Team"
diff --git a/plugins/CountryFlags/src/main.cpp b/plugins/CountryFlags/src/main.cpp index 674e60f913..e34ff660be 100644 --- a/plugins/CountryFlags/src/main.cpp +++ b/plugins/CountryFlags/src/main.cpp @@ -31,7 +31,6 @@ static PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/CountryFlags/src/version.h b/plugins/CountryFlags/src/version.h index 7db3bc805b..5ec53d6bc9 100644 --- a/plugins/CountryFlags/src/version.h +++ b/plugins/CountryFlags/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Flags.dll"
#define __DESCRIPTION "Service offering misc country utilities as flag icons and an IP-to-Country database."
#define __AUTHOR "H. Herkenrath"
-#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
#define __AUTHORWEB "https://miranda-ng.org/p/Flags/"
#define __COPYRIGHT "© 2006-2007 H. Herkenrath"
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index f31de55e7c..d775326ea1 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -44,7 +44,6 @@ static const PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/CrashDumper/src/upload.cpp b/plugins/CrashDumper/src/upload.cpp index 9b3b501b89..62baee1071 100644 --- a/plugins/CrashDumper/src/upload.cpp +++ b/plugins/CrashDumper/src/upload.cpp @@ -83,7 +83,7 @@ void CreateAuthString(char* auth) char str[110];
int len = mir_snprintf(str, "%s:%s", user, pass);
- mir_snprintf(auth, 250, "Basic %s", ptrA(mir_base64_encode((PBYTE)str, len)));
+ mir_snprintf(auth, 250, "Basic %s", ptrA(mir_base64_encode(str, len)));
}
diff --git a/plugins/CrashDumper/src/version.h b/plugins/CrashDumper/src/version.h index 9b0f464e2a..7eb818204e 100644 --- a/plugins/CrashDumper/src/version.h +++ b/plugins/CrashDumper/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "CrashDumper.dll"
#define __DESCRIPTION "Crash Dumper and Version Information for Miranda NG."
#define __AUTHOR "borkra"
-#define __AUTHOREMAIL "borkra@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/CrashDumper/"
#define __COPYRIGHT "© 2008-12 Boris Krasnovskiy, 2012-17 Miranda NG team"
diff --git a/plugins/CryptoPP/src/base16.cpp b/plugins/CryptoPP/src/base16.cpp index e716b4be4f..f75ebe1d1b 100644 --- a/plugins/CryptoPP/src/base16.cpp +++ b/plugins/CryptoPP/src/base16.cpp @@ -1,6 +1,6 @@ #include "commonheaders.h"
-char *base16encode(const char *inBuffer, int count)
+char* base16encode(const char *inBuffer, size_t count)
{
char *outBuffer = (char *)malloc(count * 2 + 1);
char *outBufferPtr = outBuffer;
@@ -16,7 +16,7 @@ char *base16encode(const char *inBuffer, int count) return outBuffer;
}
-char *base16decode(const char *inBuffer, unsigned int *count)
+char* base16decode(const char *inBuffer, size_t *count)
{
char *outBuffer = (char *)mir_alloc(*count);
BYTE *outBufferPtr = (BYTE *)outBuffer;
@@ -53,6 +53,6 @@ char *base16decode(const char *inBuffer, unsigned int *count) char *base16decode(const char *inBuffer)
{
- unsigned count = (unsigned)strlen(inBuffer);
+ size_t count = strlen(inBuffer);
return base16decode(inBuffer, &count);
}
diff --git a/plugins/CryptoPP/src/base16.h b/plugins/CryptoPP/src/base16.h index 871bca3fbd..0146428abc 100644 --- a/plugins/CryptoPP/src/base16.h +++ b/plugins/CryptoPP/src/base16.h @@ -43,9 +43,9 @@ static const byte asciiToBin16[] = static const byte binToAscii16[] = "0123456789ABCDEF";
-char *base16encode(const char *, const int);
-char *base16decode(const char *, unsigned*);
-char *base16decode(const char *);
+char* base16encode(const char*, size_t);
+char* base16decode(const char*, size_t*);
+char* base16decode(const char*);
#define encode16(data) binToAscii16[data]
#define decode16(data) asciiToBin16[data]
diff --git a/plugins/CryptoPP/src/base64.cpp b/plugins/CryptoPP/src/base64.cpp index 9a855cdb8d..779e33e5b1 100644 --- a/plugins/CryptoPP/src/base64.cpp +++ b/plugins/CryptoPP/src/base64.cpp @@ -2,19 +2,19 @@ string base64encode(const string& buf)
{
- return (char*)ptrA(mir_base64_encode((PBYTE)buf.data(), (unsigned)buf.length()));
+ return (char*)ptrA(mir_base64_encode(buf.data(), buf.length()));
}
string base64decode(const string& buf)
{
- unsigned len;
+ size_t len;
ptrA plain((char*)mir_base64_decode(buf.data(), &len));
return (plain == NULL) ? string() : string(plain, len);
}
string base64decode(const char *buf)
{
- unsigned len;
+ size_t len;
ptrA plain((char*)mir_base64_decode(buf, &len));
return (plain == NULL) ? string() : string(plain, len);
}
diff --git a/plugins/CryptoPP/src/cpp_keys.cpp b/plugins/CryptoPP/src/cpp_keys.cpp index 8cfea1c040..ffcf0645a0 100644 --- a/plugins/CryptoPP/src/cpp_keys.cpp +++ b/plugins/CryptoPP/src/cpp_keys.cpp @@ -74,7 +74,7 @@ int __cdecl cpp_init_keyb(HANDLE context, LPCSTR key) pCNTX ptr = get_context_on_id(context); if (!ptr) return 0;
pSIMDATA p = (pSIMDATA)cpp_alloc_pdata(ptr);
- unsigned clen = (unsigned)rtrim(key);
+ size_t clen = rtrim(key);
ptr->features = 0;
LPSTR pub_binary;
diff --git a/plugins/CryptoPP/src/cpp_svcs.cpp b/plugins/CryptoPP/src/cpp_svcs.cpp index 089d535a8f..00f8b19d8a 100644 --- a/plugins/CryptoPP/src/cpp_svcs.cpp +++ b/plugins/CryptoPP/src/cpp_svcs.cpp @@ -50,7 +50,7 @@ LPSTR __cdecl cpp_encrypt(pCNTX ptr, LPCSTR szPlainMsg) clen = (unsigned)ciphered.length();
mir_free(ptr->tmp);
if (ptr->features & FEATURES_BASE64)
- ptr->tmp = mir_base64_encode((PBYTE)ciphered.data(), clen);
+ ptr->tmp = mir_base64_encode(ciphered.data(), clen);
else {
char *base16 = base16encode(ciphered.data(), clen);
ptr->tmp = mir_strdup(base16);
@@ -70,7 +70,7 @@ LPSTR __cdecl cpp_decrypt(pCNTX ptr, LPCSTR szEncMsg) ptr->error = ERROR_SEH;
pSIMDATA p = (pSIMDATA)ptr->pdata;
- unsigned clen = (unsigned)strlen(szEncMsg);
+ size_t clen = strlen(szEncMsg);
if (ptr->features & FEATURES_BASE64)
ciphered = (LPSTR)mir_base64_decode(szEncMsg, &clen);
diff --git a/plugins/CryptoPP/src/main.cpp b/plugins/CryptoPP/src/main.cpp index 9adee52785..72c1dc1e2e 100644 --- a/plugins/CryptoPP/src/main.cpp +++ b/plugins/CryptoPP/src/main.cpp @@ -17,7 +17,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/CryptoPP/src/version.h b/plugins/CryptoPP/src/version.h index 60042bfccb..658fc10dfb 100644 --- a/plugins/CryptoPP/src/version.h +++ b/plugins/CryptoPP/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "CryptoPP.dll"
#define __DESCRIPTION "Crypto++ library for SecureIM plugin."
#define __AUTHOR "Baloo"
-#define __AUTHOREMAIL "baloo@bk.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/CryptoPP/"
#define __COPYRIGHT "© 2006-09 Baloo"
diff --git a/plugins/CyrTranslit/src/main.cpp b/plugins/CyrTranslit/src/main.cpp index 5f8b499f08..e78a6732d1 100644 --- a/plugins/CyrTranslit/src/main.cpp +++ b/plugins/CyrTranslit/src/main.cpp @@ -28,7 +28,6 @@ PLUGININFOEX pluginInfoEx={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/CyrTranslit/src/version.h b/plugins/CyrTranslit/src/version.h index a2e119f5b5..d55f0500cd 100644 --- a/plugins/CyrTranslit/src/version.h +++ b/plugins/CyrTranslit/src/version.h @@ -28,6 +28,5 @@ #define __FILENAME "CyrTranslit.dll"
#define __DESCRIPTION "Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations."
#define __AUTHOR "ValeraVi, Ivan Krechetov"
-#define __AUTHOREMAIL "valeravi@vi-soft.com.ua"
#define __AUTHORWEB "https://miranda-ng.org/p/CyrTranslit/"
#define __COPYRIGHT "© 2005-2009 ValeraVi, Ivan Krechetov"
diff --git a/plugins/Db3x_mmap/src/init.cpp b/plugins/Db3x_mmap/src/init.cpp index 28467c2e62..2c80069676 100644 --- a/plugins/Db3x_mmap/src/init.cpp +++ b/plugins/Db3x_mmap/src/init.cpp @@ -32,7 +32,6 @@ static PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE | STATIC_PLUGIN,
diff --git a/plugins/Db3x_mmap/src/version.h b/plugins/Db3x_mmap/src/version.h index f15fb07b2a..1ef99c71f7 100644 --- a/plugins/Db3x_mmap/src/version.h +++ b/plugins/Db3x_mmap/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Dbx_mmap.dll"
#define __DESCRIPTION "Provides Miranda database support: global settings, contacts, history, settings per contact."
#define __AUTHOR "Miranda-NG project"
-#define __AUTHOREMAIL "bio@msx.ru; ghazan@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/Dbx_mmap/"
#define __COPYRIGHT "© 2012-17 Miranda NG project"
diff --git a/plugins/DbChecker/src/main.cpp b/plugins/DbChecker/src/main.cpp index 1f9ed55889..438a32f6d4 100644 --- a/plugins/DbChecker/src/main.cpp +++ b/plugins/DbChecker/src/main.cpp @@ -32,7 +32,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE | STATIC_PLUGIN,
diff --git a/plugins/DbChecker/src/version.h b/plugins/DbChecker/src/version.h index c7e5045807..55f5323d2c 100644 --- a/plugins/DbChecker/src/version.h +++ b/plugins/DbChecker/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "DbChecker.dll"
#define __DESCRIPTION "Miranda NG Database Checker."
#define __AUTHOR "George Hazan"
-#define __AUTHOREMAIL "ghazan@miranda-ng.org"
#define __AUTHORWEB "https://miranda-ng.org/p/DbChecker/"
#define __COPYRIGHT "© 2012-17 George Hazan"
diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index e3c6084450..2fa66baa6d 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -28,7 +28,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/DbEditorPP/src/version.h b/plugins/DbEditorPP/src/version.h index 001417d300..740684ca3a 100644 --- a/plugins/DbEditorPP/src/version.h +++ b/plugins/DbEditorPP/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "DbEditorPP.dll" #define __DESCRIPTION "Advanced Database Editor." #define __AUTHOR "Bio, Jonathan Gordon" -#define __AUTHOREMAIL "bio@ktaspb.ru, jdgordy@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/DbEditorPP/" #define __COPYRIGHT "© 2003-2017 Bio, Jonathan Gordon" diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp index a0a2e37751..9aa48d8c6d 100644 --- a/plugins/Db_autobackups/src/main.cpp +++ b/plugins/Db_autobackups/src/main.cpp @@ -12,7 +12,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Db_autobackups/src/version.h b/plugins/Db_autobackups/src/version.h index 5f72c4b2e6..ef803e937a 100644 --- a/plugins/Db_autobackups/src/version.h +++ b/plugins/Db_autobackups/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Db_autobackups.dll"
#define __DESCRIPTION "Database autobackuper plugin."
#define __AUTHOR "chaos.persei, sje, Kildor, Billy_Bons"
-#define __AUTHOREMAIL "chaos.persei@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/Db_autobackups/"
#define __COPYRIGHT "© 2005-2017 chaos.persei, sje, Kildor, Billy_Bons, Vasilich, Miranda NG team"
diff --git a/plugins/Dbx_mdb/dbx_lmdb.vcxproj b/plugins/Dbx_mdb/dbx_lmdb.vcxproj index 41afd957be..a4016eb5b6 100644 --- a/plugins/Dbx_mdb/dbx_lmdb.vcxproj +++ b/plugins/Dbx_mdb/dbx_lmdb.vcxproj @@ -26,10 +26,16 @@ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
<ItemGroup>
- <ClCompile Include="src\mdbx\*.c">
+ <ClCompile Include="src\libmdbx\src\lck-windows.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="src\mdbx\*.cpp">
+ <ClCompile Include="src\libmdbx\src\mdbx.c">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="src\libmdbx\src\osal.c">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="src\libmdbx\src\version.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
diff --git a/plugins/Dbx_mdb/src/dbintf.cpp b/plugins/Dbx_mdb/src/dbintf.cpp index daa0f884bd..17715957d8 100644 --- a/plugins/Dbx_mdb/src/dbintf.cpp +++ b/plugins/Dbx_mdb/src/dbintf.cpp @@ -125,7 +125,7 @@ int CDbxMdb::Load(bool bSkipInit) if (InitModules()) return EGROKPRF_DAMAGED;
- if (InitCrypt()) return EGROKPRF_DAMAGED;
+ if (InitCrypt()) return EGROKPRF_DAMAGED;
// everything is ok, go on
if (!m_bReadOnly) {
@@ -183,13 +183,12 @@ STDMETHODIMP_(void) CDbxMdb::SetCacheSafetyMode(BOOL bIsSet) int CDbxMdb::Map()
{
- unsigned int mode = MDBX_NOSUBDIR | MDBX_NOTLS | MDBX_MAPASYNC | MDBX_WRITEMAP | MDBX_NOSYNC;
+ unsigned int mode = MDBX_NOSUBDIR | MDBX_MAPASYNC | MDBX_WRITEMAP | MDBX_NOSYNC;
if (m_bReadOnly)
mode |= MDBX_RDONLY;
mdbx_env_open(m_pMdbEnv, _T2A(m_tszProfileName), mode, 0664);
mdbx_env_set_mapsize(m_pMdbEnv, 0x1000000);
return MDBX_SUCCESS;
-
}
bool CDbxMdb::Remap()
@@ -199,7 +198,6 @@ bool CDbxMdb::Remap() return mdbx_env_set_geometry(m_pMdbEnv, -1, -1, ei.mi_mapsize + 0x100000, 0x100000, -1, -1) == MDBX_SUCCESS;
}
-
/////////////////////////////////////////////////////////////////////////////////////////
static DWORD DatabaseCorrupted = 0;
diff --git a/plugins/Dbx_mdb/src/init.cpp b/plugins/Dbx_mdb/src/init.cpp index 253dff78e9..406c2988f5 100644 --- a/plugins/Dbx_mdb/src/init.cpp +++ b/plugins/Dbx_mdb/src/init.cpp @@ -32,7 +32,6 @@ static PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE | STATIC_PLUGIN,
diff --git a/plugins/Dbx_mdb/src/libmdbx b/plugins/Dbx_mdb/src/libmdbx new file mode 160000 +Subproject 24a8bdec49ee360bf0412631ff8931de91e109f diff --git a/plugins/Dbx_mdb/src/mdbx/bits.h b/plugins/Dbx_mdb/src/mdbx/bits.h deleted file mode 100644 index d1ebb7cd2d..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/bits.h +++ /dev/null @@ -1,1226 +0,0 @@ -/* - * Copyright 2015-2017 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>. */ - -#pragma once -/* *INDENT-OFF* */ -/* clang-format off */ - -#ifndef MDBX_DEBUG -# define MDBX_DEBUG 0 -#endif - -#if MDBX_DEBUG -# undef NDEBUG -#endif - -/* Features under development */ -#ifndef MDBX_DEVEL -# define MDBX_DEVEL 1 -#endif - -/*----------------------------------------------------------------------------*/ - -/* Should be defined before any includes */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -#ifndef _FILE_OFFSET_BITS -# define _FILE_OFFSET_BITS 64 -#endif - -#ifdef _MSC_VER -# ifndef _CRT_SECURE_NO_WARNINGS -# define _CRT_SECURE_NO_WARNINGS -# endif -#if _MSC_VER > 1800 -# pragma warning(disable : 4464) /* relative include path contains '..' */ -#endif -#pragma warning(disable : 4710) /* 'xyz': function not inlined */ -#pragma warning(disable : 4711) /* function 'xyz' selected for automatic inline expansion */ -#pragma warning(disable : 4201) /* nonstandard extension used : nameless struct / union */ -#pragma warning(disable : 4702) /* unreachable code */ -#pragma warning(disable : 4706) /* assignment within conditional expression */ -#pragma warning(disable : 4127) /* conditional expression is constant */ -#pragma warning(disable : 4324) /* 'xyz': structure was padded due to alignment specifier */ -#pragma warning(disable : 4310) /* cast truncates constant value */ -#pragma warning(disable : 4820) /* bytes padding added after data member for aligment */ -#pragma warning(disable : 4548) /* expression before comma has no effect; expected expression with side - effect */ -#endif /* _MSC_VER (warnings) */ - -#include "./mdbx.h" -#include "./defs.h" - -#if defined(__GNUC__) && !__GNUC_PREREQ(4,2) - /* Actualy libmdbx was not tested with compilers older than GCC from RHEL6. - * But you could remove this #error and try to continue at your own risk. - * In such case please don't rise up an issues related ONLY to old compilers. - */ -# warning "libmdbx required at least GCC 4.2 compatible C/C++ compiler." -#endif - -#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,12) - /* Actualy libmdbx was not tested with something older than glibc 2.12 (from RHEL6). - * But you could remove this #error and try to continue at your own risk. - * In such case please don't rise up an issues related ONLY to old systems. - */ -# warning "libmdbx required at least GLIBC 2.12." -#endif - -#ifdef __SANITIZE_THREAD__ -# warning "libmdbx don't compatible with ThreadSanitizer, you will get a lot of false-positive issues." -#endif /* __SANITIZE_THREAD__ */ - -#include "./osal.h" - -/* *INDENT-ON* */ -/* clang-format on */ - -/*----------------------------------------------------------------------------*/ -/* Basic constants and types */ - -/* The minimum number of keys required in a database page. - * Setting this to a larger value will place a smaller bound on the - * maximum size of a data item. Data items larger than this size will - * be pushed into overflow pages instead of being stored directly in - * the B-tree node. This value used to default to 4. With a page size - * of 4096 bytes that meant that any item larger than 1024 bytes would - * go into an overflow page. That also meant that on average 2-3KB of - * each overflow page was wasted space. The value cannot be lower than - * 2 because then there would no longer be a tree structure. With this - * value, items larger than 2KB will go into overflow pages, and on - * average only 1KB will be wasted. */ -#define MDBX_MINKEYS 2 - -/* A stamp that identifies a file as an MDBX file. - * There's nothing special about this value other than that it is easily - * recognizable, and it will reflect any byte order mismatches. */ -#define MDBX_MAGIC UINT64_C(/* 56-bit prime */ 0x59659DBDEF4C11) - -/* The version number for a database's datafile format. */ -#define MDBX_DATA_VERSION ((MDBX_DEVEL) ? 255 : 2) -/* The version number for a database's lockfile format. */ -#define MDBX_LOCK_VERSION ((MDBX_DEVEL) ? 255 : 2) - -/* handle for the DB used to track free pages. */ -#define FREE_DBI 0 -/* handle for the default DB. */ -#define MAIN_DBI 1 -/* Number of DBs in metapage (free and main) - also hardcoded elsewhere */ -#define CORE_DBS 2 -#define MAX_DBI (INT16_MAX - CORE_DBS) - -/* Number of meta pages - also hardcoded elsewhere */ -#define NUM_METAS 3 - -/* A page number in the database. - * - * MDBX uses 32 bit for page numbers. This limits database - * size up to 2^44 bytes, in case of 4K pages. */ -typedef uint32_t pgno_t; -#define PRIaPGNO PRIu32 -#define MAX_PAGENO ((pgno_t)UINT64_C(0xffffFFFFffff)) -#define MIN_PAGENO NUM_METAS - -/* A transaction ID. */ -typedef uint64_t txnid_t; -#define PRIaTXN PRIi64 -#if MDBX_DEVEL -#define MIN_TXNID (UINT64_MAX - UINT32_MAX) -#elif MDBX_DEBUG -#define MIN_TXNID UINT64_C(0x100000000) -#else -#define MIN_TXNID UINT64_C(1) -#endif /* MIN_TXNID */ - -/* Used for offsets within a single page. - * Since memory pages are typically 4 or 8KB in size, 12-13 bits, - * this is plenty. */ -typedef uint16_t indx_t; - -#define MEGABYTE ((size_t)1 << 20) - -/*----------------------------------------------------------------------------*/ -/* Core structures for database and shared memory (i.e. format definition) */ -#pragma pack(push, 1) - -/* Reader Lock Table - * - * Readers don't acquire any locks for their data access. Instead, they - * simply record their transaction ID in the reader table. The reader - * mutex is needed just to find an empty slot in the reader table. The - * slot's address is saved in thread-specific data so that subsequent - * read transactions started by the same thread need no further locking to - * proceed. - * - * If MDBX_NOTLS is set, the slot address is not saved in thread-specific data. - * No reader table is used if the database is on a read-only filesystem. - * - * Since the database uses multi-version concurrency control, readers don't - * actually need any locking. This table is used to keep track of which - * readers are using data from which old transactions, so that we'll know - * when a particular old transaction is no longer in use. Old transactions - * that have discarded any data pages can then have those pages reclaimed - * for use by a later write transaction. - * - * The lock table is constructed such that reader slots are aligned with the - * processor's cache line size. Any slot is only ever used by one thread. - * This alignment guarantees that there will be no contention or cache - * thrashing as threads update their own slot info, and also eliminates - * any need for locking when accessing a slot. - * - * A writer thread will scan every slot in the table to determine the oldest - * outstanding reader transaction. Any freed pages older than this will be - * reclaimed by the writer. The writer doesn't use any locks when scanning - * this table. This means that there's no guarantee that the writer will - * see the most up-to-date reader info, but that's not required for correct - * operation - all we need is to know the upper bound on the oldest reader, - * we don't care at all about the newest reader. So the only consequence of - * reading stale information here is that old pages might hang around a - * while longer before being reclaimed. That's actually good anyway, because - * the longer we delay reclaiming old pages, the more likely it is that a - * string of contiguous pages can be found after coalescing old pages from - * many old transactions together. */ - -/* The actual reader record, with cacheline padding. */ -typedef struct MDBX_reader { - /* Current Transaction ID when this transaction began, or (txnid_t)-1. - * Multiple readers that start at the same time will probably have the - * same ID here. Again, it's not important to exclude them from - * anything; all we need to know is which version of the DB they - * started from so we can avoid overwriting any data used in that - * particular version. */ - volatile txnid_t mr_txnid; - - /* The information we store in a single slot of the reader table. - * In addition to a transaction ID, we also record the process and - * thread ID that owns a slot, so that we can detect stale information, - * e.g. threads or processes that went away without cleaning up. - * - * NOTE: We currently don't check for stale records. - * We simply re-init the table when we know that we're the only process - * opening the lock file. */ - - /* The process ID of the process owning this reader txn. */ - volatile mdbx_pid_t mr_pid; - /* The thread ID of the thread owning this txn. */ - volatile mdbx_tid_t mr_tid; - - /* cache line alignment */ - uint8_t pad[MDBX_CACHELINE_SIZE - - (sizeof(txnid_t) + sizeof(mdbx_pid_t) + sizeof(mdbx_tid_t)) % - MDBX_CACHELINE_SIZE]; -} __cache_aligned MDBX_reader; - -/* Information about a single database in the environment. */ -typedef struct MDBX_db { - uint16_t md_flags; /* see mdbx_dbi_open */ - uint16_t md_depth; /* depth of this tree */ - uint32_t md_xsize; /* also ksize for LEAF2 pages */ - pgno_t md_root; /* the root page of this tree */ - pgno_t md_branch_pages; /* number of internal pages */ - pgno_t md_leaf_pages; /* number of leaf pages */ - pgno_t md_overflow_pages; /* number of overflow pages */ - uint64_t md_seq; /* table sequence counter */ - uint64_t md_entries; /* number of data items */ - uint64_t md_merkle; /* Merkle tree checksum */ -} MDBX_db; - -/* Meta page content. - * A meta page is the start point for accessing a database snapshot. - * Pages 0-1 are meta pages. Transaction N writes meta page (N % 2). */ -typedef struct MDBX_meta { - /* Stamp identifying this as an MDBX file. - * It must be set to MDBX_MAGIC with MDBX_DATA_VERSION. */ - uint64_t mm_magic_and_version; - - /* txnid that committed this page, the first of a two-phase-update pair */ - volatile txnid_t mm_txnid_a; - - uint16_t mm_extra_flags; /* extra DB flags, zero (nothing) for now */ - uint8_t mm_validator_id; /* ID of checksum and page validation method, - * zero (nothing) for now */ - uint8_t mm_extra_pagehdr; /* extra bytes in the page header, - * zero (nothing) for now */ - - struct { - uint16_t grow; /* datafile growth step in pages */ - uint16_t shrink; /* datafile shrink threshold in pages */ - pgno_t lower; /* minimal size of datafile in pages */ - pgno_t upper; /* maximal size of datafile in pages */ - pgno_t now; /* current size of datafile in pages */ - pgno_t next; /* first unused page in the datafile, - * but actually the file may be shorter. */ - } mm_geo; - - MDBX_db mm_dbs[CORE_DBS]; /* first is free space, 2nd is main db */ - /* The size of pages used in this DB */ -#define mm_psize mm_dbs[FREE_DBI].md_xsize -/* Any persistent environment flags, see mdbx_env */ -#define mm_flags mm_dbs[FREE_DBI].md_flags - mdbx_canary mm_canary; - -#define MDBX_DATASIGN_NONE 0u -#define MDBX_DATASIGN_WEAK 1u -#define SIGN_IS_WEAK(sign) ((sign) == MDBX_DATASIGN_WEAK) -#define SIGN_IS_STEADY(sign) ((sign) > MDBX_DATASIGN_WEAK) -#define META_IS_WEAK(meta) SIGN_IS_WEAK((meta)->mm_datasync_sign) -#define META_IS_STEADY(meta) SIGN_IS_STEADY((meta)->mm_datasync_sign) - volatile uint64_t mm_datasync_sign; - - /* txnid that committed this page, the second of a two-phase-update pair */ - volatile txnid_t mm_txnid_b; -} MDBX_meta; - -/* Common header for all page types. The page type depends on mp_flags. - * - * P_BRANCH and P_LEAF pages have unsorted 'MDBX_node's at the end, with - * sorted mp_ptrs[] entries referring to them. Exception: P_LEAF2 pages - * omit mp_ptrs and pack sorted MDBX_DUPFIXED values after the page header. - * - * P_OVERFLOW records occupy one or more contiguous pages where only the - * first has a page header. They hold the real data of F_BIGDATA nodes. - * - * P_SUBP sub-pages are small leaf "pages" with duplicate data. - * A node with flag F_DUPDATA but not F_SUBDATA contains a sub-page. - * (Duplicate data can also go in sub-databases, which use normal pages.) - * - * P_META pages contain MDBX_meta, the start point of an MDBX snapshot. - * - * Each non-metapage up to MDBX_meta.mm_last_pg is reachable exactly once - * in the snapshot: Either used by a database or listed in a freeDB record. */ -typedef struct MDBX_page { - union { - struct MDBX_page *mp_next; /* for in-memory list of freed pages, - * must be first field, see NEXT_LOOSE_PAGE */ - uint64_t mp_validator; /* checksum of page content or a txnid during - * which the page has been updated */ - }; - uint16_t mp_leaf2_ksize; /* key size if this is a LEAF2 page */ -#define P_BRANCH 0x01 /* branch page */ -#define P_LEAF 0x02 /* leaf page */ -#define P_OVERFLOW 0x04 /* overflow page */ -#define P_META 0x08 /* meta page */ -#define P_DIRTY 0x10 /* dirty page, also set for P_SUBP pages */ -#define P_LEAF2 0x20 /* for MDBX_DUPFIXED records */ -#define P_SUBP 0x40 /* for MDBX_DUPSORT sub-pages */ -#define P_LOOSE 0x4000 /* page was dirtied then freed, can be reused */ -#define P_KEEP 0x8000 /* leave this page alone during spill */ - uint16_t mp_flags; - union { - struct { - indx_t mp_lower; /* lower bound of free space */ - indx_t mp_upper; /* upper bound of free space */ - }; - uint32_t mp_pages; /* number of overflow pages */ - }; - pgno_t mp_pgno; /* page number */ - - /* dynamic size */ - union { - indx_t mp_ptrs[1]; - MDBX_meta mp_meta; - uint8_t mp_data[1]; - }; -} MDBX_page; - -/* Size of the page header, excluding dynamic data at the end */ -#define PAGEHDRSZ ((unsigned)offsetof(MDBX_page, mp_data)) - -/* The maximum size of a database page. -* -* It is 64K, but value-PAGEHDRSZ must fit in MDBX_page.mp_upper. -* -* MDBX will use database pages < OS pages if needed. -* That causes more I/O in write transactions: The OS must -* know (read) the whole page before writing a partial page. -* -* Note that we don't currently support Huge pages. On Linux, -* regular data files cannot use Huge pages, and in general -* Huge pages aren't actually pageable. We rely on the OS -* demand-pager to read our data and page it out when memory -* pressure from other processes is high. So until OSs have -* actual paging support for Huge pages, they're not viable. */ -#define MAX_PAGESIZE 0x10000u -#define MIN_PAGESIZE 512u - -#define MIN_MAPSIZE (MIN_PAGESIZE * MIN_PAGENO) -#if defined(_WIN32) || defined(_WIN64) -#define MAX_MAPSIZE32 UINT32_C(0x38000000) -#else -#define MAX_MAPSIZE32 UINT32_C(0x7ff80000) -#endif -#define MAX_MAPSIZE64 \ - ((sizeof(pgno_t) > 4) ? UINT64_C(0x7fffFFFFfff80000) \ - : MAX_PAGENO * (uint64_t)MAX_PAGESIZE) - -#define MAX_MAPSIZE ((sizeof(size_t) < 8) ? MAX_MAPSIZE32 : MAX_MAPSIZE64) - -/* The header for the reader table (a memory-mapped lock file). */ -typedef struct MDBX_lockinfo { - /* Stamp identifying this as an MDBX file. - * It must be set to MDBX_MAGIC with with MDBX_LOCK_VERSION. */ - uint64_t mti_magic_and_version; - - /* Format of this lock file. Must be set to MDBX_LOCK_FORMAT. */ - uint32_t mti_os_and_format; - - /* Flags which environment was opened. */ - volatile uint32_t mti_envmode; - - union { -#ifdef MDBX_OSAL_LOCK - MDBX_OSAL_LOCK mti_wmutex; -#endif - uint64_t align_wmutex; - }; - - union { - /* The number of slots that have been used in the reader table. - * This always records the maximum count, it is not decremented - * when readers release their slots. */ - volatile unsigned __cache_aligned mti_numreaders; - uint64_t align_numreaders; - }; - - union { -#ifdef MDBX_OSAL_LOCK - /* Mutex protecting access to this table. */ - MDBX_OSAL_LOCK mti_rmutex; -#endif - uint64_t align_rmutex; - }; - - union { - volatile txnid_t mti_oldest; - uint64_t align_oldest; - }; - - union { - volatile uint32_t mti_readers_refresh_flag; - uint64_t align_reader_finished_flag; - }; - - uint8_t pad_align[MDBX_CACHELINE_SIZE - sizeof(uint64_t) * 7]; - - MDBX_reader __cache_aligned mti_readers[1]; -} MDBX_lockinfo; - -#ifdef _MSC_VER -#pragma pack(pop) -#endif /* MSVC: Enable aligment */ - -#define MDBX_LOCKINFO_WHOLE_SIZE \ - ((sizeof(MDBX_lockinfo) + MDBX_CACHELINE_SIZE - 1) & \ - ~((size_t)MDBX_CACHELINE_SIZE - 1)) - -/* Lockfile format signature: version, features and field layout */ -#define MDBX_LOCK_FORMAT \ - ((MDBX_OSAL_LOCK_SIGN << 16) + \ - (uint16_t)(MDBX_LOCKINFO_WHOLE_SIZE + MDBX_CACHELINE_SIZE - 1)) - -#define MDBX_DATA_MAGIC ((MDBX_MAGIC << 8) + MDBX_DATA_VERSION) - -#define MDBX_LOCK_MAGIC ((MDBX_MAGIC << 8) + MDBX_LOCK_VERSION) - -/*----------------------------------------------------------------------------*/ -/* Two kind lists of pages (aka PNL) */ - -/* An PNL is an Page Number List, a sorted array of IDs. The first element of - * the array is a counter for how many actual page-numbers are in the list. - * PNLs are sorted in descending order, this allow cut off a page with lowest - * pgno (at the tail) just truncating the list */ -#define MDBX_PNL_ASCENDING 0 -typedef pgno_t *MDBX_PNL; - -#if MDBX_PNL_ASCENDING -#define MDBX_PNL_ORDERED(first, last) ((first) < (last)) -#define MDBX_PNL_DISORDERED(first, last) ((first) >= (last)) -#else -#define MDBX_PNL_ORDERED(first, last) ((first) > (last)) -#define MDBX_PNL_DISORDERED(first, last) ((first) <= (last)) -#endif - -/* List of txnid, only for MDBX_env.mt_lifo_reclaimed */ -typedef txnid_t *MDBX_TXL; - -/* An ID2 is an ID/pointer pair. */ -typedef struct MDBX_ID2 { - pgno_t mid; /* The ID */ - void *mptr; /* The pointer */ -} MDBX_ID2; - -/* An ID2L is an ID2 List, a sorted array of ID2s. - * The first element's mid member is a count of how many actual - * elements are in the array. The mptr member of the first element is - * unused. The array is sorted in ascending order by mid. */ -typedef MDBX_ID2 *MDBX_ID2L; - -/* PNL sizes - likely should be even bigger - * limiting factors: sizeof(pgno_t), thread stack size */ -#define MDBX_PNL_LOGN 16 /* DB_SIZE is 2^16, UM_SIZE is 2^17 */ -#define MDBX_PNL_DB_SIZE (1 << MDBX_PNL_LOGN) -#define MDBX_PNL_UM_SIZE (1 << (MDBX_PNL_LOGN + 1)) - -#define MDBX_PNL_DB_MAX (MDBX_PNL_DB_SIZE - 1) -#define MDBX_PNL_UM_MAX (MDBX_PNL_UM_SIZE - 1) - -#define MDBX_PNL_SIZEOF(pl) (((pl)[0] + 1) * sizeof(pgno_t)) -#define MDBX_PNL_IS_ZERO(pl) ((pl)[0] == 0) -#define MDBX_PNL_CPY(dst, src) (memcpy(dst, src, MDBX_PNL_SIZEOF(src))) -#define MDBX_PNL_FIRST(pl) ((pl)[1]) -#define MDBX_PNL_LAST(pl) ((pl)[(pl)[0]]) - -/* Current max length of an mdbx_pnl_alloc()ed PNL */ -#define MDBX_PNL_ALLOCLEN(pl) ((pl)[-1]) - -/*----------------------------------------------------------------------------*/ -/* Internal structures */ - -/* Auxiliary DB info. - * The information here is mostly static/read-only. There is - * only a single copy of this record in the environment. */ -typedef struct MDBX_dbx { - MDBX_val md_name; /* name of the database */ - MDBX_cmp_func *md_cmp; /* function for comparing keys */ - MDBX_cmp_func *md_dcmp; /* function for comparing data items */ -} MDBX_dbx; - -/* A database transaction. - * Every operation requires a transaction handle. */ -struct MDBX_txn { -#define MDBX_MT_SIGNATURE UINT32_C(0x93D53A31) - size_t mt_signature; - MDBX_txn *mt_parent; /* parent of a nested txn */ - /* Nested txn under this txn, set together with flag MDBX_TXN_HAS_CHILD */ - MDBX_txn *mt_child; - pgno_t mt_next_pgno; /* next unallocated page */ - pgno_t mt_end_pgno; /* corresponding to the current size of datafile */ - /* The ID of this transaction. IDs are integers incrementing from 1. - * Only committed write transactions increment the ID. If a transaction - * aborts, the ID may be re-used by the next writer. */ - txnid_t mt_txnid; - MDBX_env *mt_env; /* the DB environment */ - /* The list of reclaimed txns from freeDB */ - MDBX_TXL mt_lifo_reclaimed; - /* The list of pages that became unused during this transaction. */ - MDBX_PNL mt_befree_pages; - /* The list of loose pages that became unused and may be reused - * in this transaction, linked through NEXT_LOOSE_PAGE(page). */ - MDBX_page *mt_loose_pages; - /* Number of loose pages (mt_loose_pages) */ - unsigned mt_loose_count; - /* The sorted list of dirty pages we temporarily wrote to disk - * because the dirty list was full. page numbers in here are - * shifted left by 1, deleted slots have the LSB set. */ - MDBX_PNL mt_spill_pages; - union { - /* For write txns: Modified pages. Sorted when not MDBX_WRITEMAP. */ - MDBX_ID2L mt_rw_dirtylist; - /* For read txns: This thread/txn's reader table slot, or NULL. */ - MDBX_reader *mt_ro_reader; - }; - /* Array of records for each DB known in the environment. */ - MDBX_dbx *mt_dbxs; - /* Array of MDBX_db records for each known DB */ - MDBX_db *mt_dbs; - /* Array of sequence numbers for each DB handle */ - unsigned *mt_dbiseqs; - -/* Transaction DB Flags */ -#define DB_DIRTY MDBX_TBL_DIRTY /* DB was written in this txn */ -#define DB_STALE MDBX_TBL_STALE /* Named-DB record is older than txnID */ -#define DB_NEW MDBX_TBL_NEW /* Named-DB handle opened in this txn */ -#define DB_VALID 0x08 /* DB handle is valid, see also MDBX_VALID */ -#define DB_USRVALID 0x10 /* As DB_VALID, but not set for FREE_DBI */ -#define DB_DUPDATA 0x20 /* DB is MDBX_DUPSORT data */ - /* In write txns, array of cursors for each DB */ - MDBX_cursor **mt_cursors; - /* Array of flags for each DB */ - uint8_t *mt_dbflags; - /* Number of DB records in use, or 0 when the txn is finished. - * This number only ever increments until the txn finishes; we - * don't decrement it when individual DB handles are closed. */ - MDBX_dbi mt_numdbs; - -/* Transaction Flags */ -/* mdbx_txn_begin() flags */ -#define MDBX_TXN_BEGIN_FLAGS \ - (MDBX_NOMETASYNC | MDBX_NOSYNC | MDBX_RDONLY | MDBX_TRYTXN) -#define MDBX_TXN_NOMETASYNC \ - MDBX_NOMETASYNC /* don't sync meta for this txn on commit */ -#define MDBX_TXN_NOSYNC MDBX_NOSYNC /* don't sync this txn on commit */ -#define MDBX_TXN_RDONLY MDBX_RDONLY /* read-only transaction */ - /* internal txn flags */ -#define MDBX_TXN_WRITEMAP MDBX_WRITEMAP /* copy of MDBX_env flag in writers */ -#define MDBX_TXN_FINISHED 0x01 /* txn is finished or never began */ -#define MDBX_TXN_ERROR 0x02 /* txn is unusable after an error */ -#define MDBX_TXN_DIRTY 0x04 /* must write, even if dirty list is empty */ -#define MDBX_TXN_SPILLS 0x08 /* txn or a parent has spilled pages */ -#define MDBX_TXN_HAS_CHILD 0x10 /* txn has an MDBX_txn.mt_child */ -/* most operations on the txn are currently illegal */ -#define MDBX_TXN_BLOCKED \ - (MDBX_TXN_FINISHED | MDBX_TXN_ERROR | MDBX_TXN_HAS_CHILD) - unsigned mt_flags; - /* dirtylist room: Array size - dirty pages visible to this txn. - * Includes ancestor txns' dirty pages not hidden by other txns' - * dirty/spilled pages. Thus commit(nested txn) has room to merge - * dirtylist into mt_parent after freeing hidden mt_parent pages. */ - unsigned mt_dirtyroom; - mdbx_tid_t mt_owner; /* thread ID that owns this transaction */ - mdbx_canary mt_canary; -}; - -/* Enough space for 2^32 nodes with minimum of 2 keys per node. I.e., plenty. - * At 4 keys per node, enough for 2^64 nodes, so there's probably no need to - * raise this on a 64 bit machine. */ -#define CURSOR_STACK 32 - -struct MDBX_xcursor; - -/* Cursors are used for all DB operations. - * A cursor holds a path of (page pointer, key index) from the DB - * root to a position in the DB, plus other state. MDBX_DUPSORT - * cursors include an xcursor to the current data item. Write txns - * track their cursors and keep them up to date when data moves. - * Exception: An xcursor's pointer to a P_SUBP page can be stale. - * (A node with F_DUPDATA but no F_SUBDATA contains a subpage). */ -struct MDBX_cursor { -#define MDBX_MC_SIGNATURE UINT32_C(0xFE05D5B1) -#define MDBX_MC_READY4CLOSE UINT32_C(0x2817A047) -#define MDBX_MC_WAIT4EOT UINT32_C(0x90E297A7) - uint32_t mc_signature; - /* The database handle this cursor operates on */ - MDBX_dbi mc_dbi; - /* Next cursor on this DB in this txn */ - MDBX_cursor *mc_next; - /* Backup of the original cursor if this cursor is a shadow */ - MDBX_cursor *mc_backup; - /* Context used for databases with MDBX_DUPSORT, otherwise NULL */ - struct MDBX_xcursor *mc_xcursor; - /* The transaction that owns this cursor */ - MDBX_txn *mc_txn; - /* The database record for this cursor */ - MDBX_db *mc_db; - /* The database auxiliary record for this cursor */ - MDBX_dbx *mc_dbx; - /* The mt_dbflag for this database */ - uint8_t *mc_dbflag; - uint16_t mc_snum; /* number of pushed pages */ - uint16_t mc_top; /* index of top page, normally mc_snum-1 */ - /* Cursor state flags. */ -#define C_INITIALIZED 0x01 /* cursor has been initialized and is valid */ -#define C_EOF 0x02 /* No more data */ -#define C_SUB 0x04 /* Cursor is a sub-cursor */ -#define C_DEL 0x08 /* last op was a cursor_del */ -#define C_UNTRACK 0x40 /* Un-track cursor when closing */ -#define C_RECLAIMING 0x80 /* FreeDB lookup is prohibited */ - unsigned mc_flags; /* see mdbx_cursor */ - MDBX_page *mc_pg[CURSOR_STACK]; /* stack of pushed pages */ - indx_t mc_ki[CURSOR_STACK]; /* stack of page indices */ -}; - -/* Context for sorted-dup records. - * We could have gone to a fully recursive design, with arbitrarily - * deep nesting of sub-databases. But for now we only handle these - * levels - main DB, optional sub-DB, sorted-duplicate DB. */ -typedef struct MDBX_xcursor { - /* A sub-cursor for traversing the Dup DB */ - MDBX_cursor mx_cursor; - /* The database record for this Dup DB */ - MDBX_db mx_db; - /* The auxiliary DB record for this Dup DB */ - MDBX_dbx mx_dbx; - /* The mt_dbflag for this Dup DB */ - uint8_t mx_dbflag; -} MDBX_xcursor; - -/* Check if there is an inited xcursor, so XCURSOR_REFRESH() is proper */ -#define XCURSOR_INITED(mc) \ - ((mc)->mc_xcursor && ((mc)->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) - -/* Update sub-page pointer, if any, in mc->mc_xcursor. - * Needed when the node which contains the sub-page may have moved. - * Called with mp = mc->mc_pg[mc->mc_top], ki = mc->mc_ki[mc->mc_top]. */ -#define XCURSOR_REFRESH(mc, mp, ki) \ - do { \ - MDBX_page *xr_pg = (mp); \ - MDBX_node *xr_node = NODEPTR(xr_pg, ki); \ - if ((xr_node->mn_flags & (F_DUPDATA | F_SUBDATA)) == F_DUPDATA) \ - (mc)->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(xr_node); \ - } while (0) - -/* State of FreeDB old pages, stored in the MDBX_env */ -typedef struct MDBX_pgstate { - pgno_t *mf_reclaimed_pglist; /* Reclaimed freeDB pages, or NULL before use */ - txnid_t mf_last_reclaimed; /* ID of last used record, or 0 if - !mf_reclaimed_pglist */ -} MDBX_pgstate; - -/* The database environment. */ -struct MDBX_env { -#define MDBX_ME_SIGNATURE UINT32_C(0x9A899641) - size_t me_signature; - mdbx_mmap_t me_dxb_mmap; /* The main data file */ -#define me_map me_dxb_mmap.dxb -#define me_fd me_dxb_mmap.fd -#define me_mapsize me_dxb_mmap.length - mdbx_mmap_t me_lck_mmap; /* The lock file */ -#define me_lfd me_lck_mmap.fd -#define me_lck me_lck_mmap.lck - -/* Failed to update the meta page. Probably an I/O error. */ -#define MDBX_FATAL_ERROR UINT32_C(0x80000000) -/* Additional flag for mdbx_sync_locked() */ -#define MDBX_SHRINK_ALLOWED UINT32_C(0x40000000) -/* Some fields are initialized. */ -#define MDBX_ENV_ACTIVE UINT32_C(0x20000000) -/* me_txkey is set */ -#define MDBX_ENV_TXKEY UINT32_C(0x10000000) - uint32_t me_flags; /* see mdbx_env */ - unsigned me_psize; /* DB page size, inited from me_os_psize */ - unsigned me_psize2log; /* log2 of DB page size */ - unsigned me_os_psize; /* OS page size, from mdbx_syspagesize() */ - unsigned me_maxreaders; /* size of the reader table */ - /* Max MDBX_lockinfo.mti_numreaders of interest to mdbx_env_close() */ - unsigned me_close_readers; - mdbx_fastmutex_t me_dbi_lock; - MDBX_dbi me_numdbs; /* number of DBs opened */ - MDBX_dbi me_maxdbs; /* size of the DB table */ - mdbx_pid_t me_pid; /* process ID of this env */ - mdbx_thread_key_t me_txkey; /* thread-key for readers */ - char *me_path; /* path to the DB files */ - void *me_pbuf; /* scratch area for DUPSORT put() */ - MDBX_txn *me_txn; /* current write transaction */ - MDBX_txn *me_txn0; /* prealloc'd write transaction */ - MDBX_dbx *me_dbxs; /* array of static DB info */ - uint16_t *me_dbflags; /* array of flags from MDBX_db.md_flags */ - unsigned *me_dbiseqs; /* array of dbi sequence numbers */ - volatile txnid_t *me_oldest; /* ID of oldest reader last time we looked */ - MDBX_pgstate me_pgstate; /* state of old pages from freeDB */ -#define me_last_reclaimed me_pgstate.mf_last_reclaimed -#define me_reclaimed_pglist me_pgstate.mf_reclaimed_pglist - MDBX_page *me_dpages; /* list of malloc'd blocks for re-use */ - /* PNL of pages that became unused in a write txn */ - MDBX_PNL me_free_pgs; - /* ID2L of pages written during a write txn. Length MDBX_PNL_UM_SIZE. */ - MDBX_ID2L me_dirtylist; - /* Max number of freelist items that can fit in a single overflow page */ - unsigned me_maxfree_1pg; - /* Max size of a node on a page */ - unsigned me_nodemax; - unsigned me_maxkey_limit; /* max size of a key */ - mdbx_pid_t me_live_reader; /* have liveness lock in reader table */ - void *me_userctx; /* User-settable context */ - size_t me_sync_pending; /* Total dirty/non-sync'ed bytes - * since the last mdbx_env_sync() */ - size_t me_sync_threshold; /* Treshold of above to force synchronous flush */ - MDBX_oom_func *me_oom_func; /* Callback for kicking laggard readers */ - txnid_t me_oldest_stub; -#if MDBX_DEBUG - MDBX_assert_func *me_assert_func; /* Callback for assertion failures */ -#endif -#ifdef USE_VALGRIND - int me_valgrind_handle; -#endif - - struct { - size_t lower; /* minimal size of datafile */ - size_t upper; /* maximal size of datafile */ - size_t now; /* current size of datafile */ - size_t grow; /* step to grow datafile */ - size_t shrink; /* threshold to shrink datafile */ - } me_dbgeo; /* */ -}; - -/* Nested transaction */ -typedef struct MDBX_ntxn { - MDBX_txn mnt_txn; /* the transaction */ - MDBX_pgstate mnt_pgstate; /* parent transaction's saved freestate */ -} MDBX_ntxn; - -/*----------------------------------------------------------------------------*/ -/* Debug and Logging stuff */ - -extern int mdbx_runtime_flags; -extern MDBX_debug_func *mdbx_debug_logger; -extern txnid_t mdbx_debug_edge; - -void mdbx_debug_log(int type, const char *function, int line, const char *fmt, - ...) -#if defined(__GNUC__) || __has_attribute(format) - __attribute__((format(printf, 4, 5))) -#endif - ; - -void mdbx_panic(const char *fmt, ...) -#if defined(__GNUC__) || __has_attribute(format) - __attribute__((format(printf, 1, 2))) -#endif - ; - -#if MDBX_DEBUG - -#define mdbx_assert_enabled() unlikely(mdbx_runtime_flags &MDBX_DBG_ASSERT) - -#define mdbx_audit_enabled() unlikely(mdbx_runtime_flags &MDBX_DBG_AUDIT) - -#define mdbx_debug_enabled(type) \ - unlikely(mdbx_runtime_flags &(type & (MDBX_DBG_TRACE | MDBX_DBG_EXTRA))) - -#else -#define mdbx_debug_enabled(type) (0) -#define mdbx_audit_enabled() (0) -#ifndef NDEBUG -#define mdbx_assert_enabled() (1) -#else -#define mdbx_assert_enabled() (0) -#endif /* NDEBUG */ -#endif /* MDBX_DEBUG */ - -#define mdbx_print(fmt, ...) \ - mdbx_debug_log(MDBX_DBG_PRINT, NULL, 0, fmt, ##__VA_ARGS__) - -#define mdbx_trace(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE)) \ - mdbx_debug_log(MDBX_DBG_TRACE, __FUNCTION__, __LINE__, fmt "\n", \ - ##__VA_ARGS__); \ - } while (0) - -#define mdbx_verbose(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE /* FIXME */)) \ - mdbx_debug_log(MDBX_DBG_TRACE /* FIXME */, __FUNCTION__, __LINE__, \ - fmt "\n", ##__VA_ARGS__); \ - } while (0) - -#define mdbx_info(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE /* FIXME */)) \ - mdbx_debug_log(MDBX_DBG_TRACE /* FIXME */, __FUNCTION__, __LINE__, \ - fmt "\n", ##__VA_ARGS__); \ - } while (0) - -#define mdbx_notice(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE /* FIXME */)) \ - mdbx_debug_log(MDBX_DBG_TRACE /* FIXME */, __FUNCTION__, __LINE__, \ - fmt "\n", ##__VA_ARGS__); \ - } while (0) - -#define mdbx_warning(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE /* FIXME */)) \ - mdbx_debug_log(MDBX_DBG_TRACE /* FIXME */, __FUNCTION__, __LINE__, \ - fmt "\n", ##__VA_ARGS__); \ - } while (0) - -#define mdbx_error(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE /* FIXME */)) \ - mdbx_debug_log(MDBX_DBG_TRACE /* FIXME */, __FUNCTION__, __LINE__, \ - fmt "\n", ##__VA_ARGS__); \ - } while (0) - -#define mdbx_fatal(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE /* FIXME */)) \ - mdbx_debug_log(MDBX_DBG_TRACE /* FIXME */, __FUNCTION__, __LINE__, \ - fmt "\n", ##__VA_ARGS__); \ - } while (0) - -#define mdbx_debug(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE)) \ - mdbx_debug_log(MDBX_DBG_TRACE, __FUNCTION__, __LINE__, fmt "\n", \ - ##__VA_ARGS__); \ - } while (0) - -#define mdbx_debug_print(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_TRACE)) \ - mdbx_debug_log(MDBX_DBG_TRACE, NULL, 0, fmt, ##__VA_ARGS__); \ - } while (0) - -#define mdbx_debug_extra(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_EXTRA)) \ - mdbx_debug_log(MDBX_DBG_EXTRA, __FUNCTION__, __LINE__, fmt, \ - ##__VA_ARGS__); \ - } while (0) - -#define mdbx_debug_extra_print(fmt, ...) \ - do { \ - if (mdbx_debug_enabled(MDBX_DBG_EXTRA)) \ - mdbx_debug_log(MDBX_DBG_EXTRA, NULL, 0, fmt, ##__VA_ARGS__); \ - } while (0) - -#define mdbx_ensure_msg(env, expr, msg) \ - do { \ - if (unlikely(!(expr))) \ - mdbx_assert_fail(env, msg, __FUNCTION__, __LINE__); \ - } while (0) - -#define mdbx_ensure(env, expr) mdbx_ensure_msg(env, expr, #expr) - -/* assert(3) variant in environment context */ -#define mdbx_assert(env, expr) \ - do { \ - if (mdbx_assert_enabled()) \ - mdbx_ensure(env, expr); \ - } while (0) - -/* assert(3) variant in cursor context */ -#define mdbx_cassert(mc, expr) mdbx_assert((mc)->mc_txn->mt_env, expr) - -/* assert(3) variant in transaction context */ -#define mdbx_tassert(txn, expr) mdbx_assert((txn)->mt_env, expr) - -static __inline void mdbx_jitter4testing(bool tiny) { -#ifndef NDEBUG - if (MDBX_DBG_JITTER & mdbx_runtime_flags) - mdbx_osal_jitter(tiny); -#else - (void)tiny; -#endif -} - -/*----------------------------------------------------------------------------*/ -/* Internal prototypes and inlines */ - -int mdbx_reader_check0(MDBX_env *env, int rlocked, int *dead); -void mdbx_rthc_dtor(void *rthc); -void mdbx_rthc_lock(void); -void mdbx_rthc_unlock(void); -int mdbx_rthc_alloc(mdbx_thread_key_t *key, MDBX_reader *begin, - MDBX_reader *end); -void mdbx_rthc_remove(mdbx_thread_key_t key); -void mdbx_rthc_cleanup(void); - -static __inline bool mdbx_is_power2(size_t x) { return (x & (x - 1)) == 0; } - -static __inline size_t mdbx_roundup2(size_t value, size_t granularity) { - assert(mdbx_is_power2(granularity)); - return (value + granularity - 1) & ~(granularity - 1); -} - -static __inline unsigned mdbx_log2(size_t value) { - assert(mdbx_is_power2(value)); - - unsigned log = 0; - while (value > 1) { - log += 1; - value >>= 1; - } - return log; -} - -#define MDBX_IS_ERROR(rc) \ - ((rc) != MDBX_RESULT_TRUE && (rc) != MDBX_RESULT_FALSE) - -/* Internal error codes, not exposed outside libmdbx */ -#define MDBX_NO_ROOT (MDBX_LAST_ERRCODE + 10) - -/* Debuging output value of a cursor DBI: Negative in a sub-cursor. */ -#define DDBI(mc) \ - (((mc)->mc_flags & C_SUB) ? -(int)(mc)->mc_dbi : (int)(mc)->mc_dbi) - -/* Key size which fits in a DKBUF. */ -#define DKBUF_MAXKEYSIZE 511 /* FIXME */ - -#if MDBX_DEBUG -#define DKBUF char _kbuf[DKBUF_MAXKEYSIZE * 4 + 2] -#define DKEY(x) mdbx_dkey(x, _kbuf, DKBUF_MAXKEYSIZE * 2 + 1) -#define DVAL(x) \ - mdbx_dkey(x, _kbuf + DKBUF_MAXKEYSIZE * 2 + 1, DKBUF_MAXKEYSIZE * 2 + 1) -#else -#define DKBUF ((void)(0)) -#define DKEY(x) ("-") -#define DVAL(x) ("-") -#endif - -/* An invalid page number. - * Mainly used to denote an empty tree. */ -#define P_INVALID (~(pgno_t)0) - -/* Test if the flags f are set in a flag word w. */ -#define F_ISSET(w, f) (((w) & (f)) == (f)) - -/* Round n up to an even number. */ -#define EVEN(n) (((n) + 1U) & -2) /* sign-extending -2 to match n+1U */ - -/* Default size of memory map. - * This is certainly too small for any actual applications. Apps should - * always set the size explicitly using mdbx_env_set_mapsize(). */ -#define DEFAULT_MAPSIZE 1048576 - -/* Number of slots in the reader table. - * This value was chosen somewhat arbitrarily. The 61 is a prime number, - * and such readers plus a couple mutexes fit into single 4KB page. - * Applications should set the table size using mdbx_env_set_maxreaders(). */ -#define DEFAULT_READERS 61 - -/* Address of first usable data byte in a page, after the header */ -#define PAGEDATA(p) ((void *)((char *)(p) + PAGEHDRSZ)) - -/* Number of nodes on a page */ -#define NUMKEYS(p) ((unsigned)(p)->mp_lower >> 1) - -/* The amount of space remaining in the page */ -#define SIZELEFT(p) (indx_t)((p)->mp_upper - (p)->mp_lower) - -/* The percentage of space used in the page, in tenths of a percent. */ -#define PAGEFILL(env, p) \ - (1024UL * ((env)->me_psize - PAGEHDRSZ - SIZELEFT(p)) / \ - ((env)->me_psize - PAGEHDRSZ)) -/* The minimum page fill factor, in tenths of a percent. - * Pages emptier than this are candidates for merging. */ -#define FILL_THRESHOLD 256 - -/* Test if a page is a leaf page */ -#define IS_LEAF(p) F_ISSET((p)->mp_flags, P_LEAF) -/* Test if a page is a LEAF2 page */ -#define IS_LEAF2(p) F_ISSET((p)->mp_flags, P_LEAF2) -/* Test if a page is a branch page */ -#define IS_BRANCH(p) F_ISSET((p)->mp_flags, P_BRANCH) -/* Test if a page is an overflow page */ -#define IS_OVERFLOW(p) unlikely(F_ISSET((p)->mp_flags, P_OVERFLOW)) -/* Test if a page is a sub page */ -#define IS_SUBP(p) F_ISSET((p)->mp_flags, P_SUBP) - -/* The number of overflow pages needed to store the given size. */ -#define OVPAGES(env, size) (bytes2pgno(env, PAGEHDRSZ - 1 + (size)) + 1) - -/* Link in MDBX_txn.mt_loose_pages list. - * Kept outside the page header, which is needed when reusing the page. */ -#define NEXT_LOOSE_PAGE(p) (*(MDBX_page **)((p) + 2)) - -/* Header for a single key/data pair within a page. - * Used in pages of type P_BRANCH and P_LEAF without P_LEAF2. - * We guarantee 2-byte alignment for 'MDBX_node's. - * - * mn_lo and mn_hi are used for data size on leaf nodes, and for child - * pgno on branch nodes. On 64 bit platforms, mn_flags is also used - * for pgno. (Branch nodes have no flags). Lo and hi are in host byte - * order in case some accesses can be optimized to 32-bit word access. - * - * Leaf node flags describe node contents. F_BIGDATA says the node's - * data part is the page number of an overflow page with actual data. - * F_DUPDATA and F_SUBDATA can be combined giving duplicate data in - * a sub-page/sub-database, and named databases (just F_SUBDATA). */ -typedef struct MDBX_node { - union { - struct { -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - union { - struct { - uint16_t mn_lo, mn_hi; /* part of data size or pgno */ - }; - uint32_t mn_dsize; - }; - uint16_t mn_flags; /* see mdbx_node */ - uint16_t mn_ksize; /* key size */ -#else - uint16_t mn_ksize; /* key size */ - uint16_t mn_flags; /* see mdbx_node */ - union { - struct { - uint16_t mn_hi, mn_lo; /* part of data size or pgno */ - }; - uint32_t mn_dsize; - }; -#endif - }; - pgno_t mn_ksize_and_pgno; - }; - -/* mdbx_node Flags */ -#define F_BIGDATA 0x01 /* data put on overflow page */ -#define F_SUBDATA 0x02 /* data is a sub-database */ -#define F_DUPDATA 0x04 /* data has duplicates */ - -/* valid flags for mdbx_node_add() */ -#define NODE_ADD_FLAGS (F_DUPDATA | F_SUBDATA | MDBX_RESERVE | MDBX_APPEND) - uint8_t mn_data[1]; /* key and data are appended here */ -} MDBX_node; - -/* Size of the node header, excluding dynamic data at the end */ -#define NODESIZE offsetof(MDBX_node, mn_data) - -/* Bit position of top word in page number, for shifting mn_flags */ -#define PGNO_TOPWORD ((pgno_t)-1 > 0xffffffffu ? 32 : 0) - -/* Size of a node in a branch page with a given key. - * This is just the node header plus the key, there is no data. */ -#define INDXSIZE(k) (NODESIZE + ((k) == NULL ? 0 : (k)->iov_len)) - -/* Size of a node in a leaf page with a given key and data. - * This is node header plus key plus data size. */ -#define LEAFSIZE(k, d) (NODESIZE + (k)->iov_len + (d)->iov_len) - -/* Address of node i in page p */ -static __inline MDBX_node *NODEPTR(MDBX_page *p, unsigned i) { - assert(NUMKEYS(p) > (unsigned)(i)); - return (MDBX_node *)((char *)(p) + (p)->mp_ptrs[i] + PAGEHDRSZ); -} - -/* Address of the key for the node */ -#define NODEKEY(node) (void *)((node)->mn_data) - -/* Address of the data for a node */ -#define NODEDATA(node) (void *)((char *)(node)->mn_data + (node)->mn_ksize) - -/* Get the page number pointed to by a branch node */ -static __inline pgno_t NODEPGNO(const MDBX_node *node) { - pgno_t pgno; - if (UNALIGNED_OK) { - pgno = node->mn_ksize_and_pgno; - if (sizeof(pgno_t) > 4) - pgno &= MAX_PAGENO; - } else { - pgno = node->mn_lo | ((pgno_t)node->mn_hi << 16); - if (sizeof(pgno_t) > 4) - pgno |= ((uint64_t)node->mn_flags) << 32; - } - return pgno; -} - -/* Set the page number in a branch node */ -static __inline void SETPGNO(MDBX_node *node, pgno_t pgno) { - assert(pgno <= MAX_PAGENO); - - if (UNALIGNED_OK) { - if (sizeof(pgno_t) > 4) - pgno |= ((uint64_t)node->mn_ksize) << 48; - node->mn_ksize_and_pgno = pgno; - } else { - node->mn_lo = (uint16_t)pgno; - node->mn_hi = (uint16_t)(pgno >> 16); - if (sizeof(pgno_t) > 4) - node->mn_flags = (uint16_t)((uint64_t)pgno >> 32); - } -} - -/* Get the size of the data in a leaf node */ -static __inline size_t NODEDSZ(const MDBX_node *node) { - size_t size; - if (UNALIGNED_OK) { - size = node->mn_dsize; - } else { - size = node->mn_lo | ((size_t)node->mn_hi << 16); - } - return size; -} - -/* Set the size of the data for a leaf node */ -static __inline void SETDSZ(MDBX_node *node, size_t size) { - assert(size < INT_MAX); - if (UNALIGNED_OK) { - node->mn_dsize = (uint32_t)size; - } else { - node->mn_lo = (uint16_t)size; - node->mn_hi = (uint16_t)(size >> 16); - } -} - -/* The size of a key in a node */ -#define NODEKSZ(node) ((node)->mn_ksize) - -/* The address of a key in a LEAF2 page. - * LEAF2 pages are used for MDBX_DUPFIXED sorted-duplicate sub-DBs. - * There are no node headers, keys are stored contiguously. */ -#define LEAF2KEY(p, i, ks) ((char *)(p) + PAGEHDRSZ + ((i) * (ks))) - -/* Set the node's key into keyptr, if requested. */ -#define MDBX_GET_KEY(node, keyptr) \ - do { \ - if ((keyptr) != NULL) { \ - (keyptr)->iov_len = NODEKSZ(node); \ - (keyptr)->iov_base = NODEKEY(node); \ - } \ - } while (0) - -/* Set the node's key into key. */ -#define MDBX_GET_KEY2(node, key) \ - do { \ - key.iov_len = NODEKSZ(node); \ - key.iov_base = NODEKEY(node); \ - } while (0) - -#define MDBX_VALID 0x8000 /* DB handle is valid, for me_dbflags */ -#define PERSISTENT_FLAGS (0xffff & ~(MDBX_VALID)) -/* mdbx_dbi_open() flags */ -#define VALID_FLAGS \ - (MDBX_REVERSEKEY | MDBX_DUPSORT | MDBX_INTEGERKEY | MDBX_DUPFIXED | \ - MDBX_INTEGERDUP | MDBX_REVERSEDUP | MDBX_CREATE) - -/* max number of pages to commit in one writev() call */ -#define MDBX_COMMIT_PAGES 64 -#if defined(IOV_MAX) && IOV_MAX < MDBX_COMMIT_PAGES /* sysconf(_SC_IOV_MAX) */ -#undef MDBX_COMMIT_PAGES -#define MDBX_COMMIT_PAGES IOV_MAX -#endif - -/* Check txn and dbi arguments to a function */ -#define TXN_DBI_EXIST(txn, dbi, validity) \ - ((dbi) < (txn)->mt_numdbs && ((txn)->mt_dbflags[dbi] & (validity))) - -/* Check for misused dbi handles */ -#define TXN_DBI_CHANGED(txn, dbi) \ - ((txn)->mt_dbiseqs[dbi] != (txn)->mt_env->me_dbiseqs[dbi]) - -/* LY: fast enough on most systems - * - * / - * | -1, a < b - * cmp2int(a,b) = < 0, a == b - * | 1, a > b - * \ - */ -#if 1 -#define mdbx_cmp2int(a, b) (((b) > (a)) ? -1 : (a) > (b)) -#else -#define mdbx_cmp2int(a, b) (((a) > (b)) - ((b) > (a))) -#endif - -static __inline size_t pgno2bytes(const MDBX_env *env, pgno_t pgno) { - mdbx_assert(env, (1u << env->me_psize2log) == env->me_psize); - return ((size_t)pgno) << env->me_psize2log; -} - -static __inline MDBX_page *pgno2page(const MDBX_env *env, pgno_t pgno) { - return (MDBX_page *)(env->me_map + pgno2bytes(env, pgno)); -} - -static __inline pgno_t bytes2pgno(const MDBX_env *env, size_t bytes) { - mdbx_assert(env, (env->me_psize >> env->me_psize2log) == 1); - return (pgno_t)(bytes >> env->me_psize2log); -} - -static __inline pgno_t pgno_add(pgno_t base, pgno_t augend) { - assert(base <= MAX_PAGENO); - return (augend < MAX_PAGENO - base) ? base + augend : MAX_PAGENO; -} - -static __inline pgno_t pgno_sub(pgno_t base, pgno_t subtrahend) { - assert(base >= MIN_PAGENO); - return (subtrahend < base - MIN_PAGENO) ? base - subtrahend : MIN_PAGENO; -} - -static __inline size_t pgno_align2os_bytes(const MDBX_env *env, pgno_t pgno) { - return mdbx_roundup2(pgno2bytes(env, pgno), env->me_os_psize); -} - -static __inline pgno_t pgno_align2os_pgno(const MDBX_env *env, pgno_t pgno) { - return bytes2pgno(env, pgno_align2os_bytes(env, pgno)); -} diff --git a/plugins/Dbx_mdb/src/mdbx/defs.h b/plugins/Dbx_mdb/src/mdbx/defs.h deleted file mode 100644 index 800553bb17..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/defs.h +++ /dev/null @@ -1,423 +0,0 @@ -/* - * Copyright 2015-2017 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>. - */ - -#pragma once -/* *INDENT-OFF* */ -/* clang-format off */ - -#ifndef __GNUC_PREREQ -# if defined(__GNUC__) && defined(__GNUC_MINOR__) -# define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -# else -# define __GNUC_PREREQ(maj, min) (0) -# endif -#endif /* __GNUC_PREREQ */ - -#ifndef __CLANG_PREREQ -# ifdef __clang__ -# define __CLANG_PREREQ(maj,min) \ - ((__clang_major__ << 16) + __clang_minor__ >= ((maj) << 16) + (min)) -# else -# define __CLANG_PREREQ(maj,min) (0) -# endif -#endif /* __CLANG_PREREQ */ - -#ifndef __GLIBC_PREREQ -# if defined(__GLIBC__) && defined(__GLIBC_MINOR__) -# define __GLIBC_PREREQ(maj, min) \ - ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) -# else -# define __GLIBC_PREREQ(maj, min) (0) -# endif -#endif /* __GLIBC_PREREQ */ - -#ifndef __has_attribute -# define __has_attribute(x) (0) -#endif - -#ifndef __has_feature -# define __has_feature(x) (0) -#endif - -#ifndef __has_extension -# define __has_extension(x) (0) -#endif - -#ifndef __has_builtin -# define __has_builtin(x) (0) -#endif - -#if __has_feature(thread_sanitizer) -# define __SANITIZE_THREAD__ 1 -#endif - -#if __has_feature(address_sanitizer) -# define __SANITIZE_ADDRESS__ 1 -#endif - -/*----------------------------------------------------------------------------*/ - -#ifndef __extern_C -# ifdef __cplusplus -# define __extern_C extern "C" -# else -# define __extern_C -# endif -#endif /* __extern_C */ - -#ifndef __cplusplus -# ifndef bool -# define bool _Bool -# endif -# ifndef true -# define true (1) -# endif -# ifndef false -# define false (0) -# endif -#endif - -#if !defined(nullptr) && !defined(__cplusplus) || (__cplusplus < 201103L && !defined(_MSC_VER)) -# define nullptr NULL -#endif - -/*----------------------------------------------------------------------------*/ - -#if !defined(__thread) && (defined(_MSC_VER) || defined(__DMC__)) -# define __thread __declspec(thread) -#endif /* __thread */ - -#ifndef __alwaysinline -# if defined(__GNUC__) || __has_attribute(always_inline) -# define __alwaysinline __inline __attribute__((always_inline)) -# elif defined(_MSC_VER) -# define __alwaysinline __forceinline -# else -# define __alwaysinline -# endif -#endif /* __alwaysinline */ - -#ifndef __noinline -# if defined(__GNUC__) || __has_attribute(noinline) -# define __noinline __attribute__((noinline)) -# elif defined(_MSC_VER) -# define __noinline __declspec(noinline) -# elif defined(__SUNPRO_C) || defined(__sun) || defined(sun) -# define __noinline inline -# elif !defined(__INTEL_COMPILER) -# define __noinline /* FIXME ? */ -# endif -#endif /* __noinline */ - -#ifndef __must_check_result -# if defined(__GNUC__) || __has_attribute(warn_unused_result) -# define __must_check_result __attribute__((warn_unused_result)) -# else -# define __must_check_result -# endif -#endif /* __must_check_result */ - -#ifndef __deprecated -# if defined(__GNUC__) || __has_attribute(deprecated) -# define __deprecated __attribute__((deprecated)) -# elif defined(_MSC_VER) -# define __deprecated __declspec(deprecated) -# else -# define __deprecated -# endif -#endif /* __deprecated */ - -#if !defined(__noop) && !defined(_MSC_VER) -# ifdef __cplusplus - static inline void __noop_consume_args() {} - template <typename First, typename... Rest> - static inline void - __noop_consume_args(const First &first, const Rest &... rest) { - (void) first; __noop_consume_args(rest...); - } -# define __noop(...) __noop_consume_args(__VA_ARGS__) -# elif defined(__GNUC__) && (!defined(__STRICT_ANSI__) || !__STRICT_ANSI__) - static __inline void __noop_consume_args(void* anchor, ...) { - (void) anchor; - } -# define __noop(...) __noop_consume_args(0, ##__VA_ARGS__) -# else -# define __noop(...) do {} while(0) -# endif -#endif /* __noop */ - -#ifndef __fallthrough -# if __GNUC_PREREQ(7, 0) || __has_attribute(fallthrough) -# define __fallthrough __attribute__((fallthrough)) -# else -# define __fallthrough __noop() -# endif -#endif /* __fallthrough */ - -#ifndef __unreachable -# if __GNUC_PREREQ(4,5) -# define __unreachable() __builtin_unreachable() -# elif defined(_MSC_VER) -# define __unreachable() __assume(0) -# else -# define __unreachable() __noop() -# endif -#endif /* __unreachable */ - -#ifndef __prefetch -# if defined(__GNUC__) || defined(__clang__) -# define __prefetch(ptr) __builtin_prefetch(ptr) -# else -# define __prefetch(ptr) __noop(ptr) -# endif -#endif /* __prefetch */ - -#ifndef __aligned -# if defined(__GNUC__) || __has_attribute(aligned) -# define __aligned(N) __attribute__((aligned(N))) -# elif defined(_MSC_VER) -# define __aligned(N) __declspec(align(N)) -# else -# define __aligned(N) -# endif -#endif /* __aligned */ - -#ifndef __noreturn -# if defined(__GNUC__) || __has_attribute(noreturn) -# define __noreturn __attribute__((noreturn)) -# elif defined(_MSC_VER) -# define __noreturn __declspec(noreturn) -# else -# define __noreturn -# endif -#endif /* __noreturn */ - -#ifndef __nothrow -# if defined(__GNUC__) || __has_attribute(nothrow) -# define __nothrow __attribute__((nothrow)) -# elif defined(_MSC_VER) && defined(__cplusplus) -# define __nothrow __declspec(nothrow) -# else -# define __nothrow -# endif -#endif /* __nothrow */ - -#ifndef __pure_function - /* Many functions have no effects except the return value and their - * return value depends only on the parameters and/or global variables. - * Such a function can be subject to common subexpression elimination - * and loop optimization just as an arithmetic operator would be. - * These functions should be declared with the attribute pure. */ -# if defined(__GNUC__) || __has_attribute(pure) -# define __pure_function __attribute__((pure)) -# else -# define __pure_function -# endif -#endif /* __pure_function */ - -#ifndef __const_function - /* Many functions do not examine any values except their arguments, - * and have no effects except the return value. Basically this is just - * slightly more strict class than the PURE attribute, since function - * is not allowed to read global memory. - * - * Note that a function that has pointer arguments and examines the - * data pointed to must not be declared const. Likewise, a function - * that calls a non-const function usually must not be const. - * It does not make sense for a const function to return void. */ -# if defined(__GNUC__) || __has_attribute(const) -# define __const_function __attribute__((const)) -# else -# define __const_function -# endif -#endif /* __const_function */ - -#ifndef __dll_hidden -# if defined(__GNUC__) || __has_attribute(visibility) -# define __hidden __attribute__((visibility("hidden"))) -# else -# define __hidden -# endif -#endif /* __dll_hidden */ - -#ifndef __optimize -# if defined(__OPTIMIZE__) -# if defined(__clang__) && !__has_attribute(optimize) -# define __optimize(ops) -# elif defined(__GNUC__) || __has_attribute(optimize) -# define __optimize(ops) __attribute__((optimize(ops))) -# else -# define __optimize(ops) -# endif -# else -# define __optimize(ops) -# endif -#endif /* __optimize */ - -#ifndef __hot -# if defined(__OPTIMIZE__) -# if defined(__clang__) && !__has_attribute(hot) - /* just put frequently used functions in separate section */ -# define __hot __attribute__((section("text.hot"))) __optimize("O3") -# elif defined(__GNUC__) || __has_attribute(hot) -# define __hot __attribute__((hot)) __optimize("O3") -# else -# define __hot __optimize("O3") -# endif -# else -# define __hot -# endif -#endif /* __hot */ - -#ifndef __cold -# if defined(__OPTIMIZE__) -# if defined(__clang__) && !__has_attribute(cold) - /* just put infrequently used functions in separate section */ -# define __cold __attribute__((section("text.unlikely"))) __optimize("Os") -# elif defined(__GNUC__) || __has_attribute(cold) -# define __cold __attribute__((cold)) __optimize("Os") -# else -# define __cold __optimize("Os") -# endif -# else -# define __cold -# endif -#endif /* __cold */ - -#ifndef __flatten -# if defined(__OPTIMIZE__) && (defined(__GNUC__) || __has_attribute(flatten)) -# define __flatten __attribute__((flatten)) -# else -# define __flatten -# endif -#endif /* __flatten */ - -#ifndef likely -# if defined(__GNUC__) || defined(__clang__) -# define likely(cond) __builtin_expect(!!(cond), 1) -# else -# define likely(x) (x) -# endif -#endif /* likely */ - -#ifndef unlikely -# if defined(__GNUC__) || defined(__clang__) -# define unlikely(cond) __builtin_expect(!!(cond), 0) -# else -# define unlikely(x) (x) -# endif -#endif /* unlikely */ - -/* Wrapper around __func__, which is a C99 feature */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -# define mdbx_func_ __func__ -#elif (defined(__GNUC__) && __GNUC__ >= 2) || defined(__clang__) || defined(_MSC_VER) -# define mdbx_func_ __FUNCTION__ -#else -# define mdbx_func_ "<mdbx_unknown>" -#endif - -/*----------------------------------------------------------------------------*/ - -#if defined(USE_VALGRIND) -# include <valgrind/memcheck.h> -# ifndef VALGRIND_DISABLE_ADDR_ERROR_REPORTING_IN_RANGE - /* LY: available since Valgrind 3.10 */ -# define VALGRIND_DISABLE_ADDR_ERROR_REPORTING_IN_RANGE(a,s) -# define VALGRIND_ENABLE_ADDR_ERROR_REPORTING_IN_RANGE(a,s) -# endif -#else -# define VALGRIND_CREATE_MEMPOOL(h,r,z) -# define VALGRIND_DESTROY_MEMPOOL(h) -# define VALGRIND_MEMPOOL_TRIM(h,a,s) -# define VALGRIND_MEMPOOL_ALLOC(h,a,s) -# define VALGRIND_MEMPOOL_FREE(h,a) -# define VALGRIND_MEMPOOL_CHANGE(h,a,b,s) -# define VALGRIND_MAKE_MEM_NOACCESS(a,s) -# define VALGRIND_MAKE_MEM_DEFINED(a,s) -# define VALGRIND_MAKE_MEM_UNDEFINED(a,s) -# define VALGRIND_DISABLE_ADDR_ERROR_REPORTING_IN_RANGE(a,s) -# define VALGRIND_ENABLE_ADDR_ERROR_REPORTING_IN_RANGE(a,s) -# define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,s) (0) -# define VALGRIND_CHECK_MEM_IS_DEFINED(a,s) (0) -# define RUNNING_ON_VALGRIND (0) -#endif /* USE_VALGRIND */ - -#ifdef __SANITIZE_ADDRESS__ -# include <sanitizer/asan_interface.h> -#else -# define ASAN_POISON_MEMORY_REGION(addr, size) \ - ((void)(addr), (void)(size)) -# define ASAN_UNPOISON_MEMORY_REGION(addr, size) \ - ((void)(addr), (void)(size)) -#endif /* __SANITIZE_ADDRESS__ */ - -/*----------------------------------------------------------------------------*/ - -#ifndef ARRAY_LENGTH -# ifdef __cplusplus - template <typename T, size_t N> - char (&__ArraySizeHelper(T (&array)[N]))[N]; -# define ARRAY_LENGTH(array) (sizeof(::__ArraySizeHelper(array))) -# else -# define ARRAY_LENGTH(array) (sizeof(array) / sizeof(array[0])) -# endif -#endif /* ARRAY_LENGTH */ - -#ifndef ARRAY_END -# define ARRAY_END(array) (&array[ARRAY_LENGTH(array)]) -#endif /* ARRAY_END */ - -#ifndef STRINGIFY -# define STRINGIFY_HELPER(x) #x -# define STRINGIFY(x) STRINGIFY_HELPER(x) -#endif /* STRINGIFY */ - -#ifndef offsetof -# define offsetof(type, member) __builtin_offsetof(type, member) -#endif /* offsetof */ - -#ifndef container_of -# define container_of(ptr, type, member) \ - ((type *)((char *)(ptr) - offsetof(type, member))) -#endif /* container_of */ - -#define MDBX_TETRAD(a, b, c, d) \ - ((uint32_t)(a) << 24 | (uint32_t)(b) << 16 | (uint32_t)(c) << 8 | (d)) - -#define MDBX_STRING_TETRAD(str) MDBX_TETRAD(str[0], str[1], str[2], str[3]) - -#define FIXME "FIXME: " __FILE__ ", " STRINGIFY(__LINE__) - -#ifndef STATIC_ASSERT_MSG -# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) \ - || __has_feature(c_static_assert) -# define STATIC_ASSERT_MSG(expr, msg) _Static_assert(expr, msg) -# elif defined(static_assert) -# define STATIC_ASSERT_MSG(expr, msg) static_assert(expr, msg) -# elif defined(_MSC_VER) -# include <crtdbg.h> -# define STATIC_ASSERT_MSG(expr, msg) _STATIC_ASSERT(expr) -# else -# define STATIC_ASSERT_MSG(expr, msg) switch (0) {case 0:case (expr):;} -# endif -#endif /* STATIC_ASSERT */ - -#ifndef STATIC_ASSERT -# define STATIC_ASSERT(expr) STATIC_ASSERT_MSG(expr, #expr) -#endif - -/* *INDENT-ON* */ -/* clang-format on */ diff --git a/plugins/Dbx_mdb/src/mdbx/lck-windows.c b/plugins/Dbx_mdb/src/mdbx/lck-windows.c deleted file mode 100644 index 0582b28d78..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/lck-windows.c +++ /dev/null @@ -1,452 +0,0 @@ -/* - * Copyright 2015-2017 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 "./bits.h" - -/* PREAMBLE FOR WINDOWS: - * - * We are not concerned for performance here. - * If you are running Windows a performance could NOT be the goal. - * Otherwise please use Linux. - * - * Regards, - * LY - */ - -/*----------------------------------------------------------------------------*/ -/* rthc */ - -static CRITICAL_SECTION rthc_critical_section; - -static void NTAPI tls_callback(PVOID module, DWORD reason, PVOID reserved) { - (void)module; - (void)reserved; - switch (reason) { - case DLL_PROCESS_ATTACH: - InitializeCriticalSection(&rthc_critical_section); - break; - case DLL_PROCESS_DETACH: - DeleteCriticalSection(&rthc_critical_section); - break; - - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - mdbx_rthc_cleanup(); - break; - } -} - -void mdbx_rthc_lock(void) { EnterCriticalSection(&rthc_critical_section); } - -void mdbx_rthc_unlock(void) { LeaveCriticalSection(&rthc_critical_section); } - -/* *INDENT-OFF* */ -/* clang-format off */ -#if defined(_MSC_VER) -# pragma const_seg(push) -# pragma data_seg(push) - -# ifdef _WIN64 - /* kick a linker to create the TLS directory if not already done */ -# pragma comment(linker, "/INCLUDE:_tls_used") - /* Force some symbol references. */ -# pragma comment(linker, "/INCLUDE:mdbx_tls_callback") - /* specific const-segment for WIN64 */ -# pragma const_seg(".CRT$XLB") - const -# else - /* kick a linker to create the TLS directory if not already done */ -# pragma comment(linker, "/INCLUDE:__tls_used") - /* Force some symbol references. */ -# pragma comment(linker, "/INCLUDE:_mdbx_tls_callback") - /* specific data-segment for WIN32 */ -# pragma data_seg(".CRT$XLB") -# endif - - PIMAGE_TLS_CALLBACK mdbx_tls_callback = tls_callback; -# pragma data_seg(pop) -# pragma const_seg(pop) - -#elif defined(__GNUC__) -# ifdef _WIN64 - const -# endif - PIMAGE_TLS_CALLBACK mdbx_tls_callback __attribute__((section(".CRT$XLB"), used)) - = tls_callback; -#else -# error FIXME -#endif -/* *INDENT-ON* */ -/* clang-format on */ - -/*----------------------------------------------------------------------------*/ - -#define LCK_SHARED 0 -#define LCK_EXCLUSIVE LOCKFILE_EXCLUSIVE_LOCK -#define LCK_WAITFOR 0 -#define LCK_DONTWAIT LOCKFILE_FAIL_IMMEDIATELY - -static __inline BOOL flock(mdbx_filehandle_t fd, DWORD flags, uint64_t offset, - size_t bytes) { - OVERLAPPED ov; - ov.hEvent = 0; - ov.Offset = (DWORD)offset; - ov.OffsetHigh = HIGH_DWORD(offset); - return LockFileEx(fd, flags, 0, (DWORD)bytes, HIGH_DWORD(bytes), &ov); -} - -static __inline BOOL funlock(mdbx_filehandle_t fd, uint64_t offset, - size_t bytes) { - return UnlockFile(fd, (DWORD)offset, HIGH_DWORD(offset), (DWORD)bytes, - HIGH_DWORD(bytes)); -} - -/*----------------------------------------------------------------------------*/ -/* global `write` lock for write-txt processing, - * exclusive locking both meta-pages) */ - -#define LCK_MAXLEN (1u + (size_t)(MAXSSIZE_T)) -#define LCK_META_OFFSET 0 -#define LCK_META_LEN 0x10000u -#define LCK_BODY_OFFSET LCK_META_LEN -#define LCK_BODY_LEN (LCK_MAXLEN - LCK_BODY_OFFSET + 1u) -#define LCK_META LCK_META_OFFSET, LCK_META_LEN -#define LCK_BODY LCK_BODY_OFFSET, LCK_BODY_LEN -#define LCK_WHOLE 0, LCK_MAXLEN - -int mdbx_txn_lock(MDBX_env *env, bool dontwait) { - if (flock(env->me_fd, dontwait ? (LCK_EXCLUSIVE | LCK_DONTWAIT) - : (LCK_EXCLUSIVE | LCK_WAITFOR), - LCK_BODY)) - return MDBX_SUCCESS; - int rc = GetLastError(); - return (!dontwait || rc != ERROR_LOCK_VIOLATION) ? rc : MDBX_BUSY; -} - -void mdbx_txn_unlock(MDBX_env *env) { - if (!funlock(env->me_fd, LCK_BODY)) - mdbx_panic("%s failed: errcode %u", mdbx_func_, GetLastError()); -} - -/*----------------------------------------------------------------------------*/ -/* global `read` lock for readers registration, - * exclusive locking `mti_numreaders` (second) cacheline */ - -#define LCK_LO_OFFSET 0 -#define LCK_LO_LEN offsetof(MDBX_lockinfo, mti_numreaders) -#define LCK_UP_OFFSET LCK_LO_LEN -#define LCK_UP_LEN (MDBX_LOCKINFO_WHOLE_SIZE - LCK_UP_OFFSET) -#define LCK_LOWER LCK_LO_OFFSET, LCK_LO_LEN -#define LCK_UPPER LCK_UP_OFFSET, LCK_UP_LEN - -int mdbx_rdt_lock(MDBX_env *env) { - if (env->me_lfd == INVALID_HANDLE_VALUE) - return MDBX_SUCCESS; /* readonly database in readonly filesystem */ - - /* transite from S-? (used) to S-E (locked), e.g. exclusive lock upper-part */ - if (flock(env->me_lfd, LCK_EXCLUSIVE | LCK_WAITFOR, LCK_UPPER)) - return MDBX_SUCCESS; - return GetLastError(); -} - -void mdbx_rdt_unlock(MDBX_env *env) { - if (env->me_lfd != INVALID_HANDLE_VALUE) { - /* transite from S-E (locked) to S-? (used), e.g. unlock upper-part */ - if (!funlock(env->me_lfd, LCK_UPPER)) - mdbx_panic("%s failed: errcode %u", mdbx_func_, GetLastError()); - } -} - -/*----------------------------------------------------------------------------*/ -/* global `initial` lock for lockfile initialization, - * exclusive/shared locking first cacheline */ - -/* FIXME: locking schema/algo descritpion. - ?-? = free - S-? = used - E-? = exclusive-read - ?-S - ?-E = middle - S-S - S-E = locked - E-S - E-E = exclusive-write -*/ - -int mdbx_lck_init(MDBX_env *env) { - (void)env; - return MDBX_SUCCESS; -} - -/* Seize state as 'exclusive-write' (E-E and returns MDBX_RESULT_TRUE) - * or as 'used' (S-? and returns MDBX_RESULT_FALSE), otherwise returns an error - */ -static int internal_seize_lck(HANDLE lfd) { - int rc; - assert(lfd != INVALID_HANDLE_VALUE); - - /* 1) now on ?-? (free), get ?-E (middle) */ - mdbx_jitter4testing(false); - if (!flock(lfd, LCK_EXCLUSIVE | LCK_WAITFOR, LCK_UPPER)) { - rc = GetLastError() /* 2) something went wrong, give up */; - mdbx_error("%s(%s) failed: errcode %u", mdbx_func_, - "?-?(free) >> ?-E(middle)", rc); - return rc; - } - - /* 3) now on ?-E (middle), try E-E (exclusive-write) */ - mdbx_jitter4testing(false); - if (flock(lfd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_LOWER)) - return MDBX_RESULT_TRUE /* 4) got E-E (exclusive-write), done */; - - /* 5) still on ?-E (middle) */ - rc = GetLastError(); - mdbx_jitter4testing(false); - if (rc != ERROR_SHARING_VIOLATION && rc != ERROR_LOCK_VIOLATION) { - /* 6) something went wrong, give up */ - if (!funlock(lfd, LCK_UPPER)) - mdbx_panic("%s(%s) failed: errcode %u", mdbx_func_, - "?-E(middle) >> ?-?(free)", GetLastError()); - return rc; - } - - /* 7) still on ?-E (middle), try S-E (locked) */ - mdbx_jitter4testing(false); - rc = flock(lfd, LCK_SHARED | LCK_DONTWAIT, LCK_LOWER) ? MDBX_RESULT_FALSE - : GetLastError(); - - mdbx_jitter4testing(false); - if (rc != MDBX_RESULT_FALSE) - mdbx_error("%s(%s) failed: errcode %u", mdbx_func_, - "?-E(middle) >> S-E(locked)", rc); - - /* 8) now on S-E (locked) or still on ?-E (middle), - * transite to S-? (used) or ?-? (free) */ - if (!funlock(lfd, LCK_UPPER)) - mdbx_panic("%s(%s) failed: errcode %u", mdbx_func_, - "X-E(locked/middle) >> X-?(used/free)", GetLastError()); - - /* 9) now on S-? (used, DONE) or ?-? (free, FAILURE) */ - return rc; -} - -int mdbx_lck_seize(MDBX_env *env) { - int rc; - - assert(env->me_fd != INVALID_HANDLE_VALUE); - if (env->me_lfd == INVALID_HANDLE_VALUE) { - /* LY: without-lck mode (e.g. on read-only filesystem) */ - mdbx_jitter4testing(false); - if (!flock(env->me_fd, LCK_SHARED | LCK_DONTWAIT, LCK_WHOLE)) { - rc = GetLastError(); - mdbx_error("%s(%s) failed: errcode %u", mdbx_func_, "without-lck", rc); - return rc; - } - return MDBX_RESULT_FALSE; - } - - rc = internal_seize_lck(env->me_lfd); - mdbx_jitter4testing(false); - if (rc == MDBX_RESULT_TRUE && (env->me_flags & MDBX_RDONLY) == 0) { - /* Check that another process don't operates in without-lck mode. - * Doing such check by exclusive locking the body-part of db. Should be - * noted: - * - we need an exclusive lock for do so; - * - we can't lock meta-pages, otherwise other process could get an error - * while opening db in valid (non-conflict) mode. */ - if (!flock(env->me_fd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_BODY)) { - rc = GetLastError(); - mdbx_error("%s(%s) failed: errcode %u", mdbx_func_, - "lock-against-without-lck", rc); - mdbx_jitter4testing(false); - mdbx_lck_destroy(env); - } else { - mdbx_jitter4testing(false); - if (!funlock(env->me_fd, LCK_BODY)) - mdbx_panic("%s(%s) failed: errcode %u", mdbx_func_, - "unlock-against-without-lck", GetLastError()); - } - } - - return rc; -} - -int mdbx_lck_downgrade(MDBX_env *env, bool complete) { - /* Transite from exclusive state (E-?) to used (S-?) */ - assert(env->me_fd != INVALID_HANDLE_VALUE); - assert(env->me_lfd != INVALID_HANDLE_VALUE); - - /* 1) must be at E-E (exclusive-write) */ - if (!complete) { - /* transite from E-E to E_? (exclusive-read) */ - if (!funlock(env->me_lfd, LCK_UPPER)) - mdbx_panic("%s(%s) failed: errcode %u", mdbx_func_, - "E-E(exclusive-write) >> E-?(exclusive-read)", GetLastError()); - return MDBX_SUCCESS /* 2) now at E-? (exclusive-read), done */; - } - - /* 3) now at E-E (exclusive-write), transite to ?_E (middle) */ - if (!funlock(env->me_lfd, LCK_LOWER)) - mdbx_panic("%s(%s) failed: errcode %u", mdbx_func_, - "E-E(exclusive-write) >> ?-E(middle)", GetLastError()); - - /* 4) now at ?-E (middle), transite to S-E (locked) */ - if (!flock(env->me_lfd, LCK_SHARED | LCK_DONTWAIT, LCK_LOWER)) { - int rc = GetLastError() /* 5) something went wrong, give up */; - mdbx_error("%s(%s) failed: errcode %u", mdbx_func_, - "?-E(middle) >> S-E(locked)", rc); - return rc; - } - - /* 6) got S-E (locked), continue transition to S-? (used) */ - if (!funlock(env->me_lfd, LCK_UPPER)) - mdbx_panic("%s(%s) failed: errcode %u", mdbx_func_, - "S-E(locked) >> S-?(used)", GetLastError()); - - return MDBX_SUCCESS /* 7) now at S-? (used), done */; -} - -int mdbx_lck_upgrade(MDBX_env *env) { - /* Transite from locked state (S-E) to exclusive-write (E-E) */ - assert(env->me_fd != INVALID_HANDLE_VALUE); - assert(env->me_lfd != INVALID_HANDLE_VALUE); - - /* 1) must be at S-E (locked), transite to ?_E (middle) */ - if (!funlock(env->me_lfd, LCK_LOWER)) - mdbx_panic("%s(%s) failed: errcode %u", mdbx_func_, - "S-E(locked) >> ?-E(middle)", GetLastError()); - - /* 3) now on ?-E (middle), try E-E (exclusive-write) */ - mdbx_jitter4testing(false); - if (flock(env->me_lfd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_LOWER)) - return MDBX_RESULT_TRUE; /* 4) got E-E (exclusive-write), done */ - - /* 5) still on ?-E (middle) */ - int rc = GetLastError(); - mdbx_jitter4testing(false); - if (rc != ERROR_SHARING_VIOLATION && rc != ERROR_LOCK_VIOLATION) { - /* 6) something went wrong, report but continue */ - mdbx_error("%s(%s) failed: errcode %u", mdbx_func_, - "?-E(middle) >> E-E(exclusive-write)", rc); - } - - /* 7) still on ?-E (middle), try restore S-E (locked) */ - mdbx_jitter4testing(false); - rc = flock(env->me_lfd, LCK_SHARED | LCK_DONTWAIT, LCK_LOWER) - ? MDBX_RESULT_FALSE - : GetLastError(); - - mdbx_jitter4testing(false); - if (rc != MDBX_RESULT_FALSE) { - mdbx_fatal("%s(%s) failed: errcode %u", mdbx_func_, - "?-E(middle) >> S-E(locked)", rc); - return rc; - } - - /* 8) now on S-E (locked) */ - return MDBX_RESULT_FALSE; -} - -void mdbx_lck_destroy(MDBX_env *env) { - int rc; - - if (env->me_lfd != INVALID_HANDLE_VALUE) { - /* double `unlock` for robustly remove overlapped shared/exclusive locks */ - while (funlock(env->me_lfd, LCK_LOWER)) - ; - rc = GetLastError(); - assert(rc == ERROR_NOT_LOCKED); - (void)rc; - SetLastError(ERROR_SUCCESS); - - while (funlock(env->me_lfd, LCK_UPPER)) - ; - rc = GetLastError(); - assert(rc == ERROR_NOT_LOCKED); - (void)rc; - SetLastError(ERROR_SUCCESS); - } - - if (env->me_fd != INVALID_HANDLE_VALUE) { - /* explicitly unlock to avoid latency for other processes (windows kernel - * releases such locks via deferred queues) */ - while (funlock(env->me_fd, LCK_BODY)) - ; - rc = GetLastError(); - assert(rc == ERROR_NOT_LOCKED); - (void)rc; - SetLastError(ERROR_SUCCESS); - - while (funlock(env->me_fd, LCK_META)) - ; - rc = GetLastError(); - assert(rc == ERROR_NOT_LOCKED); - (void)rc; - SetLastError(ERROR_SUCCESS); - - while (funlock(env->me_fd, LCK_WHOLE)) - ; - rc = GetLastError(); - assert(rc == ERROR_NOT_LOCKED); - (void)rc; - SetLastError(ERROR_SUCCESS); - } -} - -/*----------------------------------------------------------------------------*/ -/* reader checking (by pid) */ - -int mdbx_rpid_set(MDBX_env *env) { - (void)env; - return MDBX_SUCCESS; -} - -int mdbx_rpid_clear(MDBX_env *env) { - (void)env; - return MDBX_SUCCESS; -} - -/* Checks reader by pid. - * - * Returns: - * MDBX_RESULT_TRUE, if pid is live (unable to acquire lock) - * MDBX_RESULT_FALSE, if pid is dead (lock acquired) - * or otherwise the errcode. */ -int mdbx_rpid_check(MDBX_env *env, mdbx_pid_t pid) { - (void)env; - HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid); - int rc; - if (hProcess) { - rc = WaitForSingleObject(hProcess, 0); - CloseHandle(hProcess); - } else { - rc = GetLastError(); - } - - switch (rc) { - case ERROR_INVALID_PARAMETER: - /* pid seem invalid */ - return MDBX_RESULT_FALSE; - case WAIT_OBJECT_0: - /* process just exited */ - return MDBX_RESULT_FALSE; - case WAIT_TIMEOUT: - /* pid running */ - return MDBX_RESULT_TRUE; - default: - /* failure */ - return rc; - } -} diff --git a/plugins/Dbx_mdb/src/mdbx/mdbx.c b/plugins/Dbx_mdb/src/mdbx/mdbx.c deleted file mode 100644 index 6e4182cfb2..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/mdbx.c +++ /dev/null @@ -1,11611 +0,0 @@ -/* - * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru> - * and other libmdbx authors: please see AUTHORS file. - * All rights reserved. - * - * This code is derived from "LMDB engine" written by - * Howard Chu (Symas Corporation), which itself derived from btree.c - * written by Martin Hedenfalk. - * - * --- - * - * Portions Copyright 2011-2015 Howard Chu, Symas Corp. 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>. - * - * --- - * - * Portions Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include "./bits.h" - -/*----------------------------------------------------------------------------*/ -/* rthc (tls keys and destructors) */ - -typedef struct rthc_entry_t { - MDBX_reader *begin; - MDBX_reader *end; - mdbx_thread_key_t key; -} rthc_entry_t; - -#if MDBX_DEBUG -#define RTHC_INITIAL_LIMIT 1 -#else -#define RTHC_INITIAL_LIMIT 16 -#endif - -static unsigned rthc_count; -static unsigned rthc_limit = RTHC_INITIAL_LIMIT; -static rthc_entry_t rthc_table_static[RTHC_INITIAL_LIMIT]; -static rthc_entry_t *rthc_table = rthc_table_static; - -__cold void mdbx_rthc_dtor(void *ptr) { - MDBX_reader *rthc = (MDBX_reader *)ptr; - - mdbx_rthc_lock(); - const mdbx_pid_t self_pid = mdbx_getpid(); - for (unsigned i = 0; i < rthc_count; ++i) { - if (rthc >= rthc_table[i].begin && rthc < rthc_table[i].end) { - if (rthc->mr_pid == self_pid) { - rthc->mr_pid = 0; - mdbx_coherent_barrier(); - } - break; - } - } - mdbx_rthc_unlock(); -} - -__cold void mdbx_rthc_cleanup(void) { - mdbx_rthc_lock(); - const mdbx_pid_t self_pid = mdbx_getpid(); - for (unsigned i = 0; i < rthc_count; ++i) { - mdbx_thread_key_t key = rthc_table[i].key; - MDBX_reader *rthc = mdbx_thread_rthc_get(key); - if (rthc) { - mdbx_thread_rthc_set(key, NULL); - if (rthc->mr_pid == self_pid) { - rthc->mr_pid = 0; - mdbx_coherent_barrier(); - } - } - } - mdbx_rthc_unlock(); -} - -__cold int mdbx_rthc_alloc(mdbx_thread_key_t *key, MDBX_reader *begin, - MDBX_reader *end) { -#ifndef NDEBUG - *key = (mdbx_thread_key_t)0xBADBADBAD; -#endif /* NDEBUG */ - int rc = mdbx_thread_key_create(key); - if (rc != MDBX_SUCCESS) - return rc; - - mdbx_rthc_lock(); - if (rthc_count == rthc_limit) { - rthc_entry_t *new_table = - realloc((rthc_table == rthc_table_static) ? NULL : rthc_table, - sizeof(rthc_entry_t) * rthc_limit * 2); - if (new_table == NULL) { - rc = MDBX_ENOMEM; - goto bailout; - } - if (rthc_table == rthc_table_static) - memcpy(new_table, rthc_table_static, sizeof(rthc_table_static)); - rthc_table = new_table; - rthc_limit *= 2; - } - - rthc_table[rthc_count].key = *key; - rthc_table[rthc_count].begin = begin; - rthc_table[rthc_count].end = end; - ++rthc_count; - mdbx_rthc_unlock(); - return MDBX_SUCCESS; - -bailout: - mdbx_thread_key_delete(*key); - mdbx_rthc_unlock(); - return rc; -} - -__cold void mdbx_rthc_remove(mdbx_thread_key_t key) { - mdbx_rthc_lock(); - mdbx_thread_key_delete(key); - - for (unsigned i = 0; i < rthc_count; ++i) { - if (key == rthc_table[i].key) { - const mdbx_pid_t self_pid = mdbx_getpid(); - for (MDBX_reader *rthc = rthc_table[i].begin; rthc < rthc_table[i].end; - ++rthc) - if (rthc->mr_pid == self_pid) - rthc->mr_pid = 0; - mdbx_coherent_barrier(); - if (--rthc_count > 0) - rthc_table[i] = rthc_table[rthc_count]; - else if (rthc_table != rthc_table_static) { - free(rthc_table); - rthc_table = rthc_table_static; - rthc_limit = RTHC_INITIAL_LIMIT; - } - break; - } - } - - mdbx_rthc_unlock(); -} - -/*----------------------------------------------------------------------------*/ - -/* Allocate an PNL. - * Allocates memory for an PNL of the given size. - * Returns PNL on success, NULL on failure. */ -static MDBX_PNL mdbx_pnl_alloc(size_t size) { - MDBX_PNL pl = malloc((size + 2) * sizeof(pgno_t)); - if (likely(pl)) { - *pl++ = (pgno_t)size; - *pl = 0; - } - return pl; -} - -static MDBX_TXL mdbx_txl_alloc(void) { - const size_t malloc_overhead = sizeof(void *) * 2; - const size_t bytes = mdbx_roundup2(malloc_overhead + sizeof(txnid_t) * 61, - MDBX_CACHELINE_SIZE) - - malloc_overhead; - MDBX_TXL ptr = malloc(bytes); - if (likely(ptr)) { - *ptr++ = bytes / sizeof(txnid_t) - 2; - *ptr = 0; - } - return ptr; -} - -/* Free an PNL. - * [in] pl The PNL to free. */ -static void mdbx_pnl_free(MDBX_PNL pl) { - if (likely(pl)) - free(pl - 1); -} - -static void mdbx_txl_free(MDBX_TXL list) { - if (likely(list)) - free(list - 1); -} - -/* Append ID to PNL. The PNL must be big enough. */ -static __inline void mdbx_pnl_xappend(MDBX_PNL pl, pgno_t id) { - assert(pl[0] + (size_t)1 < MDBX_PNL_ALLOCLEN(pl)); - pl[pl[0] += 1] = id; -} - -static bool mdbx_pnl_check(MDBX_PNL pl) { - if (pl) { - for (const pgno_t *ptr = pl + pl[0]; --ptr > pl;) { - assert(MDBX_PNL_ORDERED(ptr[0], ptr[1])); - assert(ptr[0] >= NUM_METAS); - if (unlikely(MDBX_PNL_DISORDERED(ptr[0], ptr[1]) || ptr[0] < NUM_METAS)) - return false; - } - } - return true; -} - -/* Sort an PNL. - * [in,out] pnl The PNL to sort. */ -static void __hot mdbx_pnl_sort(MDBX_PNL pnl) { - /* Max possible depth of int-indexed tree * 2 items/level */ - int istack[sizeof(int) * CHAR_BIT * 2]; - int i, j, k, l, ir, jstack; - pgno_t a; - -/* Quicksort + Insertion sort for small arrays */ -#define PNL_SMALL 8 -#define PNL_SWAP(a, b) \ - do { \ - pgno_t tmp_pgno = (a); \ - (a) = (b); \ - (b) = tmp_pgno; \ - } while (0) - - ir = (int)pnl[0]; - l = 1; - jstack = 0; - while (1) { - if (ir - l < PNL_SMALL) { /* Insertion sort */ - for (j = l + 1; j <= ir; j++) { - a = pnl[j]; - for (i = j - 1; i >= 1; i--) { - if (MDBX_PNL_DISORDERED(a, pnl[i])) - break; - pnl[i + 1] = pnl[i]; - } - pnl[i + 1] = a; - } - if (jstack == 0) - break; - ir = istack[jstack--]; - l = istack[jstack--]; - } else { - k = (l + ir) >> 1; /* Choose median of left, center, right */ - PNL_SWAP(pnl[k], pnl[l + 1]); - if (MDBX_PNL_ORDERED(pnl[ir], pnl[l])) - PNL_SWAP(pnl[l], pnl[ir]); - - if (MDBX_PNL_ORDERED(pnl[ir], pnl[l + 1])) - PNL_SWAP(pnl[l + 1], pnl[ir]); - - if (MDBX_PNL_ORDERED(pnl[l + 1], pnl[l])) - PNL_SWAP(pnl[l], pnl[l + 1]); - - i = l + 1; - j = ir; - a = pnl[l + 1]; - while (1) { - do - i++; - while (MDBX_PNL_ORDERED(pnl[i], a)); - do - j--; - while (MDBX_PNL_ORDERED(a, pnl[j])); - if (j < i) - break; - PNL_SWAP(pnl[i], pnl[j]); - } - pnl[l + 1] = pnl[j]; - pnl[j] = a; - jstack += 2; - if (ir - i + 1 >= j - l) { - istack[jstack] = ir; - istack[jstack - 1] = i; - ir = j - 1; - } else { - istack[jstack] = j - 1; - istack[jstack - 1] = l; - l = i; - } - } - } -#undef PNL_SMALL -#undef PNL_SWAP - assert(mdbx_pnl_check(pnl)); -} - -/* Search for an ID in an PNL. - * [in] pl The PNL to search. - * [in] id The ID to search for. - * Returns The index of the first ID greater than or equal to id. */ -static unsigned __hot mdbx_pnl_search(MDBX_PNL pnl, pgno_t id) { - assert(mdbx_pnl_check(pnl)); - - /* binary search of id in pl - * if found, returns position of id - * if not found, returns first position greater than id */ - unsigned base = 0; - unsigned cursor = 1; - int val = 0; - unsigned n = pnl[0]; - - while (n > 0) { - unsigned pivot = n >> 1; - cursor = base + pivot + 1; - val = MDBX_PNL_ASCENDING ? mdbx_cmp2int(pnl[cursor], id) - : mdbx_cmp2int(id, pnl[cursor]); - - if (val < 0) { - n = pivot; - } else if (val > 0) { - base = cursor; - n -= pivot + 1; - } else { - return cursor; - } - } - - if (val > 0) - ++cursor; - - return cursor; -} - -/* Shrink an PNL. - * Return the PNL to the default size if it has grown larger. - * [in,out] ppl Address of the PNL to shrink. */ -static void mdbx_pnl_shrink(MDBX_PNL *ppl) { - MDBX_PNL pl = *ppl - 1; - if (unlikely(*pl > MDBX_PNL_UM_MAX)) { - /* shrink to MDBX_PNL_UM_MAX */ - pl = realloc(pl, (MDBX_PNL_UM_MAX + 2) * sizeof(pgno_t)); - if (likely(pl)) { - *pl++ = MDBX_PNL_UM_MAX; - *ppl = pl; - } - } -} - -/* Grow an PNL. - * Return the PNL to the size growed by given number. - * [in,out] ppl Address of the PNL to grow. */ -static int mdbx_pnl_grow(MDBX_PNL *ppl, size_t num) { - MDBX_PNL idn = *ppl - 1; - /* grow it */ - idn = realloc(idn, (*idn + num + 2) * sizeof(pgno_t)); - if (unlikely(!idn)) - return MDBX_ENOMEM; - *idn++ += (pgno_t)num; - *ppl = idn; - return 0; -} - -static int mdbx_txl_grow(MDBX_TXL *ptr, size_t num) { - MDBX_TXL list = *ptr - 1; - /* grow it */ - list = realloc(list, ((size_t)*list + num + 2) * sizeof(txnid_t)); - if (unlikely(!list)) - return MDBX_ENOMEM; - *list++ += num; - *ptr = list; - return 0; -} - -/* Make room for num additional elements in an PNL. - * [in,out] ppl Address of the PNL. - * [in] num Number of elements to make room for. - * Returns 0 on success, MDBX_ENOMEM on failure. */ -static int mdbx_pnl_need(MDBX_PNL *ppl, size_t num) { - MDBX_PNL pl = *ppl; - num += pl[0]; - if (unlikely(num > pl[-1])) { - num = (num + num / 4 + (256 + 2)) & -256; - pl = realloc(pl - 1, num * sizeof(pgno_t)); - if (unlikely(!pl)) - return MDBX_ENOMEM; - *pl++ = (pgno_t)num - 2; - *ppl = pl; - } - return 0; -} - -/* Append an ID onto an PNL. - * [in,out] ppl Address of the PNL to append to. - * [in] id The ID to append. - * Returns 0 on success, MDBX_ENOMEM if the PNL is too large. */ -static int mdbx_pnl_append(MDBX_PNL *ppl, pgno_t id) { - MDBX_PNL pl = *ppl; - /* Too big? */ - if (unlikely(pl[0] >= pl[-1])) { - if (mdbx_pnl_grow(ppl, MDBX_PNL_UM_MAX)) - return MDBX_ENOMEM; - pl = *ppl; - } - pl[0]++; - pl[pl[0]] = id; - return 0; -} - -static int mdbx_txl_append(MDBX_TXL *ptr, txnid_t id) { - MDBX_TXL list = *ptr; - /* Too big? */ - if (unlikely(list[0] >= list[-1])) { - if (mdbx_txl_grow(ptr, (size_t)list[0])) - return MDBX_ENOMEM; - list = *ptr; - } - list[0]++; - list[list[0]] = id; - return 0; -} - -/* Append an PNL onto an PNL. - * [in,out] ppl Address of the PNL to append to. - * [in] app The PNL to append. - * Returns 0 on success, MDBX_ENOMEM if the PNL is too large. */ -static int mdbx_pnl_append_list(MDBX_PNL *ppl, MDBX_PNL app) { - MDBX_PNL pnl = *ppl; - /* Too big? */ - if (unlikely(pnl[0] + app[0] >= pnl[-1])) { - if (mdbx_pnl_grow(ppl, app[0])) - return MDBX_ENOMEM; - pnl = *ppl; - } - memcpy(&pnl[pnl[0] + 1], &app[1], app[0] * sizeof(pgno_t)); - pnl[0] += app[0]; - return 0; -} - -static int mdbx_txl_append_list(MDBX_TXL *ptr, MDBX_TXL append) { - MDBX_TXL list = *ptr; - /* Too big? */ - if (unlikely(list[0] + append[0] >= list[-1])) { - if (mdbx_txl_grow(ptr, (size_t)append[0])) - return MDBX_ENOMEM; - list = *ptr; - } - memcpy(&list[list[0] + 1], &append[1], (size_t)append[0] * sizeof(txnid_t)); - list[0] += append[0]; - return 0; -} - -/* Append an ID range onto an PNL. - * [in,out] ppl Address of the PNL to append to. - * [in] id The lowest ID to append. - * [in] n Number of IDs to append. - * Returns 0 on success, MDBX_ENOMEM if the PNL is too large. */ -static int mdbx_pnl_append_range(MDBX_PNL *ppl, pgno_t id, size_t n) { - pgno_t *pnl = *ppl, len = pnl[0]; - /* Too big? */ - if (unlikely(len + n > pnl[-1])) { - if (mdbx_pnl_grow(ppl, n | MDBX_PNL_UM_MAX)) - return MDBX_ENOMEM; - pnl = *ppl; - } - pnl[0] = len + (pgno_t)n; - pnl += len; - while (n) - pnl[n--] = id++; - return 0; -} - -/* Merge an PNL onto an PNL. The destination PNL must be big enough. - * [in] pl The PNL to merge into. - * [in] merge The PNL to merge. */ -static void __hot mdbx_pnl_xmerge(MDBX_PNL pnl, MDBX_PNL merge) { - assert(mdbx_pnl_check(pnl)); - assert(mdbx_pnl_check(merge)); - pgno_t old_id, merge_id, i = merge[0], j = pnl[0], k = i + j, total = k; - pnl[0] = - MDBX_PNL_ASCENDING ? 0 : ~(pgno_t)0; /* delimiter for pl scan below */ - old_id = pnl[j]; - while (i) { - merge_id = merge[i--]; - for (; MDBX_PNL_ORDERED(merge_id, old_id); old_id = pnl[--j]) - pnl[k--] = old_id; - pnl[k--] = merge_id; - } - pnl[0] = total; - assert(mdbx_pnl_check(pnl)); -} - -/* Search for an ID in an ID2L. - * [in] pnl The ID2L to search. - * [in] id The ID to search for. - * Returns The index of the first ID2 whose mid member is greater than - * or equal to id. */ -static unsigned __hot mdbx_mid2l_search(MDBX_ID2L pnl, pgno_t id) { - /* binary search of id in pnl - * if found, returns position of id - * if not found, returns first position greater than id */ - unsigned base = 0; - unsigned cursor = 1; - int val = 0; - unsigned n = (unsigned)pnl[0].mid; - -#if MDBX_DEBUG - for (const MDBX_ID2 *ptr = pnl + pnl[0].mid; --ptr > pnl;) { - assert(ptr[0].mid < ptr[1].mid); - assert(ptr[0].mid >= NUM_METAS); - } -#endif - - while (n > 0) { - unsigned pivot = n >> 1; - cursor = base + pivot + 1; - val = mdbx_cmp2int(id, pnl[cursor].mid); - - if (val < 0) { - n = pivot; - } else if (val > 0) { - base = cursor; - n -= pivot + 1; - } else { - return cursor; - } - } - - if (val > 0) - ++cursor; - - return cursor; -} - -/* Insert an ID2 into a ID2L. - * [in,out] pnl The ID2L to insert into. - * [in] id The ID2 to insert. - * Returns 0 on success, -1 if the ID was already present in the ID2L. */ -static int mdbx_mid2l_insert(MDBX_ID2L pnl, MDBX_ID2 *id) { - unsigned x = mdbx_mid2l_search(pnl, id->mid); - if (unlikely(x < 1)) - return /* internal error */ -2; - - if (x <= pnl[0].mid && pnl[x].mid == id->mid) - return /* duplicate */ -1; - - if (unlikely(pnl[0].mid >= MDBX_PNL_UM_MAX)) - return /* too big */ -2; - - /* insert id */ - pnl[0].mid++; - for (unsigned i = (unsigned)pnl[0].mid; i > x; i--) - pnl[i] = pnl[i - 1]; - pnl[x] = *id; - return 0; -} - -/* Append an ID2 into a ID2L. - * [in,out] pnl The ID2L to append into. - * [in] id The ID2 to append. - * Returns 0 on success, -2 if the ID2L is too big. */ -static int mdbx_mid2l_append(MDBX_ID2L pnl, MDBX_ID2 *id) { -#if MDBX_DEBUG - for (unsigned i = pnl[0].mid; i > 0; --i) { - assert(pnl[i].mid != id->mid); - if (unlikely(pnl[i].mid == id->mid)) - return -1; - } -#endif - - /* Too big? */ - if (unlikely(pnl[0].mid >= MDBX_PNL_UM_MAX)) - return -2; - - pnl[0].mid++; - pnl[pnl[0].mid] = *id; - return 0; -} - -/*----------------------------------------------------------------------------*/ - -int mdbx_runtime_flags = MDBX_DBG_PRINT -#if MDBX_DEBUG - | MDBX_DBG_ASSERT -#endif -#if MDBX_DEBUG > 1 - | MDBX_DBG_TRACE -#endif -#if MDBX_DEBUG > 2 - | MDBX_DBG_AUDIT -#endif -#if MDBX_DEBUG > 3 - | MDBX_DBG_EXTRA -#endif - ; - -MDBX_debug_func *mdbx_debug_logger; - -static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp, - int flags); -static int mdbx_page_new(MDBX_cursor *mc, uint32_t flags, unsigned num, - MDBX_page **mp); -static int mdbx_page_touch(MDBX_cursor *mc); -static int mdbx_cursor_touch(MDBX_cursor *mc); - -#define MDBX_END_NAMES \ - { \ - "committed", "empty-commit", "abort", "reset", "reset-tmp", "fail-begin", \ - "fail-beginchild" \ - } -enum { - /* mdbx_txn_end operation number, for logging */ - MDBX_END_COMMITTED, - MDBX_END_EMPTY_COMMIT, - MDBX_END_ABORT, - MDBX_END_RESET, - MDBX_END_RESET_TMP, - MDBX_END_FAIL_BEGIN, - MDBX_END_FAIL_BEGINCHILD -}; -#define MDBX_END_OPMASK 0x0F /* mask for mdbx_txn_end() operation number */ -#define MDBX_END_UPDATE 0x10 /* update env state (DBIs) */ -#define MDBX_END_FREE 0x20 /* free txn unless it is MDBX_env.me_txn0 */ -#define MDBX_END_EOTDONE 0x40 /* txn's cursors already closed */ -#define MDBX_END_SLOT 0x80 /* release any reader slot if MDBX_NOTLS */ -static int mdbx_txn_end(MDBX_txn *txn, unsigned mode); - -static int mdbx_page_get(MDBX_cursor *mc, pgno_t pgno, MDBX_page **mp, - int *lvl); -static int mdbx_page_search_root(MDBX_cursor *mc, MDBX_val *key, int modify); - -#define MDBX_PS_MODIFY 1 -#define MDBX_PS_ROOTONLY 2 -#define MDBX_PS_FIRST 4 -#define MDBX_PS_LAST 8 -static int mdbx_page_search(MDBX_cursor *mc, MDBX_val *key, int flags); -static int mdbx_page_merge(MDBX_cursor *csrc, MDBX_cursor *cdst); - -#define MDBX_SPLIT_REPLACE MDBX_APPENDDUP /* newkey is not new */ -static int mdbx_page_split(MDBX_cursor *mc, MDBX_val *newkey, MDBX_val *newdata, - pgno_t newpgno, unsigned nflags); - -static int mdbx_read_header(MDBX_env *env, MDBX_meta *meta); -static int mdbx_sync_locked(MDBX_env *env, unsigned flags, - MDBX_meta *const pending); -static void mdbx_env_close0(MDBX_env *env); - -static MDBX_node *mdbx_node_search(MDBX_cursor *mc, MDBX_val *key, int *exactp); -static int mdbx_node_add(MDBX_cursor *mc, unsigned indx, MDBX_val *key, - MDBX_val *data, pgno_t pgno, unsigned flags); -static void mdbx_node_del(MDBX_cursor *mc, size_t ksize); -static void mdbx_node_shrink(MDBX_page *mp, unsigned indx); -static int mdbx_node_move(MDBX_cursor *csrc, MDBX_cursor *cdst, int fromleft); -static int mdbx_node_read(MDBX_cursor *mc, MDBX_node *leaf, MDBX_val *data); -static size_t mdbx_leaf_size(MDBX_env *env, MDBX_val *key, MDBX_val *data); -static size_t mdbx_branch_size(MDBX_env *env, MDBX_val *key); - -static int mdbx_rebalance(MDBX_cursor *mc); -static int mdbx_update_key(MDBX_cursor *mc, MDBX_val *key); - -static void mdbx_cursor_pop(MDBX_cursor *mc); -static int mdbx_cursor_push(MDBX_cursor *mc, MDBX_page *mp); - -static int mdbx_cursor_del0(MDBX_cursor *mc); -static int mdbx_del0(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data, - unsigned flags); -static int mdbx_cursor_sibling(MDBX_cursor *mc, int move_right); -static int mdbx_cursor_next(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - MDBX_cursor_op op); -static int mdbx_cursor_prev(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - MDBX_cursor_op op); -static int mdbx_cursor_set(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - MDBX_cursor_op op, int *exactp); -static int mdbx_cursor_first(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data); -static int mdbx_cursor_last(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data); - -static void mdbx_cursor_init(MDBX_cursor *mc, MDBX_txn *txn, MDBX_dbi dbi, - MDBX_xcursor *mx); -static void mdbx_xcursor_init0(MDBX_cursor *mc); -static void mdbx_xcursor_init1(MDBX_cursor *mc, MDBX_node *node); -static void mdbx_xcursor_init2(MDBX_cursor *mc, MDBX_xcursor *src_mx, - int force); - -static int mdbx_drop0(MDBX_cursor *mc, int subs); - -static MDBX_cmp_func mdbx_cmp_memn, mdbx_cmp_memnr, mdbx_cmp_int_ai, - mdbx_cmp_int_a2, mdbx_cmp_int_ua; - -static const char *__mdbx_strerr(int errnum) { - /* Table of descriptions for MDBX errors */ - static const char *const tbl[] = { - "MDBX_KEYEXIST: Key/data pair already exists", - "MDBX_NOTFOUND: No matching key/data pair found", - "MDBX_PAGE_NOTFOUND: Requested page not found", - "MDBX_CORRUPTED: Database is corrupted", - "MDBX_PANIC: Update of meta page failed or environment had fatal error", - "MDBX_VERSION_MISMATCH: DB version mismatch libmdbx", - "MDBX_INVALID: File is not an MDBX file", - "MDBX_MAP_FULL: Environment mapsize limit reached", - "MDBX_DBS_FULL: Too may DBI (maxdbs reached)", - "MDBX_READERS_FULL: Too many readers (maxreaders reached)", - NULL /* MDBX_TLS_FULL (-30789): unused in MDBX */, - "MDBX_TXN_FULL: Transaction has too many dirty pages - transaction too " - "big", - "MDBX_CURSOR_FULL: Internal error - cursor stack limit reached", - "MDBX_PAGE_FULL: Internal error - page has no more space", - "MDBX_MAP_RESIZED: Database contents grew beyond environment mapsize", - "MDBX_INCOMPATIBLE: Operation and DB incompatible, or DB flags changed", - "MDBX_BAD_RSLOT: Invalid reuse of reader locktable slot", - "MDBX_BAD_TXN: Transaction must abort, has a child, or is invalid", - "MDBX_BAD_VALSIZE: Unsupported size of key/DB name/data, or wrong " - "DUPFIXED size", - "MDBX_BAD_DBI: The specified DBI handle was closed/changed unexpectedly", - "MDBX_PROBLEM: Unexpected problem - txn should abort", - "MDBX_BUSY: Another write transation is started", - }; - - if (errnum >= MDBX_KEYEXIST && errnum <= MDBX_LAST_ERRCODE) { - int i = errnum - MDBX_KEYEXIST; - return tbl[i]; - } - - switch (errnum) { - case MDBX_SUCCESS: - return "MDBX_SUCCESS: Successful"; - case MDBX_EMULTIVAL: - return "MDBX_EMULTIVAL: Unable to update multi-value for the given key"; - case MDBX_EBADSIGN: - return "MDBX_EBADSIGN: Wrong signature of a runtime object(s)"; - case MDBX_WANNA_RECOVERY: - return "MDBX_WANNA_RECOVERY: Database should be recovered, but this could " - "NOT be done in a read-only mode"; - case MDBX_EKEYMISMATCH: - return "MDBX_EKEYMISMATCH: The given key value is mismatched to the " - "current cursor position"; - case MDBX_TOO_LARGE: - return "MDBX_TOO_LARGE: Database is too large for current system, " - "e.g. could NOT be mapped into RAM"; - case MDBX_THREAD_MISMATCH: - return "MDBX_THREAD_MISMATCH: A thread has attempted to use a not " - "owned object, e.g. a transaction that started by another thread"; - default: - return NULL; - } -} - -const char *__cold mdbx_strerror_r(int errnum, char *buf, size_t buflen) { - const char *msg = __mdbx_strerr(errnum); - if (!msg) { - if (!buflen || buflen > INT_MAX) - return NULL; -#ifdef _MSC_VER - size_t size = FormatMessageA( - FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, - errnum, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (DWORD)buflen, - NULL); - return size ? buf : NULL; -#elif defined(_GNU_SOURCE) - /* GNU-specific */ - msg = strerror_r(errnum, buf, buflen); -#elif (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) - /* XSI-compliant */ - int rc = strerror_r(errnum, buf, buflen); - if (rc) { - rc = snprintf(buf, buflen, "error %d", errnum); - assert(rc > 0); - } - return buf; -#else - strncpy(buf, strerror(errnum), buflen); - buf[buflen - 1] = '\0'; - return buf; -#endif - } - return msg; -} - -const char *__cold mdbx_strerror(int errnum) { - const char *msg = __mdbx_strerr(errnum); - if (!msg) { -#ifdef _MSC_VER - static __thread char buffer[1024]; - size_t size = FormatMessageA( - FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, - errnum, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buffer, - sizeof(buffer), NULL); - if (size) - msg = buffer; -#else - msg = strerror(errnum); -#endif - } - return msg; -} - -static txnid_t mdbx_oomkick(MDBX_env *env, const txnid_t laggard); - -void __cold mdbx_debug_log(int type, const char *function, int line, - const char *fmt, ...) { - va_list args; - - va_start(args, fmt); - if (mdbx_debug_logger) - mdbx_debug_logger(type, function, line, fmt, args); - else { - if (function && line > 0) - fprintf(stderr, "%s:%d ", function, line); - else if (function) - fprintf(stderr, "%s: ", function); - else if (line > 0) - fprintf(stderr, "%d: ", line); - vfprintf(stderr, fmt, args); - } - va_end(args); -} - -/* Dump a key in ascii or hexadecimal. */ -char *mdbx_dkey(const MDBX_val *key, char *const buf, const size_t bufsize) { - if (!key) - return "<null>"; - if (!buf || bufsize < 4) - return nullptr; - if (!key->iov_len) - return "<empty>"; - - const uint8_t *const data = key->iov_base; - bool is_ascii = true; - unsigned i; - for (i = 0; is_ascii && i < key->iov_len; i++) - if (data[i] < ' ' || data[i] > 127) - is_ascii = false; - - if (is_ascii) { - int len = - snprintf(buf, bufsize, "%.*s", - (key->iov_len > INT_MAX) ? INT_MAX : (int)key->iov_len, data); - assert(len > 0 && (unsigned)len < bufsize); - (void)len; - } else { - char *const detent = buf + bufsize - 2; - char *ptr = buf; - *ptr++ = '<'; - for (i = 0; i < key->iov_len; i++) { - const ptrdiff_t left = detent - ptr; - assert(left > 0); - int len = snprintf(ptr, left, "%02x", data[i]); - if (len < 0 || len >= left) - break; - ptr += len; - } - if (ptr < detent) { - ptr[0] = '>'; - ptr[1] = '\0'; - } - } - return buf; -} - -#if 0 /* LY: debug stuff */ -static const char *mdbx_leafnode_type(MDBX_node *n) { - static char *const tp[2][2] = {{"", ": DB"}, {": sub-page", ": sub-DB"}}; - return F_ISSET(n->mn_flags, F_BIGDATA) ? ": overflow page" - : tp[F_ISSET(n->mn_flags, F_DUPDATA)] - [F_ISSET(n->mn_flags, F_SUBDATA)]; -} - -/* Display all the keys in the page. */ -static void mdbx_page_list(MDBX_page *mp) { - pgno_t pgno = mp->mp_pgno; - const char *type, *state = (mp->mp_flags & P_DIRTY) ? ", dirty" : ""; - MDBX_node *node; - unsigned i, nkeys, nsize, total = 0; - MDBX_val key; - DKBUF; - - switch (mp->mp_flags & - (P_BRANCH | P_LEAF | P_LEAF2 | P_META | P_OVERFLOW | P_SUBP)) { - case P_BRANCH: - type = "Branch page"; - break; - case P_LEAF: - type = "Leaf page"; - break; - case P_LEAF | P_SUBP: - type = "Sub-page"; - break; - case P_LEAF | P_LEAF2: - type = "LEAF2 page"; - break; - case P_LEAF | P_LEAF2 | P_SUBP: - type = "LEAF2 sub-page"; - break; - case P_OVERFLOW: - mdbx_print("Overflow page %" PRIu64 " pages %u%s\n", pgno, mp->mp_pages, - state); - return; - case P_META: - mdbx_print("Meta-page %" PRIu64 " txnid %" PRIu64 "\n", pgno, - ((MDBX_meta *)PAGEDATA(mp))->mm_txnid); - return; - default: - mdbx_print("Bad page %" PRIu64 " flags 0x%X\n", pgno, mp->mp_flags); - return; - } - - nkeys = NUMKEYS(mp); - mdbx_print("%s %" PRIu64 " numkeys %u%s\n", type, pgno, nkeys, state); - - for (i = 0; i < nkeys; i++) { - if (IS_LEAF2(mp)) { /* LEAF2 pages have no mp_ptrs[] or node headers */ - key.iov_len = nsize = mp->mp_leaf2_ksize; - key.iov_base = LEAF2KEY(mp, i, nsize); - total += nsize; - mdbx_print("key %u: nsize %u, %s\n", i, nsize, DKEY(&key)); - continue; - } - node = NODEPTR(mp, i); - key.iov_len = node->mn_ksize; - key.iov_base = node->mn_data; - nsize = NODESIZE + key.iov_len; - if (IS_BRANCH(mp)) { - mdbx_print("key %u: page %" PRIu64 ", %s\n", i, NODEPGNO(node), - DKEY(&key)); - total += nsize; - } else { - if (F_ISSET(node->mn_flags, F_BIGDATA)) - nsize += sizeof(pgno_t); - else - nsize += NODEDSZ(node); - total += nsize; - nsize += sizeof(indx_t); - mdbx_print("key %u: nsize %u, %s%s\n", i, nsize, DKEY(&key), - mdbx_leafnode_type(node)); - } - total = EVEN(total); - } - mdbx_print("Total: header %u + contents %u + unused %u\n", - IS_LEAF2(mp) ? PAGEHDRSZ : PAGEHDRSZ + mp->mp_lower, total, - SIZELEFT(mp)); -} - -static void mdbx_cursor_chk(MDBX_cursor *mc) { - unsigned i; - MDBX_node *node; - MDBX_page *mp; - - if (!mc->mc_snum || !(mc->mc_flags & C_INITIALIZED)) - return; - for (i = 0; i < mc->mc_top; i++) { - mp = mc->mc_pg[i]; - node = NODEPTR(mp, mc->mc_ki[i]); - if (unlikely(NODEPGNO(node) != mc->mc_pg[i + 1]->mp_pgno)) - mdbx_print("oops!\n"); - } - if (unlikely(mc->mc_ki[i] >= NUMKEYS(mc->mc_pg[i]))) - mdbx_print("ack!\n"); - if (XCURSOR_INITED(mc)) { - node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - if (((node->mn_flags & (F_DUPDATA | F_SUBDATA)) == F_DUPDATA) && - mc->mc_xcursor->mx_cursor.mc_pg[0] != NODEDATA(node)) { - mdbx_print("blah!\n"); - } - } -} -#endif /* 0 */ - -/* Count all the pages in each DB and in the freelist and make sure - * it matches the actual number of pages being used. - * All named DBs must be open for a correct count. */ -static void mdbx_audit(MDBX_txn *txn) { - MDBX_cursor mc; - MDBX_val key, data; - int rc; - - pgno_t freecount = 0; - mdbx_cursor_init(&mc, txn, FREE_DBI, NULL); - while ((rc = mdbx_cursor_get(&mc, &key, &data, MDBX_NEXT)) == 0) - freecount += *(pgno_t *)data.iov_base; - mdbx_tassert(txn, rc == MDBX_NOTFOUND); - - pgno_t count = 0; - for (MDBX_dbi i = 0; i < txn->mt_numdbs; i++) { - MDBX_xcursor mx; - if (!(txn->mt_dbflags[i] & DB_VALID)) - continue; - mdbx_cursor_init(&mc, txn, i, &mx); - if (txn->mt_dbs[i].md_root == P_INVALID) - continue; - count += txn->mt_dbs[i].md_branch_pages + txn->mt_dbs[i].md_leaf_pages + - txn->mt_dbs[i].md_overflow_pages; - if (txn->mt_dbs[i].md_flags & MDBX_DUPSORT) { - rc = mdbx_page_search(&mc, NULL, MDBX_PS_FIRST); - for (; rc == MDBX_SUCCESS; rc = mdbx_cursor_sibling(&mc, 1)) { - MDBX_page *mp = mc.mc_pg[mc.mc_top]; - for (unsigned j = 0; j < NUMKEYS(mp); j++) { - MDBX_node *leaf = NODEPTR(mp, j); - if (leaf->mn_flags & F_SUBDATA) { - MDBX_db db; - memcpy(&db, NODEDATA(leaf), sizeof(db)); - count += - db.md_branch_pages + db.md_leaf_pages + db.md_overflow_pages; - } - } - } - mdbx_tassert(txn, rc == MDBX_NOTFOUND); - } - } - if (freecount + count + NUM_METAS != txn->mt_next_pgno) { - mdbx_print("audit: %" PRIaTXN " freecount: %" PRIaPGNO " count: %" PRIaPGNO - " total: %" PRIaPGNO " next_pgno: %" PRIaPGNO "\n", - txn->mt_txnid, freecount, count + NUM_METAS, - freecount + count + NUM_METAS, txn->mt_next_pgno); - } -} - -int mdbx_cmp(MDBX_txn *txn, MDBX_dbi dbi, const MDBX_val *a, - const MDBX_val *b) { - mdbx_assert(NULL, txn->mt_signature == MDBX_MT_SIGNATURE); - return txn->mt_dbxs[dbi].md_cmp(a, b); -} - -int mdbx_dcmp(MDBX_txn *txn, MDBX_dbi dbi, const MDBX_val *a, - const MDBX_val *b) { - mdbx_assert(NULL, txn->mt_signature == MDBX_MT_SIGNATURE); - return txn->mt_dbxs[dbi].md_dcmp(a, b); -} - -/* Allocate memory for a page. - * Re-use old malloc'd pages first for singletons, otherwise just malloc. - * Set MDBX_TXN_ERROR on failure. */ -static MDBX_page *mdbx_page_malloc(MDBX_txn *txn, unsigned num) { - MDBX_env *env = txn->mt_env; - MDBX_page *np = env->me_dpages; - size_t size = env->me_psize; - if (likely(num == 1 && np)) { - ASAN_UNPOISON_MEMORY_REGION(np, size); - VALGRIND_MEMPOOL_ALLOC(env, np, size); - VALGRIND_MAKE_MEM_DEFINED(&np->mp_next, sizeof(np->mp_next)); - env->me_dpages = np->mp_next; - } else { - size = pgno2bytes(env, num); - np = malloc(size); - if (unlikely(!np)) { - txn->mt_flags |= MDBX_TXN_ERROR; - return np; - } - VALGRIND_MEMPOOL_ALLOC(env, np, size); - } - - if ((env->me_flags & MDBX_NOMEMINIT) == 0) { - /* For a single page alloc, we init everything after the page header. - * For multi-page, we init the final page; if the caller needed that - * many pages they will be filling in at least up to the last page. */ - size_t skip = PAGEHDRSZ; - if (num > 1) - skip += pgno2bytes(env, num - 1); - memset((char *)np + skip, 0, size - skip); - } -#if MDBX_DEBUG - np->mp_pgno = 0; -#endif - VALGRIND_MAKE_MEM_UNDEFINED(np, size); - np->mp_flags = 0; - np->mp_pages = num; - return np; -} - -/* Free a single page. - * Saves single pages to a list, for future reuse. - * (This is not used for multi-page overflow pages.) */ -static __inline void mdbx_page_free(MDBX_env *env, MDBX_page *mp) { -#if MDBX_DEBUG - mp->mp_pgno = MAX_PAGENO; -#endif - mp->mp_next = env->me_dpages; - VALGRIND_MEMPOOL_FREE(env, mp); - env->me_dpages = mp; -} - -/* Free a dirty page */ -static void mdbx_dpage_free(MDBX_env *env, MDBX_page *dp) { - if (!IS_OVERFLOW(dp) || dp->mp_pages == 1) { - mdbx_page_free(env, dp); - } else { - /* large pages just get freed directly */ - VALGRIND_MEMPOOL_FREE(env, dp); - free(dp); - } -} - -/* Return all dirty pages to dpage list */ -static void mdbx_dlist_free(MDBX_txn *txn) { - MDBX_env *env = txn->mt_env; - MDBX_ID2L dl = txn->mt_rw_dirtylist; - size_t i, n = dl[0].mid; - - for (i = 1; i <= n; i++) - mdbx_dpage_free(env, dl[i].mptr); - - dl[0].mid = 0; -} - -static size_t bytes_align2os_bytes(const MDBX_env *env, size_t bytes) { - return mdbx_roundup2(mdbx_roundup2(bytes, env->me_psize), env->me_os_psize); -} - -static void __cold mdbx_kill_page(MDBX_env *env, pgno_t pgno) { - const size_t offs = pgno2bytes(env, pgno); - const size_t shift = offsetof(MDBX_page, mp_pages); - - if (env->me_flags & MDBX_WRITEMAP) { - MDBX_page *mp = (MDBX_page *)(env->me_map + offs); - memset(&mp->mp_pages, 0x6F /* 'o', 111 */, env->me_psize - shift); - VALGRIND_MAKE_MEM_NOACCESS(&mp->mp_pages, env->me_psize - shift); - ASAN_POISON_MEMORY_REGION(&mp->mp_pages, env->me_psize - shift); - } else { - intptr_t len = env->me_psize - shift; - void *buf = alloca(len); - memset(buf, 0x6F /* 'o', 111 */, len); - (void)mdbx_pwrite(env->me_fd, buf, len, offs + shift); - } -} - -/* Loosen or free a single page. - * - * Saves single pages to a list for future reuse - * in this same txn. It has been pulled from the freeDB - * and already resides on the dirty list, but has been - * deleted. Use these pages first before pulling again - * from the freeDB. - * - * If the page wasn't dirtied in this txn, just add it - * to this txn's free list. */ -static int mdbx_page_loose(MDBX_cursor *mc, MDBX_page *mp) { - int loose = 0; - const pgno_t pgno = mp->mp_pgno; - MDBX_txn *txn = mc->mc_txn; - - if ((mp->mp_flags & P_DIRTY) && mc->mc_dbi != FREE_DBI) { - if (txn->mt_parent) { - mdbx_cassert(mc, (txn->mt_env->me_flags & MDBX_WRITEMAP) == 0); - MDBX_ID2 *dl = txn->mt_rw_dirtylist; - /* If txn has a parent, - * make sure the page is in our dirty list. */ - if (dl[0].mid) { - unsigned x = mdbx_mid2l_search(dl, pgno); - if (x <= dl[0].mid && dl[x].mid == pgno) { - if (unlikely(mp != dl[x].mptr)) { /* bad cursor? */ - mdbx_error("wrong page 0x%p #%" PRIaPGNO - " in the dirtylist[%d], expecting %p", - dl[x].mptr, pgno, x, mp); - mc->mc_flags &= ~(C_INITIALIZED | C_EOF); - txn->mt_flags |= MDBX_TXN_ERROR; - return MDBX_PROBLEM; - } - /* ok, it's ours */ - loose = 1; - } - } - } else { - /* no parent txn, so it's just ours */ - loose = 1; - } - } - if (loose) { - mdbx_debug("loosen db %d page %" PRIaPGNO, DDBI(mc), mp->mp_pgno); - MDBX_page **link = &NEXT_LOOSE_PAGE(mp); - if (unlikely(txn->mt_env->me_flags & MDBX_PAGEPERTURB)) { - mdbx_kill_page(txn->mt_env, pgno); - VALGRIND_MAKE_MEM_UNDEFINED(link, sizeof(MDBX_page *)); - ASAN_UNPOISON_MEMORY_REGION(link, sizeof(MDBX_page *)); - } - *link = txn->mt_loose_pages; - txn->mt_loose_pages = mp; - txn->mt_loose_count++; - mp->mp_flags |= P_LOOSE; - } else { - int rc = mdbx_pnl_append(&txn->mt_befree_pages, pgno); - if (unlikely(rc)) - return rc; - } - - return MDBX_SUCCESS; -} - -/* Set or clear P_KEEP in dirty, non-overflow, non-sub pages watched by txn. - * - * [in] mc A cursor handle for the current operation. - * [in] pflags Flags of the pages to update: - * - P_DIRTY to set P_KEEP, - * - P_DIRTY|P_KEEP to clear it. - * [in] all No shortcuts. Needed except after a full mdbx_page_flush(). - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_pages_xkeep(MDBX_cursor *mc, unsigned pflags, bool all) { - const unsigned Mask = P_SUBP | P_DIRTY | P_LOOSE | P_KEEP; - MDBX_txn *txn = mc->mc_txn; - MDBX_cursor *m3, *m0 = mc; - MDBX_xcursor *mx; - MDBX_page *dp, *mp; - MDBX_node *leaf; - unsigned i, j; - int rc = MDBX_SUCCESS, level; - - /* Mark pages seen by cursors: First m0, then tracked cursors */ - for (i = txn->mt_numdbs;;) { - if (mc->mc_flags & C_INITIALIZED) { - for (m3 = mc;; m3 = &mx->mx_cursor) { - mp = NULL; - for (j = 0; j < m3->mc_snum; j++) { - mp = m3->mc_pg[j]; - if ((mp->mp_flags & Mask) == pflags) - mp->mp_flags ^= P_KEEP; - } - mx = m3->mc_xcursor; - /* Proceed to mx if it is at a sub-database */ - if (!(mx && (mx->mx_cursor.mc_flags & C_INITIALIZED))) - break; - if (!(mp && (mp->mp_flags & P_LEAF))) - break; - leaf = NODEPTR(mp, m3->mc_ki[j - 1]); - if (!(leaf->mn_flags & F_SUBDATA)) - break; - } - } - mc = mc->mc_next; - for (; !mc || mc == m0; mc = txn->mt_cursors[--i]) - if (i == 0) - goto mark_done; - } - -mark_done: - if (all) { - /* Mark dirty root pages */ - for (i = 0; i < txn->mt_numdbs; i++) { - if (txn->mt_dbflags[i] & DB_DIRTY) { - pgno_t pgno = txn->mt_dbs[i].md_root; - if (pgno == P_INVALID) - continue; - if (unlikely((rc = mdbx_page_get(m0, pgno, &dp, &level)) != - MDBX_SUCCESS)) - break; - if ((dp->mp_flags & Mask) == pflags && level <= 1) - dp->mp_flags ^= P_KEEP; - } - } - } - - return rc; -} - -static int mdbx_page_flush(MDBX_txn *txn, pgno_t keep); - -/* Spill pages from the dirty list back to disk. - * This is intended to prevent running into MDBX_TXN_FULL situations, - * but note that they may still occur in a few cases: - * - * 1) our estimate of the txn size could be too small. Currently this - * seems unlikely, except with a large number of MDBX_MULTIPLE items. - * - * 2) child txns may run out of space if their parents dirtied a - * lot of pages and never spilled them. TODO: we probably should do - * a preemptive spill during mdbx_txn_begin() of a child txn, if - * the parent's dirtyroom is below a given threshold. - * - * Otherwise, if not using nested txns, it is expected that apps will - * not run into MDBX_TXN_FULL any more. The pages are flushed to disk - * the same way as for a txn commit, e.g. their P_DIRTY flag is cleared. - * If the txn never references them again, they can be left alone. - * If the txn only reads them, they can be used without any fuss. - * If the txn writes them again, they can be dirtied immediately without - * going thru all of the work of mdbx_page_touch(). Such references are - * handled by mdbx_page_unspill(). - * - * Also note, we never spill DB root pages, nor pages of active cursors, - * because we'll need these back again soon anyway. And in nested txns, - * we can't spill a page in a child txn if it was already spilled in a - * parent txn. That would alter the parent txns' data even though - * the child hasn't committed yet, and we'd have no way to undo it if - * the child aborted. - * - * [in] m0 cursor A cursor handle identifying the transaction and - * database for which we are checking space. - * [in] key For a put operation, the key being stored. - * [in] data For a put operation, the data being stored. - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) { - MDBX_txn *txn = m0->mc_txn; - MDBX_ID2L dl = txn->mt_rw_dirtylist; - - if (m0->mc_flags & C_SUB) - return MDBX_SUCCESS; - - /* Estimate how much space this op will take */ - pgno_t i = m0->mc_db->md_depth; - /* Named DBs also dirty the main DB */ - if (m0->mc_dbi >= CORE_DBS) - i += txn->mt_dbs[MAIN_DBI].md_depth; - /* For puts, roughly factor in the key+data size */ - if (key) - i += bytes2pgno(txn->mt_env, LEAFSIZE(key, data) + txn->mt_env->me_psize); - i += i; /* double it for good measure */ - pgno_t need = i; - - if (txn->mt_dirtyroom > i) - return MDBX_SUCCESS; - - if (!txn->mt_spill_pages) { - txn->mt_spill_pages = mdbx_pnl_alloc(MDBX_PNL_UM_MAX); - if (unlikely(!txn->mt_spill_pages)) - return MDBX_ENOMEM; - } else { - /* purge deleted slots */ - MDBX_PNL sl = txn->mt_spill_pages; - pgno_t num = sl[0], j = 0; - for (i = 1; i <= num; i++) { - if (!(sl[i] & 1)) - sl[++j] = sl[i]; - } - sl[0] = j; - } - - /* Preserve pages which may soon be dirtied again */ - int rc = mdbx_pages_xkeep(m0, P_DIRTY, true); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - - /* Less aggressive spill - we originally spilled the entire dirty list, - * with a few exceptions for cursor pages and DB root pages. But this - * turns out to be a lot of wasted effort because in a large txn many - * of those pages will need to be used again. So now we spill only 1/8th - * of the dirty pages. Testing revealed this to be a good tradeoff, - * better than 1/2, 1/4, or 1/10. */ - if (need < MDBX_PNL_UM_MAX / 8) - need = MDBX_PNL_UM_MAX / 8; - - /* Save the page IDs of all the pages we're flushing */ - /* flush from the tail forward, this saves a lot of shifting later on. */ - for (i = dl[0].mid; i && need; i--) { - pgno_t pn = dl[i].mid << 1; - MDBX_page *dp = dl[i].mptr; - if (dp->mp_flags & (P_LOOSE | P_KEEP)) - continue; - /* Can't spill twice, - * make sure it's not already in a parent's spill list. */ - if (txn->mt_parent) { - MDBX_txn *tx2; - for (tx2 = txn->mt_parent; tx2; tx2 = tx2->mt_parent) { - if (tx2->mt_spill_pages) { - unsigned j = mdbx_pnl_search(tx2->mt_spill_pages, pn); - if (j <= tx2->mt_spill_pages[0] && tx2->mt_spill_pages[j] == pn) { - dp->mp_flags |= P_KEEP; - break; - } - } - } - if (tx2) - continue; - } - rc = mdbx_pnl_append(&txn->mt_spill_pages, pn); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - need--; - } - mdbx_pnl_sort(txn->mt_spill_pages); - - /* Flush the spilled part of dirty list */ - rc = mdbx_page_flush(txn, i); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - - /* Reset any dirty pages we kept that page_flush didn't see */ - rc = mdbx_pages_xkeep(m0, P_DIRTY | P_KEEP, i != 0); - -bailout: - txn->mt_flags |= rc ? MDBX_TXN_ERROR : MDBX_TXN_SPILLS; - return rc; -} - -/*----------------------------------------------------------------------------*/ - -#define METAPAGE(env, n) (&pgno2page(env, n)->mp_meta) - -#define METAPAGE_END(env) METAPAGE(env, NUM_METAS) - -static __inline txnid_t meta_txnid(const MDBX_env *env, const MDBX_meta *meta, - bool allow_volatile) { - mdbx_assert(env, meta >= METAPAGE(env, 0) || meta < METAPAGE_END(env)); - txnid_t a = meta->mm_txnid_a; - txnid_t b = meta->mm_txnid_b; - if (allow_volatile) - return (a == b) ? a : 0; - mdbx_assert(env, a == b); - return a; -} - -static __inline txnid_t mdbx_meta_txnid_stable(const MDBX_env *env, - const MDBX_meta *meta) { - return meta_txnid(env, meta, false); -} - -static __inline txnid_t mdbx_meta_txnid_fluid(const MDBX_env *env, - const MDBX_meta *meta) { - return meta_txnid(env, meta, true); -} - -static __inline void mdbx_meta_update_begin(const MDBX_env *env, - MDBX_meta *meta, txnid_t txnid) { - mdbx_assert(env, meta >= METAPAGE(env, 0) || meta < METAPAGE_END(env)); - mdbx_assert(env, meta->mm_txnid_a < txnid && meta->mm_txnid_b < txnid); - meta->mm_txnid_a = txnid; - (void)env; - mdbx_coherent_barrier(); -} - -static __inline void mdbx_meta_update_end(const MDBX_env *env, MDBX_meta *meta, - txnid_t txnid) { - mdbx_assert(env, meta >= METAPAGE(env, 0) || meta < METAPAGE_END(env)); - mdbx_assert(env, meta->mm_txnid_a == txnid); - mdbx_assert(env, meta->mm_txnid_b < txnid); - - mdbx_jitter4testing(true); - meta->mm_txnid_b = txnid; - mdbx_coherent_barrier(); -} - -static __inline void mdbx_meta_set_txnid(const MDBX_env *env, MDBX_meta *meta, - txnid_t txnid) { - mdbx_assert(env, meta < METAPAGE(env, 0) || meta > METAPAGE_END(env)); - meta->mm_txnid_a = txnid; - meta->mm_txnid_b = txnid; -} - -static __inline uint64_t mdbx_meta_sign(const MDBX_meta *meta) { - uint64_t sign = MDBX_DATASIGN_NONE; -#if 0 /* TODO */ - sign = hippeus_hash64(...); -#else - (void)meta; -#endif - /* LY: newer returns MDBX_DATASIGN_NONE or MDBX_DATASIGN_WEAK */ - return (sign > MDBX_DATASIGN_WEAK) ? sign : ~sign; -} - -enum meta_choise_mode { prefer_last, prefer_noweak, prefer_steady }; - -static __inline bool mdbx_meta_ot(const enum meta_choise_mode mode, - const MDBX_env *env, const MDBX_meta *a, - const MDBX_meta *b) { - mdbx_jitter4testing(true); - txnid_t txnid_a = mdbx_meta_txnid_fluid(env, a); - txnid_t txnid_b = mdbx_meta_txnid_fluid(env, b); - - mdbx_jitter4testing(true); - switch (mode) { - default: - assert(false); - __unreachable(); - /* fall through */ - __fallthrough; - case prefer_steady: - if (META_IS_STEADY(a) != META_IS_STEADY(b)) - return META_IS_STEADY(b); - /* fall through */ - __fallthrough; - case prefer_noweak: - if (META_IS_WEAK(a) != META_IS_WEAK(b)) - return !META_IS_WEAK(b); - /* fall through */ - __fallthrough; - case prefer_last: - mdbx_jitter4testing(true); - if (txnid_a == txnid_b) - return META_IS_STEADY(b) || (META_IS_WEAK(a) && !META_IS_WEAK(b)); - return txnid_a < txnid_b; - } -} - -static __inline bool mdbx_meta_eq(const MDBX_env *env, const MDBX_meta *a, - const MDBX_meta *b) { - mdbx_jitter4testing(true); - const txnid_t txnid = mdbx_meta_txnid_fluid(env, a); - if (!txnid || txnid != mdbx_meta_txnid_fluid(env, b)) - return false; - - mdbx_jitter4testing(true); - if (META_IS_STEADY(a) != META_IS_STEADY(b)) - return false; - - mdbx_jitter4testing(true); - return true; -} - -static int mdbx_meta_eq_mask(const MDBX_env *env) { - MDBX_meta *m0 = METAPAGE(env, 0); - MDBX_meta *m1 = METAPAGE(env, 1); - MDBX_meta *m2 = METAPAGE(env, 2); - - int rc = mdbx_meta_eq(env, m0, m1) ? 1 : 0; - if (mdbx_meta_eq(env, m1, m2)) - rc += 2; - if (mdbx_meta_eq(env, m2, m0)) - rc += 4; - return rc; -} - -static __inline MDBX_meta *mdbx_meta_recent(const enum meta_choise_mode mode, - const MDBX_env *env, MDBX_meta *a, - MDBX_meta *b) { - const bool a_older_that_b = mdbx_meta_ot(mode, env, a, b); - mdbx_assert(env, !mdbx_meta_eq(env, a, b)); - return a_older_that_b ? b : a; -} - -static __inline MDBX_meta *mdbx_meta_ancient(const enum meta_choise_mode mode, - const MDBX_env *env, MDBX_meta *a, - MDBX_meta *b) { - const bool a_older_that_b = mdbx_meta_ot(mode, env, a, b); - mdbx_assert(env, !mdbx_meta_eq(env, a, b)); - return a_older_that_b ? a : b; -} - -static __inline MDBX_meta * -mdbx_meta_mostrecent(const enum meta_choise_mode mode, const MDBX_env *env) { - MDBX_meta *m0 = METAPAGE(env, 0); - MDBX_meta *m1 = METAPAGE(env, 1); - MDBX_meta *m2 = METAPAGE(env, 2); - - MDBX_meta *head = mdbx_meta_recent(mode, env, m0, m1); - head = mdbx_meta_recent(mode, env, head, m2); - return head; -} - -static __hot MDBX_meta *mdbx_meta_steady(const MDBX_env *env) { - return mdbx_meta_mostrecent(prefer_steady, env); -} - -static __hot MDBX_meta *mdbx_meta_head(const MDBX_env *env) { - return mdbx_meta_mostrecent(prefer_last, env); -} - -static __hot txnid_t mdbx_reclaiming_detent(const MDBX_env *env) { - if (F_ISSET(env->me_flags, MDBX_UTTERLY_NOSYNC)) - return env->me_txn->mt_txnid - 1; - - return mdbx_meta_txnid_stable(env, mdbx_meta_steady(env)); -} - -static const char *mdbx_durable_str(const MDBX_meta *const meta) { - if (META_IS_WEAK(meta)) - return "Weak"; - if (META_IS_STEADY(meta)) - return (meta->mm_datasync_sign == mdbx_meta_sign(meta)) ? "Steady" - : "Tainted"; - return "Legacy"; -} - -/*----------------------------------------------------------------------------*/ - -/* Find oldest txnid still referenced. */ -static txnid_t mdbx_find_oldest(MDBX_txn *txn) { - mdbx_tassert(txn, (txn->mt_flags & MDBX_RDONLY) == 0); - const MDBX_env *env = txn->mt_env; - MDBX_lockinfo *const lck = env->me_lck; - - const txnid_t edge = mdbx_reclaiming_detent(env); - mdbx_tassert(txn, edge <= txn->mt_txnid - 1); - const txnid_t last_oldest = lck->mti_oldest; - mdbx_tassert(txn, edge >= last_oldest); - if (last_oldest == edge) - return edge; - - const uint32_t nothing_changed = MDBX_STRING_TETRAD("None"); - const uint32_t snap_readers_refresh_flag = lck->mti_readers_refresh_flag; - mdbx_jitter4testing(false); - if (snap_readers_refresh_flag == nothing_changed) - return last_oldest; - - txnid_t oldest = edge; - lck->mti_readers_refresh_flag = nothing_changed; - mdbx_coherent_barrier(); - const unsigned snap_nreaders = lck->mti_numreaders; - for (unsigned i = 0; i < snap_nreaders; ++i) { - if (lck->mti_readers[i].mr_pid) { - /* mdbx_jitter4testing(true); */ - const txnid_t snap = lck->mti_readers[i].mr_txnid; - if (oldest > snap && last_oldest <= /* ignore pending updates */ snap) { - oldest = snap; - if (oldest == last_oldest) - return oldest; - } - } - } - - if (oldest != last_oldest) { - mdbx_notice("update oldest %" PRIaTXN " -> %" PRIaTXN, last_oldest, oldest); - mdbx_tassert(txn, oldest >= lck->mti_oldest); - lck->mti_oldest = oldest; - } - return oldest; -} - -/* Add a page to the txn's dirty list */ -static void mdbx_page_dirty(MDBX_txn *txn, MDBX_page *mp) { - MDBX_ID2 mid; - int rc, (*insert)(MDBX_ID2L, MDBX_ID2 *); - - if (txn->mt_flags & MDBX_TXN_WRITEMAP) { - insert = mdbx_mid2l_append; - } else { - insert = mdbx_mid2l_insert; - } - mid.mid = mp->mp_pgno; - mid.mptr = mp; - rc = insert(txn->mt_rw_dirtylist, &mid); - mdbx_tassert(txn, rc == 0); - txn->mt_dirtyroom--; -} - -static int mdbx_mapresize(MDBX_env *env, const pgno_t size_pgno, - const pgno_t limit_pgno) { -#ifdef USE_VALGRIND - const size_t prev_mapsize = env->me_mapsize; - void *const prev_mapaddr = env->me_map; -#endif - - const size_t limit_bytes = pgno_align2os_bytes(env, limit_pgno); - const size_t size_bytes = pgno_align2os_bytes(env, size_pgno); - - mdbx_info("resize datafile/mapping: " - "present %" PRIuPTR " -> %" PRIuPTR ", " - "limit %" PRIuPTR " -> %" PRIuPTR, - env->me_dbgeo.now, size_bytes, env->me_dbgeo.upper, limit_bytes); - - mdbx_assert(env, limit_bytes >= size_bytes); - mdbx_assert(env, bytes2pgno(env, size_bytes) == size_pgno); - mdbx_assert(env, bytes2pgno(env, limit_bytes) == limit_pgno); - const int rc = - mdbx_mresize(env->me_flags, &env->me_dxb_mmap, size_bytes, limit_bytes); - - if (rc == MDBX_SUCCESS) { - env->me_dbgeo.now = size_bytes; - env->me_dbgeo.upper = limit_bytes; - } else if (rc != MDBX_RESULT_TRUE) { - mdbx_error("failed resize datafile/mapping: " - "present %" PRIuPTR " -> %" PRIuPTR ", " - "limit %" PRIuPTR " -> %" PRIuPTR ", errcode %d", - env->me_dbgeo.now, size_bytes, env->me_dbgeo.upper, limit_bytes, - rc); - return rc; - } else { - mdbx_notice("unable resize datafile/mapping: " - "present %" PRIuPTR " -> %" PRIuPTR ", " - "limit %" PRIuPTR " -> %" PRIuPTR ", errcode %d", - env->me_dbgeo.now, size_bytes, env->me_dbgeo.upper, limit_bytes, - rc); - } - -#ifdef USE_VALGRIND - if (prev_mapsize != env->me_mapsize || prev_mapaddr != env->me_map) { - VALGRIND_DISCARD(env->me_valgrind_handle); - env->me_valgrind_handle = 0; - if (env->me_mapsize) - env->me_valgrind_handle = - VALGRIND_CREATE_BLOCK(env->me_map, env->me_mapsize, "mdbx"); - } -#endif - - if (env->me_txn) { - mdbx_tassert(env->me_txn, size_pgno >= env->me_txn->mt_next_pgno); - env->me_txn->mt_end_pgno = size_pgno; - } - return MDBX_SUCCESS; -} - -/* Allocate page numbers and memory for writing. Maintain me_last_reclaimed, - * me_reclaimed_pglist and mt_next_pgno. Set MDBX_TXN_ERROR on failure. - * - * If there are free pages available from older transactions, they - * are re-used first. Otherwise allocate a new page at mt_next_pgno. - * Do not modify the freedB, just merge freeDB records into me_reclaimed_pglist - * and move me_last_reclaimed to say which records were consumed. Only this - * function can create me_reclaimed_pglist and move - * me_last_reclaimed/mt_next_pgno. - * - * [in] mc cursor A cursor handle identifying the transaction and - * database for which we are allocating. - * [in] num the number of pages to allocate. - * [out] mp Address of the allocated page(s). Requests for multiple pages - * will always be satisfied by a single contiguous chunk of memory. - * - * Returns 0 on success, non-zero on failure.*/ - -#define MDBX_ALLOC_CACHE 1 -#define MDBX_ALLOC_GC 2 -#define MDBX_ALLOC_NEW 4 -#define MDBX_ALLOC_KICK 8 -#define MDBX_ALLOC_ALL \ - (MDBX_ALLOC_CACHE | MDBX_ALLOC_GC | MDBX_ALLOC_NEW | MDBX_ALLOC_KICK) - -static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp, - int flags) { - int rc; - MDBX_txn *txn = mc->mc_txn; - MDBX_env *env = txn->mt_env; - MDBX_page *np; - - if (likely(flags & MDBX_ALLOC_GC)) { - flags |= env->me_flags & (MDBX_COALESCE | MDBX_LIFORECLAIM); - if (unlikely(mc->mc_flags & C_RECLAIMING)) { - /* If mc is updating the freeDB, then the freelist cannot play - * catch-up with itself by growing while trying to save it. */ - flags &= - ~(MDBX_ALLOC_GC | MDBX_ALLOC_KICK | MDBX_COALESCE | MDBX_LIFORECLAIM); - } - } - - if (likely(flags & MDBX_ALLOC_CACHE)) { - /* If there are any loose pages, just use them */ - assert(mp && num); - if (likely(num == 1 && txn->mt_loose_pages)) { - np = txn->mt_loose_pages; - txn->mt_loose_pages = NEXT_LOOSE_PAGE(np); - txn->mt_loose_count--; - mdbx_debug("db %d use loose page %" PRIaPGNO, DDBI(mc), np->mp_pgno); - ASAN_UNPOISON_MEMORY_REGION(np, env->me_psize); - mdbx_tassert(txn, np->mp_pgno < txn->mt_next_pgno); - mdbx_ensure(env, np->mp_pgno >= NUM_METAS); - *mp = np; - return MDBX_SUCCESS; - } - } - - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - pgno_t pgno, *repg_list = env->me_reclaimed_pglist; - unsigned repg_pos = 0, repg_len = repg_list ? repg_list[0] : 0; - txnid_t oldest = 0, last = 0; - const unsigned wanna_range = num - 1; - - while (1) { /* oom-kick retry loop */ - /* If our dirty list is already full, we can't do anything */ - if (unlikely(txn->mt_dirtyroom == 0)) { - rc = MDBX_TXN_FULL; - goto fail; - } - - MDBX_cursor recur; - for (MDBX_cursor_op op = MDBX_FIRST;; - op = (flags & MDBX_LIFORECLAIM) ? MDBX_PREV : MDBX_NEXT) { - MDBX_val key, data; - - /* Seek a big enough contiguous page range. - * Prefer pages with lower pgno. */ - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - if (likely(flags & MDBX_ALLOC_CACHE) && repg_len > wanna_range && - (!(flags & MDBX_COALESCE) || op == MDBX_FIRST)) { -#if MDBX_PNL_ASCENDING - for (repg_pos = 1; repg_pos <= repg_len - wanna_range; ++repg_pos) { - pgno = repg_list[repg_pos]; - if (likely(repg_list[repg_pos + wanna_range - 1] == - pgno + wanna_range - 1)) - goto done; - } -#else - repg_pos = repg_len; - do { - pgno = repg_list[repg_pos]; - if (likely(repg_list[repg_pos - wanna_range] == pgno + wanna_range)) - goto done; - } while (--repg_pos > wanna_range); -#endif /* MDBX_PNL sort-order */ - } - - if (op == MDBX_FIRST) { /* 1st iteration, setup cursor, etc */ - if (unlikely(!(flags & MDBX_ALLOC_GC))) - break /* reclaiming is prohibited for now */; - - /* Prepare to fetch more and coalesce */ - oldest = (flags & MDBX_LIFORECLAIM) ? mdbx_find_oldest(txn) - : env->me_oldest[0]; - mdbx_cursor_init(&recur, txn, FREE_DBI, NULL); - if (flags & MDBX_LIFORECLAIM) { - /* Begin from oldest reader if any */ - if (oldest > 2) { - last = oldest - 1; - op = MDBX_SET_RANGE; - } - } else if (env->me_last_reclaimed) { - /* Continue lookup from env->me_last_reclaimed to oldest reader */ - last = env->me_last_reclaimed; - op = MDBX_SET_RANGE; - } - - key.iov_base = &last; - key.iov_len = sizeof(last); - } - - if (!(flags & MDBX_LIFORECLAIM)) { - /* Do not try fetch more if the record will be too recent */ - if (op != MDBX_FIRST && ++last >= oldest) { - oldest = mdbx_find_oldest(txn); - if (oldest <= last) - break; - } - } - - rc = mdbx_cursor_get(&recur, &key, NULL, op); - if (rc == MDBX_NOTFOUND && (flags & MDBX_LIFORECLAIM)) { - if (op == MDBX_SET_RANGE) - continue; - if (oldest < mdbx_find_oldest(txn)) { - oldest = *env->me_oldest; - last = oldest - 1; - key.iov_base = &last; - key.iov_len = sizeof(last); - op = MDBX_SET_RANGE; - rc = mdbx_cursor_get(&recur, &key, NULL, op); - } - } - if (unlikely(rc)) { - if (rc == MDBX_NOTFOUND) - break; - goto fail; - } - - last = *(txnid_t *)key.iov_base; - if (oldest <= last) { - oldest = mdbx_find_oldest(txn); - if (oldest <= last) { - if (flags & MDBX_LIFORECLAIM) - continue; - break; - } - } - - if (flags & MDBX_LIFORECLAIM) { - /* skip IDs of records that already reclaimed */ - if (txn->mt_lifo_reclaimed) { - unsigned i; - for (i = (unsigned)txn->mt_lifo_reclaimed[0]; i > 0; --i) - if (txn->mt_lifo_reclaimed[i] == last) - break; - if (i) - continue; - } - } - - /* Reading next FreeDB record */ - np = recur.mc_pg[recur.mc_top]; - MDBX_node *leaf = NODEPTR(np, recur.mc_ki[recur.mc_top]); - if (unlikely((rc = mdbx_node_read(&recur, leaf, &data)) != MDBX_SUCCESS)) - goto fail; - - if ((flags & MDBX_LIFORECLAIM) && !txn->mt_lifo_reclaimed) { - txn->mt_lifo_reclaimed = mdbx_txl_alloc(); - if (unlikely(!txn->mt_lifo_reclaimed)) { - rc = MDBX_ENOMEM; - goto fail; - } - } - - /* Append PNL from FreeDB record to me_reclaimed_pglist */ - pgno_t *re_pnl = (pgno_t *)data.iov_base; - mdbx_tassert(txn, re_pnl[0] == 0 || - data.iov_len == (re_pnl[0] + 1) * sizeof(pgno_t)); - mdbx_tassert(txn, mdbx_pnl_check(re_pnl)); - repg_pos = re_pnl[0]; - if (!repg_list) { - if (unlikely(!(env->me_reclaimed_pglist = repg_list = - mdbx_pnl_alloc(repg_pos)))) { - rc = MDBX_ENOMEM; - goto fail; - } - } else { - if (unlikely( - (rc = mdbx_pnl_need(&env->me_reclaimed_pglist, repg_pos)) != 0)) - goto fail; - repg_list = env->me_reclaimed_pglist; - } - - /* Remember ID of FreeDB record */ - if (flags & MDBX_LIFORECLAIM) { - if ((rc = mdbx_txl_append(&txn->mt_lifo_reclaimed, last)) != 0) - goto fail; - } - env->me_last_reclaimed = last; - - if (mdbx_debug_enabled(MDBX_DBG_EXTRA)) { - mdbx_debug_extra("PNL read txn %" PRIaTXN " root %" PRIaPGNO - " num %u, PNL", - last, txn->mt_dbs[FREE_DBI].md_root, repg_pos); - unsigned i; - for (i = repg_pos; i; i--) - mdbx_debug_extra_print(" %" PRIaPGNO "", re_pnl[i]); - mdbx_debug_extra_print("\n"); - } - - /* Merge in descending sorted order */ - mdbx_pnl_xmerge(repg_list, re_pnl); - repg_len = repg_list[0]; - if (unlikely((flags & MDBX_ALLOC_CACHE) == 0)) { - /* Done for a kick-reclaim mode, actually no page needed */ - return MDBX_SUCCESS; - } - - mdbx_tassert(txn, - repg_len == 0 || repg_list[repg_len] < txn->mt_next_pgno); - if (repg_len) { - /* Refund suitable pages into "unallocated" space */ - pgno_t tail = txn->mt_next_pgno; - pgno_t *const begin = repg_list + 1; - pgno_t *const end = begin + repg_len; - pgno_t *higest; -#if MDBX_PNL_ASCENDING - for (higest = end; --higest >= begin;) { -#else - for (higest = begin; higest < end; ++higest) { -#endif /* MDBX_PNL sort-order */ - mdbx_tassert(txn, *higest >= NUM_METAS && *higest < tail); - if (*higest != tail - 1) - break; - tail -= 1; - } - if (tail != txn->mt_next_pgno) { -#if MDBX_PNL_ASCENDING - repg_len = (unsigned)(higest + 1 - begin); -#else - repg_len -= (unsigned)(higest - begin); - for (pgno_t *move = begin; higest < end; ++move, ++higest) - *move = *higest; -#endif /* MDBX_PNL sort-order */ - repg_list[0] = repg_len; - mdbx_info("refunded %" PRIaPGNO " pages: %" PRIaPGNO " -> %" PRIaPGNO, - tail - txn->mt_next_pgno, tail, txn->mt_next_pgno); - txn->mt_next_pgno = tail; - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - } - } - - /* Don't try to coalesce too much. */ - if (repg_len > MDBX_PNL_UM_SIZE / 2) - break; - if (flags & MDBX_COALESCE) { - if (repg_len /* current size */ >= env->me_maxfree_1pg / 2 || - repg_pos /* prev size */ >= env->me_maxfree_1pg / 4) - flags &= ~MDBX_COALESCE; - } - } - - if ((flags & (MDBX_COALESCE | MDBX_ALLOC_CACHE)) == - (MDBX_COALESCE | MDBX_ALLOC_CACHE) && - repg_len > wanna_range) { -#if MDBX_PNL_ASCENDING - for (repg_pos = 1; repg_pos <= repg_len - wanna_range; ++repg_pos) { - pgno = repg_list[repg_pos]; - if (likely(repg_list[repg_pos + wanna_range - 1] == - pgno + wanna_range - 1)) - goto done; - } -#else - repg_pos = repg_len; - do { - pgno = repg_list[repg_pos]; - if (likely(repg_list[repg_pos - wanna_range] == pgno + wanna_range)) - goto done; - } while (--repg_pos > wanna_range); -#endif /* MDBX_PNL sort-order */ - } - - /* Use new pages from the map when nothing suitable in the freeDB */ - repg_pos = 0; - pgno = txn->mt_next_pgno; - rc = MDBX_MAP_FULL; - const pgno_t next = pgno_add(pgno, num); - if (likely(next <= txn->mt_end_pgno)) { - rc = MDBX_NOTFOUND; - if (likely(flags & MDBX_ALLOC_NEW)) - goto done; - } - - const MDBX_meta *head = mdbx_meta_head(env); - if ((flags & MDBX_ALLOC_GC) && - ((flags & MDBX_ALLOC_KICK) || rc == MDBX_MAP_FULL)) { - MDBX_meta *steady = mdbx_meta_steady(env); - - if (oldest == mdbx_meta_txnid_stable(env, steady) && - !META_IS_STEADY(head) && META_IS_STEADY(steady)) { - /* LY: Here an oom was happened: - * - all pages had allocated; - * - reclaiming was stopped at the last steady-sync; - * - the head-sync is weak. - * Now we need make a sync to resume reclaiming. If both - * MDBX_NOSYNC and MDBX_MAPASYNC flags are set, then assume that - * utterly no-sync write mode was requested. In such case - * don't make a steady-sync, but only a legacy-mode checkpoint, - * just for resume reclaiming only, not for data consistency. */ - - mdbx_debug("kick-gc: head %" PRIaTXN "-%s, tail %" PRIaTXN - "-%s, oldest %" PRIaTXN "", - mdbx_meta_txnid_stable(env, head), mdbx_durable_str(head), - mdbx_meta_txnid_stable(env, steady), - mdbx_durable_str(steady), oldest); - - const unsigned syncflags = F_ISSET(env->me_flags, MDBX_UTTERLY_NOSYNC) - ? env->me_flags - : env->me_flags & MDBX_WRITEMAP; - MDBX_meta meta = *head; - if (mdbx_sync_locked(env, syncflags, &meta) == MDBX_SUCCESS) { - txnid_t snap = mdbx_find_oldest(txn); - if (snap > oldest) - continue; - } - } - - if (rc == MDBX_MAP_FULL && oldest < txn->mt_txnid - 1) { - if (mdbx_oomkick(env, oldest) > oldest) - continue; - } - } - - if (rc == MDBX_MAP_FULL && next < head->mm_geo.upper) { - mdbx_assert(env, next > txn->mt_end_pgno); - pgno_t aligned = pgno_align2os_pgno( - env, pgno_add(next, head->mm_geo.grow - next % head->mm_geo.grow)); - - if (aligned > head->mm_geo.upper) - aligned = head->mm_geo.upper; - mdbx_assert(env, aligned > txn->mt_end_pgno); - - mdbx_info("try growth datafile to %" PRIaPGNO " pages (+%" PRIaPGNO ")", - aligned, aligned - txn->mt_end_pgno); - rc = mdbx_mapresize(env, aligned, head->mm_geo.upper); - if (rc == MDBX_SUCCESS) { - mdbx_tassert(env->me_txn, txn->mt_end_pgno >= next); - if (!mp) - return rc; - goto done; - } - - mdbx_warning("unable growth datafile to %" PRIaPGNO "pages (+%" PRIaPGNO - "), errcode %d", - aligned, aligned - txn->mt_end_pgno, rc); - } - - fail: - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - if (mp) { - *mp = NULL; - txn->mt_flags |= MDBX_TXN_ERROR; - } - assert(rc); - return rc; - } - -done: - mdbx_tassert(txn, mp && num); - mdbx_ensure(env, pgno >= NUM_METAS); - if (env->me_flags & MDBX_WRITEMAP) { - np = pgno2page(env, pgno); - /* LY: reset no-access flag from mdbx_kill_page() */ - VALGRIND_MAKE_MEM_UNDEFINED(np, pgno2bytes(env, num)); - ASAN_UNPOISON_MEMORY_REGION(np, pgno2bytes(env, num)); - } else { - if (unlikely(!(np = mdbx_page_malloc(txn, num)))) { - rc = MDBX_ENOMEM; - goto fail; - } - } - - if (repg_pos) { - mdbx_tassert(txn, pgno < txn->mt_next_pgno); - mdbx_tassert(txn, pgno == repg_list[repg_pos]); - /* Cutoff allocated pages from me_reclaimed_pglist */ - repg_list[0] = repg_len -= num; - for (unsigned i = repg_pos - num; i < repg_len;) - repg_list[++i] = repg_list[++repg_pos]; - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - } else { - txn->mt_next_pgno = pgno + num; - mdbx_assert(env, txn->mt_next_pgno <= txn->mt_end_pgno); - } - - if (env->me_flags & MDBX_PAGEPERTURB) - memset(np, 0x71 /* 'q', 113 */, pgno2bytes(env, num)); - VALGRIND_MAKE_MEM_UNDEFINED(np, pgno2bytes(env, num)); - - np->mp_pgno = pgno; - np->mp_leaf2_ksize = 0; - np->mp_flags = 0; - np->mp_pages = num; - mdbx_page_dirty(txn, np); - *mp = np; - - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - return MDBX_SUCCESS; -} - -/* Copy the used portions of a non-overflow page. - * [in] dst page to copy into - * [in] src page to copy from - * [in] psize size of a page */ -static void mdbx_page_copy(MDBX_page *dst, MDBX_page *src, unsigned psize) { - STATIC_ASSERT(UINT16_MAX > MAX_PAGESIZE - PAGEHDRSZ); - STATIC_ASSERT(MIN_PAGESIZE > PAGEHDRSZ + NODESIZE * 42); - enum { Align = sizeof(pgno_t) }; - indx_t upper = src->mp_upper, lower = src->mp_lower, unused = upper - lower; - - /* If page isn't full, just copy the used portion. Adjust - * alignment so memcpy may copy words instead of bytes. */ - if ((unused &= -Align) && !IS_LEAF2(src)) { - upper = (upper + PAGEHDRSZ) & -Align; - memcpy(dst, src, (lower + PAGEHDRSZ + (Align - 1)) & -Align); - memcpy((pgno_t *)((char *)dst + upper), (pgno_t *)((char *)src + upper), - psize - upper); - } else { - memcpy(dst, src, psize - unused); - } -} - -/* Pull a page off the txn's spill list, if present. - * - * If a page being referenced was spilled to disk in this txn, bring - * it back and make it dirty/writable again. - * - * [in] txn the transaction handle. - * [in] mp the page being referenced. It must not be dirty. - * [out] ret the writable page, if any. - * ret is unchanged if mp wasn't spilled. */ -static int mdbx_page_unspill(MDBX_txn *txn, MDBX_page *mp, MDBX_page **ret) { - MDBX_env *env = txn->mt_env; - const MDBX_txn *tx2; - unsigned x; - pgno_t pgno = mp->mp_pgno, pn = pgno << 1; - - for (tx2 = txn; tx2; tx2 = tx2->mt_parent) { - if (!tx2->mt_spill_pages) - continue; - x = mdbx_pnl_search(tx2->mt_spill_pages, pn); - if (x <= tx2->mt_spill_pages[0] && tx2->mt_spill_pages[x] == pn) { - MDBX_page *np; - int num; - if (txn->mt_dirtyroom == 0) - return MDBX_TXN_FULL; - num = IS_OVERFLOW(mp) ? mp->mp_pages : 1; - if (env->me_flags & MDBX_WRITEMAP) { - np = mp; - } else { - np = mdbx_page_malloc(txn, num); - if (unlikely(!np)) - return MDBX_ENOMEM; - if (unlikely(num > 1)) - memcpy(np, mp, pgno2bytes(env, num)); - else - mdbx_page_copy(np, mp, env->me_psize); - } - mdbx_debug("unspill page %" PRIaPGNO, mp->mp_pgno); - if (tx2 == txn) { - /* If in current txn, this page is no longer spilled. - * If it happens to be the last page, truncate the spill list. - * Otherwise mark it as deleted by setting the LSB. */ - if (x == txn->mt_spill_pages[0]) - txn->mt_spill_pages[0]--; - else - txn->mt_spill_pages[x] |= 1; - } /* otherwise, if belonging to a parent txn, the - * page remains spilled until child commits */ - - mdbx_page_dirty(txn, np); - np->mp_flags |= P_DIRTY; - *ret = np; - break; - } - } - return MDBX_SUCCESS; -} - -/* Touch a page: make it dirty and re-insert into tree with updated pgno. - * Set MDBX_TXN_ERROR on failure. - * - * [in] mc cursor pointing to the page to be touched - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_touch(MDBX_cursor *mc) { - MDBX_page *mp = mc->mc_pg[mc->mc_top], *np; - MDBX_txn *txn = mc->mc_txn; - MDBX_cursor *m2, *m3; - pgno_t pgno; - int rc; - - mdbx_cassert(mc, !IS_OVERFLOW(mp)); - if (!F_ISSET(mp->mp_flags, P_DIRTY)) { - if (txn->mt_flags & MDBX_TXN_SPILLS) { - np = NULL; - rc = mdbx_page_unspill(txn, mp, &np); - if (unlikely(rc)) - goto fail; - if (likely(np)) - goto done; - } - - if (unlikely((rc = mdbx_pnl_need(&txn->mt_befree_pages, 1)) || - (rc = mdbx_page_alloc(mc, 1, &np, MDBX_ALLOC_ALL)))) - goto fail; - pgno = np->mp_pgno; - mdbx_debug("touched db %d page %" PRIaPGNO " -> %" PRIaPGNO, DDBI(mc), - mp->mp_pgno, pgno); - mdbx_cassert(mc, mp->mp_pgno != pgno); - mdbx_pnl_xappend(txn->mt_befree_pages, mp->mp_pgno); - /* Update the parent page, if any, to point to the new page */ - if (mc->mc_top) { - MDBX_page *parent = mc->mc_pg[mc->mc_top - 1]; - MDBX_node *node = NODEPTR(parent, mc->mc_ki[mc->mc_top - 1]); - SETPGNO(node, pgno); - } else { - mc->mc_db->md_root = pgno; - } - } else if (txn->mt_parent && !IS_SUBP(mp)) { - mdbx_tassert(txn, (txn->mt_env->me_flags & MDBX_WRITEMAP) == 0); - MDBX_ID2 mid, *dl = txn->mt_rw_dirtylist; - pgno = mp->mp_pgno; - /* If txn has a parent, make sure the page is in our dirty list. */ - if (dl[0].mid) { - unsigned x = mdbx_mid2l_search(dl, pgno); - if (x <= dl[0].mid && dl[x].mid == pgno) { - if (unlikely(mp != dl[x].mptr)) { /* bad cursor? */ - mdbx_error("wrong page 0x%p #%" PRIaPGNO - " in the dirtylist[%d], expecting %p", - dl[x].mptr, pgno, x, mp); - mc->mc_flags &= ~(C_INITIALIZED | C_EOF); - txn->mt_flags |= MDBX_TXN_ERROR; - return MDBX_PROBLEM; - } - return MDBX_SUCCESS; - } - } - - mdbx_debug("clone db %d page %" PRIaPGNO, DDBI(mc), mp->mp_pgno); - mdbx_cassert(mc, dl[0].mid < MDBX_PNL_UM_MAX); - /* No - copy it */ - np = mdbx_page_malloc(txn, 1); - if (unlikely(!np)) - return MDBX_ENOMEM; - mid.mid = pgno; - mid.mptr = np; - rc = mdbx_mid2l_insert(dl, &mid); - mdbx_cassert(mc, rc == 0); - } else { - return MDBX_SUCCESS; - } - - mdbx_page_copy(np, mp, txn->mt_env->me_psize); - np->mp_pgno = pgno; - np->mp_flags |= P_DIRTY; - -done: - /* Adjust cursors pointing to mp */ - mc->mc_pg[mc->mc_top] = np; - m2 = txn->mt_cursors[mc->mc_dbi]; - if (mc->mc_flags & C_SUB) { - for (; m2; m2 = m2->mc_next) { - m3 = &m2->mc_xcursor->mx_cursor; - if (m3->mc_snum < mc->mc_snum) - continue; - if (m3->mc_pg[mc->mc_top] == mp) - m3->mc_pg[mc->mc_top] = np; - } - } else { - for (; m2; m2 = m2->mc_next) { - if (m2->mc_snum < mc->mc_snum) - continue; - if (m2 == mc) - continue; - if (m2->mc_pg[mc->mc_top] == mp) { - m2->mc_pg[mc->mc_top] = np; - if (XCURSOR_INITED(m2) && IS_LEAF(np)) - XCURSOR_REFRESH(m2, np, m2->mc_ki[mc->mc_top]); - } - } - } - return MDBX_SUCCESS; - -fail: - txn->mt_flags |= MDBX_TXN_ERROR; - return rc; -} - -int mdbx_env_sync(MDBX_env *env, int force) { - if (unlikely(!env)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - unsigned flags = env->me_flags & ~MDBX_NOMETASYNC; - if (unlikely(flags & (MDBX_RDONLY | MDBX_FATAL_ERROR))) - return MDBX_EACCESS; - - if (unlikely(!env->me_lck)) - return MDBX_PANIC; - - const bool outside_txn = - (!env->me_txn0 || env->me_txn0->mt_owner != mdbx_thread_self()); - - if (outside_txn) { - int rc = mdbx_txn_lock(env, false); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - - MDBX_meta *head = mdbx_meta_head(env); - if (!META_IS_STEADY(head) || env->me_sync_pending) { - - if (force || (env->me_sync_threshold && - env->me_sync_pending >= env->me_sync_threshold)) - flags &= MDBX_WRITEMAP /* clear flags for full steady sync */; - - if (outside_txn && - env->me_sync_pending > - pgno2bytes(env, 16 /* FIXME: define threshold */) && - (flags & MDBX_NOSYNC) == 0) { - assert(((flags ^ env->me_flags) & MDBX_WRITEMAP) == 0); - const size_t usedbytes = pgno_align2os_bytes(env, head->mm_geo.next); - - mdbx_txn_unlock(env); - - /* LY: pre-sync without holding lock to reduce latency for writer(s) */ - int rc = (flags & MDBX_WRITEMAP) - ? mdbx_msync(&env->me_dxb_mmap, 0, usedbytes, - flags & MDBX_MAPASYNC) - : mdbx_filesync(env->me_fd, false); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - rc = mdbx_txn_lock(env, false); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - /* LY: head may be changed. */ - head = mdbx_meta_head(env); - } - - if (!META_IS_STEADY(head) || env->me_sync_pending) { - mdbx_debug("meta-head %" PRIaPGNO ", %s, sync_pending %" PRIuPTR, - container_of(head, MDBX_page, mp_data)->mp_pgno, - mdbx_durable_str(head), env->me_sync_pending); - MDBX_meta meta = *head; - int rc = mdbx_sync_locked(env, flags | MDBX_SHRINK_ALLOWED, &meta); - if (unlikely(rc != MDBX_SUCCESS)) { - if (outside_txn) - mdbx_txn_unlock(env); - return rc; - } - } - } - - if (outside_txn) - mdbx_txn_unlock(env); - return MDBX_SUCCESS; -} - -/* Back up parent txn's cursors, then grab the originals for tracking */ -static int mdbx_cursor_shadow(MDBX_txn *src, MDBX_txn *dst) { - MDBX_cursor *mc, *bk; - MDBX_xcursor *mx; - size_t size; - int i; - - for (i = src->mt_numdbs; --i >= 0;) { - if ((mc = src->mt_cursors[i]) != NULL) { - size = sizeof(MDBX_cursor); - if (mc->mc_xcursor) - size += sizeof(MDBX_xcursor); - for (; mc; mc = bk->mc_next) { - bk = malloc(size); - if (unlikely(!bk)) - return MDBX_ENOMEM; - *bk = *mc; - mc->mc_backup = bk; - mc->mc_db = &dst->mt_dbs[i]; - /* Kill pointers into src to reduce abuse: The - * user may not use mc until dst ends. But we need a valid - * txn pointer here for cursor fixups to keep working. */ - mc->mc_txn = dst; - mc->mc_dbflag = &dst->mt_dbflags[i]; - if ((mx = mc->mc_xcursor) != NULL) { - *(MDBX_xcursor *)(bk + 1) = *mx; - mx->mx_cursor.mc_txn = dst; - } - mc->mc_next = dst->mt_cursors[i]; - dst->mt_cursors[i] = mc; - } - } - } - return MDBX_SUCCESS; -} - -/* Close this write txn's cursors, give parent txn's cursors back to parent. - * - * [in] txn the transaction handle. - * [in] merge true to keep changes to parent cursors, false to revert. - * - * Returns 0 on success, non-zero on failure. */ -static void mdbx_cursors_eot(MDBX_txn *txn, unsigned merge) { - MDBX_cursor **cursors = txn->mt_cursors, *mc, *next, *bk; - MDBX_xcursor *mx; - int i; - - for (i = txn->mt_numdbs; --i >= 0;) { - for (mc = cursors[i]; mc; mc = next) { - unsigned stage = mc->mc_signature; - mdbx_ensure(NULL, - stage == MDBX_MC_SIGNATURE || stage == MDBX_MC_WAIT4EOT); - next = mc->mc_next; - if ((bk = mc->mc_backup) != NULL) { - if (merge) { - /* Commit changes to parent txn */ - mc->mc_next = bk->mc_next; - mc->mc_backup = bk->mc_backup; - mc->mc_txn = bk->mc_txn; - mc->mc_db = bk->mc_db; - mc->mc_dbflag = bk->mc_dbflag; - if ((mx = mc->mc_xcursor) != NULL) - mx->mx_cursor.mc_txn = bk->mc_txn; - } else { - /* Abort nested txn */ - *mc = *bk; - if ((mx = mc->mc_xcursor) != NULL) - *mx = *(MDBX_xcursor *)(bk + 1); - } - bk->mc_signature = 0; - free(bk); - } - if (stage == MDBX_MC_WAIT4EOT) { - mc->mc_signature = 0; - free(mc); - } else { - mc->mc_signature = MDBX_MC_READY4CLOSE; - mc->mc_flags = 0 /* reset C_UNTRACK */; - } - } - cursors[i] = NULL; - } -} - -/* Common code for mdbx_txn_begin() and mdbx_txn_renew(). */ -static int mdbx_txn_renew0(MDBX_txn *txn, unsigned flags) { - MDBX_env *env = txn->mt_env; - int rc; - - if (unlikely(env->me_pid != mdbx_getpid())) { - env->me_flags |= MDBX_FATAL_ERROR; - return MDBX_PANIC; - } - - pgno_t upper_pgno = 0; - if (flags & MDBX_TXN_RDONLY) { - txn->mt_flags = MDBX_TXN_RDONLY; - MDBX_reader *r = txn->mt_ro_reader; - if (likely(env->me_flags & MDBX_ENV_TXKEY)) { - mdbx_assert(env, !(env->me_flags & MDBX_NOTLS)); - r = mdbx_thread_rthc_get(env->me_txkey); - if (likely(r)) { - mdbx_assert(env, r->mr_pid == env->me_pid); - mdbx_assert(env, r->mr_tid == mdbx_thread_self()); - } - } else { - mdbx_assert(env, !env->me_lck || (env->me_flags & MDBX_NOTLS)); - } - - if (likely(r)) { - if (unlikely(r->mr_pid != env->me_pid || r->mr_txnid != ~(txnid_t)0)) - return MDBX_BAD_RSLOT; - } else if (env->me_lck) { - unsigned slot, nreaders; - const mdbx_pid_t pid = env->me_pid; - const mdbx_tid_t tid = mdbx_thread_self(); - mdbx_assert(env, env->me_lck->mti_magic_and_version == MDBX_LOCK_MAGIC); - mdbx_assert(env, env->me_lck->mti_os_and_format == MDBX_LOCK_FORMAT); - - rc = mdbx_rdt_lock(env); - if (unlikely(MDBX_IS_ERROR(rc))) - return rc; - rc = MDBX_SUCCESS; - - if (unlikely(env->me_live_reader != pid)) { - rc = mdbx_rpid_set(env); - if (unlikely(rc != MDBX_SUCCESS)) { - mdbx_rdt_unlock(env); - return rc; - } - env->me_live_reader = pid; - } - - while (1) { - nreaders = env->me_lck->mti_numreaders; - for (slot = 0; slot < nreaders; slot++) - if (env->me_lck->mti_readers[slot].mr_pid == 0) - break; - - if (likely(slot < env->me_maxreaders)) - break; - - rc = mdbx_reader_check0(env, true, NULL); - if (rc != MDBX_RESULT_TRUE) { - mdbx_rdt_unlock(env); - return (rc == MDBX_SUCCESS) ? MDBX_READERS_FULL : rc; - } - } - - STATIC_ASSERT(sizeof(MDBX_reader) == MDBX_CACHELINE_SIZE); - STATIC_ASSERT( - offsetof(MDBX_lockinfo, mti_readers) % MDBX_CACHELINE_SIZE == 0); - r = &env->me_lck->mti_readers[slot]; - /* Claim the reader slot, carefully since other code - * uses the reader table un-mutexed: First reset the - * slot, next publish it in mtb.mti_numreaders. After - * that, it is safe for mdbx_env_close() to touch it. - * When it will be closed, we can finally claim it. */ - r->mr_pid = 0; - r->mr_txnid = ~(txnid_t)0; - r->mr_tid = tid; - mdbx_coherent_barrier(); - if (slot == nreaders) - env->me_lck->mti_numreaders = ++nreaders; - if (env->me_close_readers < nreaders) - env->me_close_readers = nreaders; - r->mr_pid = pid; - mdbx_rdt_unlock(env); - - if (likely(env->me_flags & MDBX_ENV_TXKEY)) - mdbx_thread_rthc_set(env->me_txkey, r); - } - - while (1) { - MDBX_meta *const meta = mdbx_meta_head(env); - mdbx_jitter4testing(false); - const txnid_t snap = mdbx_meta_txnid_fluid(env, meta); - mdbx_jitter4testing(false); - if (r) { - r->mr_txnid = snap; - mdbx_jitter4testing(false); - mdbx_assert(env, r->mr_pid == mdbx_getpid()); - mdbx_assert(env, r->mr_txnid == snap); - mdbx_coherent_barrier(); - env->me_lck->mti_readers_refresh_flag = true; - } - mdbx_jitter4testing(true); - - /* Snap the state from current meta-head */ - txn->mt_txnid = snap; - txn->mt_next_pgno = meta->mm_geo.next; - txn->mt_end_pgno = meta->mm_geo.now; - upper_pgno = meta->mm_geo.upper; - memcpy(txn->mt_dbs, meta->mm_dbs, CORE_DBS * sizeof(MDBX_db)); - txn->mt_canary = meta->mm_canary; - - /* LY: Retry on a race, ITS#7970. */ - mdbx_compiler_barrier(); - if (likely(meta == mdbx_meta_head(env) && - snap == mdbx_meta_txnid_fluid(env, meta) && - snap >= *env->me_oldest)) { - mdbx_jitter4testing(false); - break; - } - } - - if (unlikely(txn->mt_txnid == 0)) { - mdbx_error("environment corrupted by died writer, must shutdown!"); - rc = MDBX_WANNA_RECOVERY; - goto bailout; - } - mdbx_assert(env, txn->mt_txnid >= *env->me_oldest); - txn->mt_ro_reader = r; - txn->mt_dbxs = env->me_dbxs; /* mostly static anyway */ - } else { - /* Not yet touching txn == env->me_txn0, it may be active */ - mdbx_jitter4testing(false); - rc = mdbx_txn_lock(env, F_ISSET(flags, MDBX_TRYTXN)); - if (unlikely(rc)) - return rc; - - mdbx_jitter4testing(false); - MDBX_meta *meta = mdbx_meta_head(env); - mdbx_jitter4testing(false); - txn->mt_canary = meta->mm_canary; - const txnid_t snap = mdbx_meta_txnid_stable(env, meta); - txn->mt_txnid = snap + 1; - if (unlikely(txn->mt_txnid < snap)) { - mdbx_debug("txnid overflow!"); - rc = MDBX_TXN_FULL; - goto bailout; - } - - txn->mt_flags = flags; - txn->mt_child = NULL; - txn->mt_loose_pages = NULL; - txn->mt_loose_count = 0; - txn->mt_dirtyroom = MDBX_PNL_UM_MAX; - txn->mt_rw_dirtylist = env->me_dirtylist; - txn->mt_rw_dirtylist[0].mid = 0; - txn->mt_befree_pages = env->me_free_pgs; - txn->mt_befree_pages[0] = 0; - txn->mt_spill_pages = NULL; - if (txn->mt_lifo_reclaimed) - txn->mt_lifo_reclaimed[0] = 0; - env->me_txn = txn; - memcpy(txn->mt_dbiseqs, env->me_dbiseqs, env->me_maxdbs * sizeof(unsigned)); - /* Copy the DB info and flags */ - memcpy(txn->mt_dbs, meta->mm_dbs, CORE_DBS * sizeof(MDBX_db)); - /* Moved to here to avoid a data race in read TXNs */ - txn->mt_next_pgno = meta->mm_geo.next; - txn->mt_end_pgno = meta->mm_geo.now; - upper_pgno = meta->mm_geo.upper; - } - - /* Setup db info */ - txn->mt_numdbs = env->me_numdbs; - for (unsigned i = CORE_DBS; i < txn->mt_numdbs; i++) { - unsigned x = env->me_dbflags[i]; - txn->mt_dbs[i].md_flags = x & PERSISTENT_FLAGS; - txn->mt_dbflags[i] = - (x & MDBX_VALID) ? DB_VALID | DB_USRVALID | DB_STALE : 0; - } - txn->mt_dbflags[MAIN_DBI] = DB_VALID | DB_USRVALID; - txn->mt_dbflags[FREE_DBI] = DB_VALID; - - if (unlikely(env->me_flags & MDBX_FATAL_ERROR)) { - mdbx_warning("environment had fatal error, must shutdown!"); - rc = MDBX_PANIC; - } else { - const size_t size = pgno2bytes(env, txn->mt_end_pgno); - if (unlikely(size > env->me_mapsize)) { - if (upper_pgno > MAX_PAGENO || - bytes2pgno(env, pgno2bytes(env, upper_pgno)) != upper_pgno) { - rc = MDBX_MAP_RESIZED; - goto bailout; - } - rc = mdbx_mapresize(env, txn->mt_end_pgno, upper_pgno); - if (rc != MDBX_SUCCESS) - goto bailout; - } - txn->mt_owner = mdbx_thread_self(); - return MDBX_SUCCESS; - } -bailout: - assert(rc != MDBX_SUCCESS); - mdbx_txn_end(txn, MDBX_END_SLOT | MDBX_END_FAIL_BEGIN); - return rc; -} - -int mdbx_txn_renew(MDBX_txn *txn) { - int rc; - - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(!F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY | MDBX_TXN_FINISHED))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_owner != 0)) - return MDBX_THREAD_MISMATCH; - - rc = mdbx_txn_renew0(txn, MDBX_TXN_RDONLY); - if (rc == MDBX_SUCCESS) { - txn->mt_owner = mdbx_thread_self(); - mdbx_debug("renew txn %" PRIaTXN "%c %p on env %p, root page %" PRIaPGNO - "/%" PRIaPGNO, - txn->mt_txnid, (txn->mt_flags & MDBX_TXN_RDONLY) ? 'r' : 'w', - (void *)txn, (void *)txn->mt_env, txn->mt_dbs[MAIN_DBI].md_root, - txn->mt_dbs[FREE_DBI].md_root); - } - return rc; -} - -int mdbx_txn_begin(MDBX_env *env, MDBX_txn *parent, unsigned flags, - MDBX_txn **ret) { - MDBX_txn *txn; - MDBX_ntxn *ntxn; - int rc, size, tsize; - - if (unlikely(!env || !ret)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(env->me_pid != mdbx_getpid())) { - env->me_flags |= MDBX_FATAL_ERROR; - return MDBX_PANIC; - } - - if (unlikely(!env->me_map)) - return MDBX_EPERM; - - flags &= MDBX_TXN_BEGIN_FLAGS; - flags |= env->me_flags & MDBX_WRITEMAP; - - if (unlikely(env->me_flags & MDBX_RDONLY & - ~flags)) /* write txn in RDONLY env */ - return MDBX_EACCESS; - - if (parent) { - if (unlikely(parent->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EINVAL; - - if (unlikely(parent->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - /* Nested transactions: Max 1 child, write txns only, no writemap */ - flags |= parent->mt_flags; - if (unlikely(flags & (MDBX_RDONLY | MDBX_WRITEMAP | MDBX_TXN_BLOCKED))) { - return (parent->mt_flags & MDBX_TXN_RDONLY) ? MDBX_EINVAL : MDBX_BAD_TXN; - } - /* Child txns save MDBX_pgstate and use own copy of cursors */ - size = env->me_maxdbs * (sizeof(MDBX_db) + sizeof(MDBX_cursor *) + 1); - size += tsize = sizeof(MDBX_ntxn); - } else if (flags & MDBX_RDONLY) { - size = env->me_maxdbs * (sizeof(MDBX_db) + 1); - size += tsize = sizeof(MDBX_txn); - } else { - /* Reuse preallocated write txn. However, do not touch it until - * mdbx_txn_renew0() succeeds, since it currently may be active. */ - txn = env->me_txn0; - goto renew; - } - if (unlikely((txn = calloc(1, size)) == NULL)) { - mdbx_debug("calloc: %s", "failed"); - return MDBX_ENOMEM; - } - txn->mt_dbxs = env->me_dbxs; /* static */ - txn->mt_dbs = (MDBX_db *)((char *)txn + tsize); - txn->mt_dbflags = (uint8_t *)txn + size - env->me_maxdbs; - txn->mt_flags = flags; - txn->mt_env = env; - - if (parent) { - unsigned i; - txn->mt_cursors = (MDBX_cursor **)(txn->mt_dbs + env->me_maxdbs); - txn->mt_dbiseqs = parent->mt_dbiseqs; - txn->mt_rw_dirtylist = malloc(sizeof(MDBX_ID2) * MDBX_PNL_UM_SIZE); - if (!txn->mt_rw_dirtylist || - !(txn->mt_befree_pages = mdbx_pnl_alloc(MDBX_PNL_UM_MAX))) { - free(txn->mt_rw_dirtylist); - free(txn); - return MDBX_ENOMEM; - } - txn->mt_txnid = parent->mt_txnid; - txn->mt_dirtyroom = parent->mt_dirtyroom; - txn->mt_rw_dirtylist[0].mid = 0; - txn->mt_spill_pages = NULL; - txn->mt_next_pgno = parent->mt_next_pgno; - txn->mt_end_pgno = parent->mt_end_pgno; - parent->mt_flags |= MDBX_TXN_HAS_CHILD; - parent->mt_child = txn; - txn->mt_parent = parent; - txn->mt_numdbs = parent->mt_numdbs; - memcpy(txn->mt_dbs, parent->mt_dbs, txn->mt_numdbs * sizeof(MDBX_db)); - /* Copy parent's mt_dbflags, but clear DB_NEW */ - for (i = 0; i < txn->mt_numdbs; i++) - txn->mt_dbflags[i] = parent->mt_dbflags[i] & ~DB_NEW; - rc = 0; - ntxn = (MDBX_ntxn *)txn; - ntxn->mnt_pgstate = - env->me_pgstate; /* save parent me_reclaimed_pglist & co */ - if (env->me_reclaimed_pglist) { - size = MDBX_PNL_SIZEOF(env->me_reclaimed_pglist); - env->me_reclaimed_pglist = mdbx_pnl_alloc(env->me_reclaimed_pglist[0]); - if (likely(env->me_reclaimed_pglist)) - memcpy(env->me_reclaimed_pglist, ntxn->mnt_pgstate.mf_reclaimed_pglist, - size); - else - rc = MDBX_ENOMEM; - } - if (likely(!rc)) - rc = mdbx_cursor_shadow(parent, txn); - if (unlikely(rc)) - mdbx_txn_end(txn, MDBX_END_FAIL_BEGINCHILD); - } else { /* MDBX_RDONLY */ - txn->mt_dbiseqs = env->me_dbiseqs; - renew: - rc = mdbx_txn_renew0(txn, flags); - } - - if (unlikely(rc)) { - if (txn != env->me_txn0) - free(txn); - } else { - txn->mt_signature = MDBX_MT_SIGNATURE; - *ret = txn; - mdbx_debug("begin txn %" PRIaTXN "%c %p on env %p, root page %" PRIaPGNO - "/%" PRIaPGNO, - txn->mt_txnid, (flags & MDBX_RDONLY) ? 'r' : 'w', (void *)txn, - (void *)env, txn->mt_dbs[MAIN_DBI].md_root, - txn->mt_dbs[FREE_DBI].md_root); - } - - return rc; -} - -MDBX_env *mdbx_txn_env(MDBX_txn *txn) { - if (unlikely(!txn || txn->mt_signature != MDBX_MT_SIGNATURE)) - return NULL; - return txn->mt_env; -} - -uint64_t mdbx_txn_id(MDBX_txn *txn) { - if (unlikely(!txn || txn->mt_signature != MDBX_MT_SIGNATURE)) - return ~(txnid_t)0; - return txn->mt_txnid; -} - -/* Export or close DBI handles opened in this txn. */ -static void mdbx_dbis_update(MDBX_txn *txn, int keep) { - MDBX_dbi n = txn->mt_numdbs; - if (n) { - MDBX_env *env = txn->mt_env; - uint8_t *tdbflags = txn->mt_dbflags; - - for (unsigned i = n; --i >= CORE_DBS;) { - if (tdbflags[i] & DB_NEW) { - if (keep) { - env->me_dbflags[i] = txn->mt_dbs[i].md_flags | MDBX_VALID; - } else { - char *ptr = env->me_dbxs[i].md_name.iov_base; - if (ptr) { - env->me_dbxs[i].md_name.iov_base = NULL; - env->me_dbxs[i].md_name.iov_len = 0; - env->me_dbflags[i] = 0; - env->me_dbiseqs[i]++; - free(ptr); - } - } - } - } - if (keep && env->me_numdbs < n) - env->me_numdbs = n; - } -} - -/* End a transaction, except successful commit of a nested transaction. - * May be called twice for readonly txns: First reset it, then abort. - * [in] txn the transaction handle to end - * [in] mode why and how to end the transaction */ -static int mdbx_txn_end(MDBX_txn *txn, unsigned mode) { - MDBX_env *env = txn->mt_env; - static const char *const names[] = MDBX_END_NAMES; - - if (unlikely(txn->mt_env->me_pid != mdbx_getpid())) { - env->me_flags |= MDBX_FATAL_ERROR; - return MDBX_PANIC; - } - - /* Export or close DBI handles opened in this txn */ - mdbx_dbis_update(txn, mode & MDBX_END_UPDATE); - - mdbx_debug("%s txn %" PRIaTXN "%c %p on mdbenv %p, root page %" PRIaPGNO - "/%" PRIaPGNO, - names[mode & MDBX_END_OPMASK], txn->mt_txnid, - (txn->mt_flags & MDBX_TXN_RDONLY) ? 'r' : 'w', (void *)txn, - (void *)env, txn->mt_dbs[MAIN_DBI].md_root, - txn->mt_dbs[FREE_DBI].md_root); - - if (F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY)) { - if (txn->mt_ro_reader) { - txn->mt_ro_reader->mr_txnid = ~(txnid_t)0; - env->me_lck->mti_readers_refresh_flag = true; - if (mode & MDBX_END_SLOT) { - if ((env->me_flags & MDBX_ENV_TXKEY) == 0) - txn->mt_ro_reader->mr_pid = 0; - txn->mt_ro_reader = NULL; - } - } - mdbx_coherent_barrier(); - txn->mt_numdbs = 0; /* prevent further DBI activity */ - txn->mt_flags |= MDBX_TXN_FINISHED; - txn->mt_owner = 0; - } else if (!F_ISSET(txn->mt_flags, MDBX_TXN_FINISHED)) { - pgno_t *pghead = env->me_reclaimed_pglist; - - if (!(mode & MDBX_END_EOTDONE)) /* !(already closed cursors) */ - mdbx_cursors_eot(txn, 0); - if (!(env->me_flags & MDBX_WRITEMAP)) { - mdbx_dlist_free(txn); - } - - if (txn->mt_lifo_reclaimed) { - txn->mt_lifo_reclaimed[0] = 0; - if (txn != env->me_txn0) { - mdbx_txl_free(txn->mt_lifo_reclaimed); - txn->mt_lifo_reclaimed = NULL; - } - } - txn->mt_numdbs = 0; - txn->mt_flags = MDBX_TXN_FINISHED; - - if (!txn->mt_parent) { - mdbx_pnl_shrink(&txn->mt_befree_pages); - env->me_free_pgs = txn->mt_befree_pages; - /* me_pgstate: */ - env->me_reclaimed_pglist = NULL; - env->me_last_reclaimed = 0; - - env->me_txn = NULL; - txn->mt_owner = 0; - txn->mt_signature = 0; - mode = 0; /* txn == env->me_txn0, do not free() it */ - - /* The writer mutex was locked in mdbx_txn_begin. */ - mdbx_txn_unlock(env); - } else { - txn->mt_parent->mt_child = NULL; - txn->mt_parent->mt_flags &= ~MDBX_TXN_HAS_CHILD; - env->me_pgstate = ((MDBX_ntxn *)txn)->mnt_pgstate; - mdbx_pnl_free(txn->mt_befree_pages); - mdbx_pnl_free(txn->mt_spill_pages); - free(txn->mt_rw_dirtylist); - } - - mdbx_pnl_free(pghead); - } - - if (mode & MDBX_END_FREE) { - mdbx_ensure(env, txn != env->me_txn0); - txn->mt_owner = 0; - txn->mt_signature = 0; - free(txn); - } - - return MDBX_SUCCESS; -} - -int mdbx_txn_reset(MDBX_txn *txn) { - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - /* This call is only valid for read-only txns */ - if (unlikely(!(txn->mt_flags & MDBX_TXN_RDONLY))) - return MDBX_EINVAL; - - /* LY: don't close DBI-handles in MDBX mode */ - int rc = mdbx_txn_end(txn, MDBX_END_RESET | MDBX_END_UPDATE); - if (rc == MDBX_SUCCESS) { - assert(txn->mt_signature == MDBX_MT_SIGNATURE); - assert(txn->mt_owner == 0); - } - return rc; -} - -int mdbx_txn_abort(MDBX_txn *txn) { - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != - ((txn->mt_flags & MDBX_TXN_FINISHED) ? 0 : mdbx_thread_self()))) - return MDBX_THREAD_MISMATCH; - - if (F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY)) - /* LY: don't close DBI-handles in MDBX mode */ - return mdbx_txn_end(txn, MDBX_END_ABORT | MDBX_END_UPDATE | MDBX_END_SLOT | - MDBX_END_FREE); - - if (txn->mt_child) - mdbx_txn_abort(txn->mt_child); - - return mdbx_txn_end(txn, MDBX_END_ABORT | MDBX_END_SLOT | MDBX_END_FREE); -} - -static __inline int mdbx_backlog_size(MDBX_txn *txn) { - int reclaimed = txn->mt_env->me_reclaimed_pglist - ? txn->mt_env->me_reclaimed_pglist[0] - : 0; - return reclaimed + txn->mt_loose_count + txn->mt_end_pgno - txn->mt_next_pgno; -} - -/* LY: Prepare a backlog of pages to modify FreeDB itself, - * while reclaiming is prohibited. It should be enough to prevent search - * in mdbx_page_alloc() during a deleting, when freeDB tree is unbalanced. */ -static int mdbx_prep_backlog(MDBX_txn *txn, MDBX_cursor *mc) { - /* LY: extra page(s) for b-tree rebalancing */ - const int extra = (txn->mt_env->me_flags & MDBX_LIFORECLAIM) ? 2 : 1; - - if (mdbx_backlog_size(txn) < mc->mc_db->md_depth + extra) { - int rc = mdbx_cursor_touch(mc); - if (unlikely(rc)) - return rc; - - int backlog; - while (unlikely((backlog = mdbx_backlog_size(txn)) < extra)) { - rc = mdbx_page_alloc(mc, 1, NULL, MDBX_ALLOC_GC); - if (unlikely(rc)) { - if (unlikely(rc != MDBX_NOTFOUND)) - return rc; - break; - } - } - } - - return MDBX_SUCCESS; -} - -/* Save the freelist as of this transaction to the freeDB. - * This changes the freelist. Keep trying until it stabilizes. */ -static int mdbx_freelist_save(MDBX_txn *txn) { - /* env->me_reclaimed_pglist[] can grow and shrink during this call. - * env->me_last_reclaimed and txn->mt_free_pages[] can only grow. - * Page numbers cannot disappear from txn->mt_free_pages[]. */ - MDBX_cursor mc; - MDBX_env *env = txn->mt_env; - int rc, more = 1; - txnid_t cleanup_reclaimed_id = 0, head_id = 0; - pgno_t befree_count = 0; - intptr_t head_room = 0, total_room = 0; - unsigned cleanup_reclaimed_pos = 0, refill_reclaimed_pos = 0; - const bool lifo = (env->me_flags & MDBX_LIFORECLAIM) != 0; - - mdbx_cursor_init(&mc, txn, FREE_DBI, NULL); - - /* MDBX_RESERVE cancels meminit in ovpage malloc (when no WRITEMAP) */ - const intptr_t clean_limit = - (env->me_flags & (MDBX_NOMEMINIT | MDBX_WRITEMAP)) ? SSIZE_MAX - : env->me_maxfree_1pg; - - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); -again_on_freelist_change: - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - while (1) { - /* Come back here after each Put() in case freelist changed */ - MDBX_val key, data; - - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - if (!lifo) { - /* If using records from freeDB which we have not yet deleted, - * now delete them and any we reserved for me_reclaimed_pglist. */ - while (cleanup_reclaimed_id < env->me_last_reclaimed) { - rc = mdbx_cursor_first(&mc, &key, NULL); - if (unlikely(rc)) - goto bailout; - rc = mdbx_prep_backlog(txn, &mc); - if (unlikely(rc)) - goto bailout; - cleanup_reclaimed_id = head_id = *(txnid_t *)key.iov_base; - total_room = head_room = 0; - more = 1; - mdbx_tassert(txn, cleanup_reclaimed_id <= env->me_last_reclaimed); - mc.mc_flags |= C_RECLAIMING; - rc = mdbx_cursor_del(&mc, 0); - mc.mc_flags ^= C_RECLAIMING; - if (unlikely(rc)) - goto bailout; - } - } else if (txn->mt_lifo_reclaimed) { - /* LY: cleanup reclaimed records. */ - while (cleanup_reclaimed_pos < txn->mt_lifo_reclaimed[0]) { - cleanup_reclaimed_id = txn->mt_lifo_reclaimed[++cleanup_reclaimed_pos]; - key.iov_base = &cleanup_reclaimed_id; - key.iov_len = sizeof(cleanup_reclaimed_id); - rc = mdbx_cursor_get(&mc, &key, NULL, MDBX_SET); - if (likely(rc != MDBX_NOTFOUND)) { - if (unlikely(rc)) - goto bailout; - rc = mdbx_prep_backlog(txn, &mc); - if (unlikely(rc)) - goto bailout; - mc.mc_flags |= C_RECLAIMING; - rc = mdbx_cursor_del(&mc, 0); - mc.mc_flags ^= C_RECLAIMING; - if (unlikely(rc)) - goto bailout; - } - } - } - - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - if (txn->mt_loose_pages) { - /* Return loose page numbers to me_reclaimed_pglist, - * though usually none are left at this point. - * The pages themselves remain in dirtylist. */ - if (unlikely(!env->me_reclaimed_pglist) && - !(lifo && env->me_last_reclaimed > 1)) { - /* Put loose page numbers in mt_free_pages, - * since unable to return them to me_reclaimed_pglist. */ - if (unlikely((rc = mdbx_pnl_need(&txn->mt_befree_pages, - txn->mt_loose_count)) != 0)) - return rc; - for (MDBX_page *mp = txn->mt_loose_pages; mp; mp = NEXT_LOOSE_PAGE(mp)) - mdbx_pnl_xappend(txn->mt_befree_pages, mp->mp_pgno); - } else { - /* Room for loose pages + temp PNL with same */ - if ((rc = mdbx_pnl_need(&env->me_reclaimed_pglist, - 2 * txn->mt_loose_count + 1)) != 0) - goto bailout; - MDBX_PNL loose = env->me_reclaimed_pglist + - MDBX_PNL_ALLOCLEN(env->me_reclaimed_pglist) - - txn->mt_loose_count; - unsigned count = 0; - for (MDBX_page *mp = txn->mt_loose_pages; mp; mp = NEXT_LOOSE_PAGE(mp)) - loose[++count] = mp->mp_pgno; - loose[0] = count; - mdbx_pnl_sort(loose); - mdbx_pnl_xmerge(env->me_reclaimed_pglist, loose); - } - - MDBX_ID2L dl = txn->mt_rw_dirtylist; - for (MDBX_page *mp = txn->mt_loose_pages; mp;) { - mdbx_tassert(txn, mp->mp_pgno < txn->mt_next_pgno); - mdbx_ensure(env, mp->mp_pgno >= NUM_METAS); - - unsigned s, d; - for (s = d = 0; ++s <= dl[0].mid;) - if (dl[s].mid != mp->mp_pgno) - dl[++d] = dl[s]; - - dl[0].mid -= 1; - mdbx_tassert(txn, dl[0].mid == d); - - MDBX_page *dp = mp; - mp = NEXT_LOOSE_PAGE(mp); - if ((env->me_flags & MDBX_WRITEMAP) == 0) - mdbx_dpage_free(env, dp); - } - - txn->mt_loose_pages = NULL; - txn->mt_loose_count = 0; - } - - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - if (env->me_reclaimed_pglist) { - /* Refund suitable pages into "unallocated" space */ - pgno_t tail = txn->mt_next_pgno; - pgno_t *const begin = env->me_reclaimed_pglist + 1; - pgno_t *const end = begin + env->me_reclaimed_pglist[0]; - pgno_t *higest; -#if MDBX_PNL_ASCENDING - for (higest = end; --higest >= begin;) { -#else - for (higest = begin; higest < end; ++higest) { -#endif /* MDBX_PNL sort-order */ - mdbx_tassert(txn, *higest >= NUM_METAS && *higest < tail); - if (*higest != tail - 1) - break; - tail -= 1; - } - if (tail != txn->mt_next_pgno) { -#if MDBX_PNL_ASCENDING - env->me_reclaimed_pglist[0] = (unsigned)(higest + 1 - begin); -#else - env->me_reclaimed_pglist[0] -= (unsigned)(higest - begin); - for (pgno_t *move = begin; higest < end; ++move, ++higest) - *move = *higest; -#endif /* MDBX_PNL sort-order */ - mdbx_info("refunded %" PRIaPGNO " pages: %" PRIaPGNO " -> %" PRIaPGNO, - tail - txn->mt_next_pgno, tail, txn->mt_next_pgno); - txn->mt_next_pgno = tail; - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - } - } - - /* Save the PNL of pages freed by this txn, to a single record */ - if (befree_count < txn->mt_befree_pages[0]) { - if (unlikely(!befree_count)) { - /* Make sure last page of freeDB is touched and on freelist */ - rc = mdbx_page_search(&mc, NULL, MDBX_PS_LAST | MDBX_PS_MODIFY); - if (unlikely(rc && rc != MDBX_NOTFOUND)) - goto bailout; - } - pgno_t *befree_pages = txn->mt_befree_pages; - /* Write to last page of freeDB */ - key.iov_len = sizeof(txn->mt_txnid); - key.iov_base = &txn->mt_txnid; - do { - befree_count = befree_pages[0]; - data.iov_len = MDBX_PNL_SIZEOF(befree_pages); - rc = mdbx_cursor_put(&mc, &key, &data, MDBX_RESERVE); - if (unlikely(rc)) - goto bailout; - /* Retry if mt_free_pages[] grew during the Put() */ - befree_pages = txn->mt_befree_pages; - } while (befree_count < befree_pages[0]); - - mdbx_pnl_sort(befree_pages); - memcpy(data.iov_base, befree_pages, data.iov_len); - - if (mdbx_debug_enabled(MDBX_DBG_EXTRA)) { - unsigned i = (unsigned)befree_pages[0]; - mdbx_debug_extra("PNL write txn %" PRIaTXN " root %" PRIaPGNO - " num %u, PNL", - txn->mt_txnid, txn->mt_dbs[FREE_DBI].md_root, i); - for (; i; i--) - mdbx_debug_extra_print(" %" PRIaPGNO "", befree_pages[i]); - mdbx_debug_extra_print("\n"); - } - continue; - } - - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - const intptr_t rpl_len = - (env->me_reclaimed_pglist ? env->me_reclaimed_pglist[0] : 0) + - txn->mt_loose_count; - if (rpl_len && refill_reclaimed_pos == 0) - refill_reclaimed_pos = 1; - - /* Reserve records for me_reclaimed_pglist[]. Split it if multi-page, - * to avoid searching freeDB for a page range. Use keys in - * range [1,me_last_reclaimed]: Smaller than txnid of oldest reader. */ - if (total_room >= rpl_len) { - if (total_room == rpl_len || --more < 0) - break; - } else if (head_room >= (intptr_t)env->me_maxfree_1pg && head_id > 1) { - /* Keep current record (overflow page), add a new one */ - head_id--; - refill_reclaimed_pos++; - head_room = 0; - } - - if (lifo) { - if (refill_reclaimed_pos > - (txn->mt_lifo_reclaimed ? txn->mt_lifo_reclaimed[0] : 0)) { - /* LY: need just a txn-id for save page list. */ - rc = mdbx_page_alloc(&mc, 0, NULL, MDBX_ALLOC_GC | MDBX_ALLOC_KICK); - if (likely(rc == 0)) - /* LY: ok, reclaimed from freedb. */ - continue; - if (unlikely(rc != MDBX_NOTFOUND)) - /* LY: other troubles... */ - goto bailout; - - /* LY: freedb is empty, will look any free txn-id in high2low order. */ - if (unlikely(env->me_last_reclaimed < 1)) { - /* LY: not any txn in the past of freedb. */ - rc = MDBX_MAP_FULL; - goto bailout; - } - - if (unlikely(!txn->mt_lifo_reclaimed)) { - txn->mt_lifo_reclaimed = mdbx_txl_alloc(); - if (unlikely(!txn->mt_lifo_reclaimed)) { - rc = MDBX_ENOMEM; - goto bailout; - } - } - /* LY: append the list. */ - rc = mdbx_txl_append(&txn->mt_lifo_reclaimed, - env->me_last_reclaimed - 1); - if (unlikely(rc)) - goto bailout; - --env->me_last_reclaimed; - /* LY: note that freeDB cleanup is not needed. */ - ++cleanup_reclaimed_pos; - } - mdbx_tassert(txn, txn->mt_lifo_reclaimed != NULL); - head_id = txn->mt_lifo_reclaimed[refill_reclaimed_pos]; - } else { - mdbx_tassert(txn, txn->mt_lifo_reclaimed == NULL); - } - - /* (Re)write {key = head_id, PNL length = head_room} */ - total_room -= head_room; - head_room = rpl_len - total_room; - if (head_room > (intptr_t)env->me_maxfree_1pg && head_id > 1) { - /* Overflow multi-page for part of me_reclaimed_pglist */ - head_room /= (head_id < INT16_MAX) ? (pgno_t)head_id - : INT16_MAX; /* amortize page sizes */ - head_room += env->me_maxfree_1pg - head_room % (env->me_maxfree_1pg + 1); - } else if (head_room < 0) { - /* Rare case, not bothering to delete this record */ - head_room = 0; - continue; - } - key.iov_len = sizeof(head_id); - key.iov_base = &head_id; - data.iov_len = (head_room + 1) * sizeof(pgno_t); - rc = mdbx_cursor_put(&mc, &key, &data, MDBX_RESERVE); - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - if (unlikely(rc)) - goto bailout; - - /* PNL is initially empty, zero out at least the length */ - pgno_t *pgs = (pgno_t *)data.iov_base; - intptr_t i = head_room > clean_limit ? head_room : 0; - do { - pgs[i] = 0; - } while (--i >= 0); - total_room += head_room; - continue; - } - - mdbx_tassert(txn, - cleanup_reclaimed_pos == - (txn->mt_lifo_reclaimed ? txn->mt_lifo_reclaimed[0] : 0)); - - /* Fill in the reserved me_reclaimed_pglist records */ - rc = MDBX_SUCCESS; - mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist)); - if (env->me_reclaimed_pglist && env->me_reclaimed_pglist[0]) { - MDBX_val key, data; - key.iov_len = data.iov_len = 0; /* avoid MSVC warning */ - key.iov_base = data.iov_base = NULL; - - size_t rpl_left = env->me_reclaimed_pglist[0]; - pgno_t *rpl_end = env->me_reclaimed_pglist + rpl_left; - if (txn->mt_lifo_reclaimed == 0) { - mdbx_tassert(txn, lifo == 0); - rc = mdbx_cursor_first(&mc, &key, &data); - if (unlikely(rc)) - goto bailout; - } else { - mdbx_tassert(txn, lifo != 0); - } - - while (1) { - txnid_t id; - if (txn->mt_lifo_reclaimed == 0) { - mdbx_tassert(txn, lifo == 0); - id = *(txnid_t *)key.iov_base; - mdbx_tassert(txn, id <= env->me_last_reclaimed); - } else { - mdbx_tassert(txn, lifo != 0); - mdbx_tassert(txn, - refill_reclaimed_pos > 0 && - refill_reclaimed_pos <= txn->mt_lifo_reclaimed[0]); - id = txn->mt_lifo_reclaimed[refill_reclaimed_pos--]; - key.iov_base = &id; - key.iov_len = sizeof(id); - rc = mdbx_cursor_get(&mc, &key, &data, MDBX_SET); - if (unlikely(rc)) - goto bailout; - } - mdbx_tassert( - txn, cleanup_reclaimed_pos == - (txn->mt_lifo_reclaimed ? txn->mt_lifo_reclaimed[0] : 0)); - - mdbx_tassert(txn, data.iov_len >= sizeof(pgno_t) * 2); - size_t chunk_len = (data.iov_len / sizeof(pgno_t)) - 1; - if (chunk_len > rpl_left) - chunk_len = rpl_left; - data.iov_len = (chunk_len + 1) * sizeof(pgno_t); - key.iov_base = &id; - key.iov_len = sizeof(id); - - rpl_end -= chunk_len; - data.iov_base = rpl_end; - pgno_t save = rpl_end[0]; - rpl_end[0] = (pgno_t)chunk_len; - mdbx_tassert(txn, mdbx_pnl_check(rpl_end)); - mc.mc_flags |= C_RECLAIMING; - rc = mdbx_cursor_put(&mc, &key, &data, MDBX_CURRENT); - mc.mc_flags ^= C_RECLAIMING; - mdbx_tassert(txn, mdbx_pnl_check(rpl_end)); - mdbx_tassert( - txn, cleanup_reclaimed_pos == - (txn->mt_lifo_reclaimed ? txn->mt_lifo_reclaimed[0] : 0)); - rpl_end[0] = save; - if (unlikely(rc)) - goto bailout; - - rpl_left -= chunk_len; - if (rpl_left == 0) - break; - - if (!lifo) { - rc = mdbx_cursor_next(&mc, &key, &data, MDBX_NEXT); - if (unlikely(rc)) - goto bailout; - } - } - } - -bailout: - if (txn->mt_lifo_reclaimed) { - mdbx_tassert(txn, rc || cleanup_reclaimed_pos == txn->mt_lifo_reclaimed[0]); - if (rc == MDBX_SUCCESS && - cleanup_reclaimed_pos != txn->mt_lifo_reclaimed[0]) { - mdbx_tassert(txn, cleanup_reclaimed_pos < txn->mt_lifo_reclaimed[0]); - /* LY: zeroed cleanup_idx to force cleanup - * and refill created freeDB records. */ - cleanup_reclaimed_pos = 0; - /* LY: restart filling */ - total_room = head_room = refill_reclaimed_pos = 0; - more = 1; - goto again_on_freelist_change; - } - txn->mt_lifo_reclaimed[0] = 0; - if (txn != env->me_txn0) { - mdbx_txl_free(txn->mt_lifo_reclaimed); - txn->mt_lifo_reclaimed = NULL; - } - } - - return rc; -} - -/* Flush (some) dirty pages to the map, after clearing their dirty flag. - * [in] txn the transaction that's being committed - * [in] keep number of initial pages in dirtylist to keep dirty. - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_flush(MDBX_txn *txn, pgno_t keep) { - MDBX_env *env = txn->mt_env; - MDBX_ID2L dl = txn->mt_rw_dirtylist; - unsigned i, j, pagecount = dl[0].mid; - int rc; - size_t size = 0, pos = 0; - pgno_t pgno = 0; - MDBX_page *dp = NULL; - struct iovec iov[MDBX_COMMIT_PAGES]; - intptr_t wpos = 0, wsize = 0; - size_t next_pos = 1; /* impossible pos, so pos != next_pos */ - int n = 0; - - j = i = keep; - - if (env->me_flags & MDBX_WRITEMAP) { - /* Clear dirty flags */ - while (++i <= pagecount) { - dp = dl[i].mptr; - /* Don't flush this page yet */ - if (dp->mp_flags & (P_LOOSE | P_KEEP)) { - dp->mp_flags &= ~P_KEEP; - dl[++j] = dl[i]; - continue; - } - dp->mp_flags &= ~P_DIRTY; - dp->mp_validator = 0 /* TODO */; - env->me_sync_pending += - IS_OVERFLOW(dp) ? pgno2bytes(env, dp->mp_pages) : env->me_psize; - } - goto done; - } - - /* Write the pages */ - for (;;) { - if (++i <= pagecount) { - dp = dl[i].mptr; - /* Don't flush this page yet */ - if (dp->mp_flags & (P_LOOSE | P_KEEP)) { - dp->mp_flags &= ~P_KEEP; - dl[i].mid = 0; - continue; - } - pgno = dl[i].mid; - /* clear dirty flag */ - dp->mp_flags &= ~P_DIRTY; - dp->mp_validator = 0 /* TODO */; - pos = pgno2bytes(env, pgno); - size = IS_OVERFLOW(dp) ? pgno2bytes(env, dp->mp_pages) : env->me_psize; - env->me_sync_pending += size; - } - /* Write up to MDBX_COMMIT_PAGES dirty pages at a time. */ - if (pos != next_pos || n == MDBX_COMMIT_PAGES || wsize + size > MAX_WRITE) { - if (n) { - /* Write previous page(s) */ - rc = mdbx_pwritev(env->me_fd, iov, n, wpos, wsize); - if (unlikely(rc != MDBX_SUCCESS)) { - mdbx_debug("Write error: %s", strerror(rc)); - return rc; - } - n = 0; - } - if (i > pagecount) - break; - wpos = pos; - wsize = 0; - } - mdbx_debug("committing page %" PRIaPGNO "", pgno); - next_pos = pos + size; - iov[n].iov_len = size; - iov[n].iov_base = (char *)dp; - wsize += size; - n++; - } - - mdbx_invalidate_cache(env->me_map, pgno2bytes(env, txn->mt_next_pgno)); - - for (i = keep; ++i <= pagecount;) { - dp = dl[i].mptr; - /* This is a page we skipped above */ - if (!dl[i].mid) { - dl[++j] = dl[i]; - dl[j].mid = dp->mp_pgno; - continue; - } - mdbx_dpage_free(env, dp); - } - -done: - i--; - txn->mt_dirtyroom += i - j; - dl[0].mid = j; - return MDBX_SUCCESS; -} - -int mdbx_txn_commit(MDBX_txn *txn) { - int rc; - - if (unlikely(txn == NULL)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - MDBX_env *env = txn->mt_env; - if (unlikely(env->me_pid != mdbx_getpid())) { - env->me_flags |= MDBX_FATAL_ERROR; - return MDBX_PANIC; - } - - if (txn->mt_child) { - rc = mdbx_txn_commit(txn->mt_child); - txn->mt_child = NULL; - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - } - - /* mdbx_txn_end() mode for a commit which writes nothing */ - unsigned end_mode = - MDBX_END_EMPTY_COMMIT | MDBX_END_UPDATE | MDBX_END_SLOT | MDBX_END_FREE; - if (unlikely(F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY))) - goto done; - - if (unlikely(txn->mt_flags & (MDBX_TXN_FINISHED | MDBX_TXN_ERROR))) { - mdbx_debug("error flag is set, can't commit"); - if (txn->mt_parent) - txn->mt_parent->mt_flags |= MDBX_TXN_ERROR; - rc = MDBX_BAD_TXN; - goto fail; - } - - if (txn->mt_parent) { - MDBX_txn *parent = txn->mt_parent; - MDBX_page **lp; - MDBX_ID2L dst, src; - MDBX_PNL pspill; - unsigned i, x, y, len, ps_len; - - /* Append our reclaim list to parent's */ - if (txn->mt_lifo_reclaimed) { - if (parent->mt_lifo_reclaimed) { - rc = mdbx_txl_append_list(&parent->mt_lifo_reclaimed, - txn->mt_lifo_reclaimed); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - mdbx_txl_free(txn->mt_lifo_reclaimed); - } else - parent->mt_lifo_reclaimed = txn->mt_lifo_reclaimed; - txn->mt_lifo_reclaimed = NULL; - } - - /* Append our free list to parent's */ - rc = mdbx_pnl_append_list(&parent->mt_befree_pages, txn->mt_befree_pages); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - mdbx_pnl_free(txn->mt_befree_pages); - /* Failures after this must either undo the changes - * to the parent or set MDBX_TXN_ERROR in the parent. */ - - parent->mt_next_pgno = txn->mt_next_pgno; - parent->mt_end_pgno = txn->mt_end_pgno; - parent->mt_flags = txn->mt_flags; - - /* Merge our cursors into parent's and close them */ - mdbx_cursors_eot(txn, 1); - - /* Update parent's DB table. */ - memcpy(parent->mt_dbs, txn->mt_dbs, txn->mt_numdbs * sizeof(MDBX_db)); - parent->mt_numdbs = txn->mt_numdbs; - parent->mt_dbflags[FREE_DBI] = txn->mt_dbflags[FREE_DBI]; - parent->mt_dbflags[MAIN_DBI] = txn->mt_dbflags[MAIN_DBI]; - for (i = CORE_DBS; i < txn->mt_numdbs; i++) { - /* preserve parent's DB_NEW status */ - parent->mt_dbflags[i] = - txn->mt_dbflags[i] | (parent->mt_dbflags[i] & DB_NEW); - } - - dst = parent->mt_rw_dirtylist; - src = txn->mt_rw_dirtylist; - /* Remove anything in our dirty list from parent's spill list */ - if ((pspill = parent->mt_spill_pages) && (ps_len = pspill[0])) { - x = y = ps_len; - pspill[0] = (pgno_t)-1; - /* Mark our dirty pages as deleted in parent spill list */ - for (i = 0, len = src[0].mid; ++i <= len;) { - pgno_t pn = src[i].mid << 1; - while (pn > pspill[x]) - x--; - if (pn == pspill[x]) { - pspill[x] = 1; - y = --x; - } - } - /* Squash deleted pagenums if we deleted any */ - for (x = y; ++x <= ps_len;) - if (!(pspill[x] & 1)) - pspill[++y] = pspill[x]; - pspill[0] = y; - } - - /* Remove anything in our spill list from parent's dirty list */ - if (txn->mt_spill_pages && txn->mt_spill_pages[0]) { - for (i = 1; i <= txn->mt_spill_pages[0]; i++) { - pgno_t pn = txn->mt_spill_pages[i]; - if (pn & 1) - continue; /* deleted spillpg */ - pn >>= 1; - y = mdbx_mid2l_search(dst, pn); - if (y <= dst[0].mid && dst[y].mid == pn) { - free(dst[y].mptr); - while (y < dst[0].mid) { - dst[y] = dst[y + 1]; - y++; - } - dst[0].mid--; - } - } - } - - /* Find len = length of merging our dirty list with parent's */ - x = dst[0].mid; - dst[0].mid = 0; /* simplify loops */ - if (parent->mt_parent) { - len = x + src[0].mid; - y = mdbx_mid2l_search(src, dst[x].mid + 1) - 1; - for (i = x; y && i; y--) { - pgno_t yp = src[y].mid; - while (yp < dst[i].mid) - i--; - if (yp == dst[i].mid) { - i--; - len--; - } - } - } else { /* Simplify the above for single-ancestor case */ - len = MDBX_PNL_UM_MAX - txn->mt_dirtyroom; - } - /* Merge our dirty list with parent's */ - y = src[0].mid; - for (i = len; y; dst[i--] = src[y--]) { - pgno_t yp = src[y].mid; - while (yp < dst[x].mid) - dst[i--] = dst[x--]; - if (yp == dst[x].mid) - free(dst[x--].mptr); - } - mdbx_tassert(txn, i == x); - dst[0].mid = len; - free(txn->mt_rw_dirtylist); - parent->mt_dirtyroom = txn->mt_dirtyroom; - if (txn->mt_spill_pages) { - if (parent->mt_spill_pages) { - /* TODO: Prevent failure here, so parent does not fail */ - rc = mdbx_pnl_append_list(&parent->mt_spill_pages, txn->mt_spill_pages); - if (unlikely(rc != MDBX_SUCCESS)) - parent->mt_flags |= MDBX_TXN_ERROR; - mdbx_pnl_free(txn->mt_spill_pages); - mdbx_pnl_sort(parent->mt_spill_pages); - } else { - parent->mt_spill_pages = txn->mt_spill_pages; - } - } - - /* Append our loose page list to parent's */ - for (lp = &parent->mt_loose_pages; *lp; lp = &NEXT_LOOSE_PAGE(*lp)) - ; - *lp = txn->mt_loose_pages; - parent->mt_loose_count += txn->mt_loose_count; - - parent->mt_child = NULL; - mdbx_pnl_free(((MDBX_ntxn *)txn)->mnt_pgstate.mf_reclaimed_pglist); - txn->mt_signature = 0; - free(txn); - return rc; - } - - if (unlikely(txn != env->me_txn)) { - mdbx_debug("attempt to commit unknown transaction"); - rc = MDBX_EINVAL; - goto fail; - } - - mdbx_cursors_eot(txn, 0); - end_mode |= MDBX_END_EOTDONE; - - if (!txn->mt_rw_dirtylist[0].mid && - !(txn->mt_flags & (MDBX_TXN_DIRTY | MDBX_TXN_SPILLS))) - goto done; - - mdbx_debug("committing txn %" PRIaTXN " %p on mdbenv %p, root page %" PRIaPGNO - "/%" PRIaPGNO, - txn->mt_txnid, (void *)txn, (void *)env, - txn->mt_dbs[MAIN_DBI].md_root, txn->mt_dbs[FREE_DBI].md_root); - - /* Update DB root pointers */ - if (txn->mt_numdbs > CORE_DBS) { - MDBX_cursor mc; - MDBX_dbi i; - MDBX_val data; - data.iov_len = sizeof(MDBX_db); - - mdbx_cursor_init(&mc, txn, MAIN_DBI, NULL); - for (i = CORE_DBS; i < txn->mt_numdbs; i++) { - if (txn->mt_dbflags[i] & DB_DIRTY) { - if (unlikely(TXN_DBI_CHANGED(txn, i))) { - rc = MDBX_BAD_DBI; - goto fail; - } - data.iov_base = &txn->mt_dbs[i]; - rc = mdbx_cursor_put(&mc, &txn->mt_dbxs[i].md_name, &data, F_SUBDATA); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - } - } - } - - rc = mdbx_freelist_save(txn); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - - mdbx_pnl_free(env->me_reclaimed_pglist); - env->me_reclaimed_pglist = NULL; - mdbx_pnl_shrink(&txn->mt_befree_pages); - - if (mdbx_audit_enabled()) - mdbx_audit(txn); - - rc = mdbx_page_flush(txn, 0); - if (likely(rc == MDBX_SUCCESS)) { - MDBX_meta meta, *head = mdbx_meta_head(env); - - meta.mm_magic_and_version = head->mm_magic_and_version; - meta.mm_extra_flags = head->mm_extra_flags; - meta.mm_validator_id = head->mm_validator_id; - meta.mm_extra_pagehdr = head->mm_extra_pagehdr; - - meta.mm_geo = head->mm_geo; - meta.mm_geo.next = txn->mt_next_pgno; - meta.mm_geo.now = txn->mt_end_pgno; - meta.mm_dbs[FREE_DBI] = txn->mt_dbs[FREE_DBI]; - meta.mm_dbs[MAIN_DBI] = txn->mt_dbs[MAIN_DBI]; - meta.mm_canary = txn->mt_canary; - mdbx_meta_set_txnid(env, &meta, txn->mt_txnid); - - rc = mdbx_sync_locked( - env, env->me_flags | txn->mt_flags | MDBX_SHRINK_ALLOWED, &meta); - } - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - env->me_lck->mti_readers_refresh_flag = false; - end_mode = MDBX_END_COMMITTED | MDBX_END_UPDATE | MDBX_END_EOTDONE; - -done: - return mdbx_txn_end(txn, end_mode); - -fail: - mdbx_txn_abort(txn); - return rc; -} - -/* Read the environment parameters of a DB environment - * before mapping it into memory. */ -static int __cold mdbx_read_header(MDBX_env *env, MDBX_meta *meta) { - assert(offsetof(MDBX_page, mp_meta) == PAGEHDRSZ); - memset(meta, 0, sizeof(MDBX_meta)); - meta->mm_datasync_sign = MDBX_DATASIGN_WEAK; - int rc = MDBX_CORRUPTED; - - /* Read twice all meta pages so we can find the latest one. */ - unsigned loop_limit = NUM_METAS * 2; - for (unsigned loop_count = 0; loop_count < loop_limit; ++loop_count) { - MDBX_page page; - - /* We don't know the page size on first time. - * So, just guess it. */ - unsigned guess_pagesize = meta->mm_psize; - if (guess_pagesize == 0) - guess_pagesize = - (loop_count > NUM_METAS) ? env->me_psize : env->me_os_psize; - - const unsigned meta_number = loop_count % NUM_METAS; - const unsigned offset = guess_pagesize * meta_number; - - unsigned retryleft = 42; - while (1) { - int err = mdbx_pread(env->me_fd, &page, sizeof(page), offset); - if (err != MDBX_SUCCESS) { - mdbx_error("read meta[%u,%u]: %i, %s", offset, (unsigned)sizeof(page), - err, mdbx_strerror(err)); - return err; - } - - MDBX_page again; - err = mdbx_pread(env->me_fd, &again, sizeof(again), offset); - if (err != MDBX_SUCCESS) { - mdbx_error("read meta[%u,%u]: %i, %s", offset, (unsigned)sizeof(again), - err, mdbx_strerror(err)); - return err; - } - - if (memcmp(&page, &again, sizeof(page)) == 0 || --retryleft == 0) - break; - - mdbx_info("meta[%u] was updated, re-read it", meta_number); - } - - if (!retryleft) { - mdbx_error("meta[%u] is too volatile, skip it", meta_number); - continue; - } - - if (page.mp_pgno != meta_number) { - mdbx_error("meta[%u] has invalid pageno %" PRIaPGNO, meta_number, - page.mp_pgno); - return MDBX_INVALID; - } - - if (!F_ISSET(page.mp_flags, P_META)) { - mdbx_error("page #%u not a meta-page", meta_number); - return MDBX_INVALID; - } - - if (page.mp_meta.mm_magic_and_version != MDBX_DATA_MAGIC) { - mdbx_error("meta[%u] has invalid magic/version MDBX_DEVEL=%d", - meta_number, MDBX_DEVEL); - return ((page.mp_meta.mm_magic_and_version >> 8) != MDBX_MAGIC) - ? MDBX_INVALID - : MDBX_VERSION_MISMATCH; - } - - if (page.mp_meta.mm_txnid_a != page.mp_meta.mm_txnid_b) { - mdbx_warning("meta[%u] not completely updated, skip it", meta_number); - continue; - } - - /* LY: check signature as a checksum */ - if (META_IS_STEADY(&page.mp_meta) && - page.mp_meta.mm_datasync_sign != mdbx_meta_sign(&page.mp_meta)) { - mdbx_notice("meta[%u] has invalid steady-checksum (0x%" PRIx64 - " != 0x%" PRIx64 "), skip it", - meta_number, page.mp_meta.mm_datasync_sign, - mdbx_meta_sign(&page.mp_meta)); - continue; - } - - /* LY: check pagesize */ - if (!mdbx_is_power2(page.mp_meta.mm_psize) || - page.mp_meta.mm_psize < MIN_PAGESIZE || - page.mp_meta.mm_psize > MAX_PAGESIZE) { - mdbx_notice("meta[%u] has invalid pagesize (%u), skip it", meta_number, - page.mp_meta.mm_psize); - rc = MDBX_VERSION_MISMATCH; - continue; - } - - mdbx_debug("read meta%" PRIaPGNO " = root %" PRIaPGNO "/%" PRIaPGNO - ", geo %" PRIaPGNO "/%" PRIaPGNO "-%" PRIaPGNO "/%" PRIaPGNO - " +%u -%u, txn_id %" PRIaTXN ", %s", - page.mp_pgno, page.mp_meta.mm_dbs[MAIN_DBI].md_root, - page.mp_meta.mm_dbs[FREE_DBI].md_root, page.mp_meta.mm_geo.lower, - page.mp_meta.mm_geo.next, page.mp_meta.mm_geo.now, - page.mp_meta.mm_geo.upper, page.mp_meta.mm_geo.grow, - page.mp_meta.mm_geo.shrink, page.mp_meta.mm_txnid_a, - mdbx_durable_str(&page.mp_meta)); - - /* LY: check min-pages value */ - if (page.mp_meta.mm_geo.lower < MIN_PAGENO || - page.mp_meta.mm_geo.lower > MAX_PAGENO) { - mdbx_notice("meta[%u] has invalid min-pages (%" PRIaPGNO "), skip it", - meta_number, page.mp_meta.mm_geo.lower); - rc = MDBX_INVALID; - continue; - } - - /* LY: check max-pages value */ - if (page.mp_meta.mm_geo.upper < MIN_PAGENO || - page.mp_meta.mm_geo.upper > MAX_PAGENO || - page.mp_meta.mm_geo.upper < page.mp_meta.mm_geo.lower) { - mdbx_notice("meta[%u] has invalid max-pages (%" PRIaPGNO "), skip it", - meta_number, page.mp_meta.mm_geo.upper); - rc = MDBX_INVALID; - continue; - } - - /* LY: check mapsize limits */ - const uint64_t mapsize_min = - page.mp_meta.mm_geo.lower * (uint64_t)page.mp_meta.mm_psize; - const uint64_t mapsize_max = - page.mp_meta.mm_geo.upper * (uint64_t)page.mp_meta.mm_psize; - STATIC_ASSERT(MAX_MAPSIZE < SSIZE_MAX - MAX_PAGESIZE); - STATIC_ASSERT(MIN_MAPSIZE < MAX_MAPSIZE); - if (mapsize_min < MIN_MAPSIZE || mapsize_max > MAX_MAPSIZE) { - mdbx_notice("meta[%u] has invalid min-mapsize (%" PRIu64 "), skip it", - meta_number, mapsize_min); - rc = MDBX_VERSION_MISMATCH; - continue; - } - - STATIC_ASSERT(MIN_MAPSIZE < MAX_MAPSIZE); - if (mapsize_max > MAX_MAPSIZE || - MAX_PAGENO < mdbx_roundup2((size_t)mapsize_max, env->me_os_psize) / - (uint64_t)page.mp_meta.mm_psize) { - mdbx_notice("meta[%u] has too large max-mapsize (%" PRIu64 "), skip it", - meta_number, mapsize_max); - rc = MDBX_TOO_LARGE; - continue; - } - - /* LY: check end_pgno */ - if (page.mp_meta.mm_geo.now < page.mp_meta.mm_geo.lower || - page.mp_meta.mm_geo.now > page.mp_meta.mm_geo.upper) { - mdbx_notice("meta[%u] has invalid end-pageno (%" PRIaPGNO "), skip it", - meta_number, page.mp_meta.mm_geo.now); - rc = MDBX_CORRUPTED; - continue; - } - - /* LY: check last_pgno */ - if (page.mp_meta.mm_geo.next < MIN_PAGENO || - page.mp_meta.mm_geo.next - 1 > MAX_PAGENO) { - mdbx_notice("meta[%u] has invalid next-pageno (%" PRIaPGNO "), skip it", - meta_number, page.mp_meta.mm_geo.next); - rc = MDBX_CORRUPTED; - continue; - } - - if (page.mp_meta.mm_geo.next > page.mp_meta.mm_geo.now) { - mdbx_notice("meta[%u] next-pageno (%" PRIaPGNO - ") is beyond end-pgno (%" PRIaPGNO "), skip it", - meta_number, page.mp_meta.mm_geo.next, - page.mp_meta.mm_geo.now); - rc = MDBX_CORRUPTED; - continue; - } - - /* LY: FreeDB root */ - if (page.mp_meta.mm_dbs[FREE_DBI].md_root == P_INVALID) { - if (page.mp_meta.mm_dbs[FREE_DBI].md_branch_pages || - page.mp_meta.mm_dbs[FREE_DBI].md_depth || - page.mp_meta.mm_dbs[FREE_DBI].md_entries || - page.mp_meta.mm_dbs[FREE_DBI].md_leaf_pages || - page.mp_meta.mm_dbs[FREE_DBI].md_overflow_pages) { - mdbx_notice("meta[%u] has false-empty freedb, skip it", meta_number); - rc = MDBX_CORRUPTED; - continue; - } - } else if (page.mp_meta.mm_dbs[FREE_DBI].md_root >= - page.mp_meta.mm_geo.next) { - mdbx_notice("meta[%u] has invalid freedb-root %" PRIaPGNO ", skip it", - meta_number, page.mp_meta.mm_dbs[FREE_DBI].md_root); - rc = MDBX_CORRUPTED; - continue; - } - - /* LY: MainDB root */ - if (page.mp_meta.mm_dbs[MAIN_DBI].md_root == P_INVALID) { - if (page.mp_meta.mm_dbs[MAIN_DBI].md_branch_pages || - page.mp_meta.mm_dbs[MAIN_DBI].md_depth || - page.mp_meta.mm_dbs[MAIN_DBI].md_entries || - page.mp_meta.mm_dbs[MAIN_DBI].md_leaf_pages || - page.mp_meta.mm_dbs[MAIN_DBI].md_overflow_pages) { - mdbx_notice("meta[%u] has false-empty maindb", meta_number); - rc = MDBX_CORRUPTED; - continue; - } - } else if (page.mp_meta.mm_dbs[MAIN_DBI].md_root >= - page.mp_meta.mm_geo.next) { - mdbx_notice("meta[%u] has invalid maindb-root %" PRIaPGNO ", skip it", - meta_number, page.mp_meta.mm_dbs[MAIN_DBI].md_root); - rc = MDBX_CORRUPTED; - continue; - } - - if (page.mp_meta.mm_txnid_a == 0) { - mdbx_warning("meta[%u] has zero txnid, skip it", meta_number); - continue; - } - - if (mdbx_meta_ot(prefer_noweak, env, meta, &page.mp_meta)) { - *meta = page.mp_meta; - if (META_IS_WEAK(meta)) - loop_limit += 1; /* LY: should re-read to hush race with update */ - mdbx_info("latch meta[%u]", meta_number); - } - } - - if (META_IS_WEAK(meta)) { - mdbx_error("no usable meta-pages, database is corrupted"); - return rc; - } - - return MDBX_SUCCESS; -} - -static MDBX_page *__cold mdbx_meta_model(const MDBX_env *env, MDBX_page *model, - unsigned num) { - - mdbx_ensure(env, mdbx_is_power2(env->me_psize)); - mdbx_ensure(env, env->me_psize >= MIN_PAGESIZE); - mdbx_ensure(env, env->me_psize <= MAX_PAGESIZE); - mdbx_ensure(env, env->me_dbgeo.lower >= MIN_MAPSIZE); - mdbx_ensure(env, env->me_dbgeo.upper <= MAX_MAPSIZE); - mdbx_ensure(env, env->me_dbgeo.now >= env->me_dbgeo.lower); - mdbx_ensure(env, env->me_dbgeo.now <= env->me_dbgeo.upper); - - memset(model, 0, sizeof(*model)); - model->mp_pgno = num; - model->mp_flags = P_META; - model->mp_meta.mm_magic_and_version = MDBX_DATA_MAGIC; - - model->mp_meta.mm_geo.lower = bytes2pgno(env, env->me_dbgeo.lower); - model->mp_meta.mm_geo.upper = bytes2pgno(env, env->me_dbgeo.upper); - model->mp_meta.mm_geo.grow = (uint16_t)bytes2pgno(env, env->me_dbgeo.grow); - model->mp_meta.mm_geo.shrink = - (uint16_t)bytes2pgno(env, env->me_dbgeo.shrink); - model->mp_meta.mm_geo.now = bytes2pgno(env, env->me_dbgeo.now); - model->mp_meta.mm_geo.next = NUM_METAS; - - mdbx_ensure(env, model->mp_meta.mm_geo.lower >= MIN_PAGENO); - mdbx_ensure(env, model->mp_meta.mm_geo.upper <= MAX_PAGENO); - mdbx_ensure(env, model->mp_meta.mm_geo.now >= model->mp_meta.mm_geo.lower); - mdbx_ensure(env, model->mp_meta.mm_geo.now <= model->mp_meta.mm_geo.upper); - mdbx_ensure(env, model->mp_meta.mm_geo.next >= MIN_PAGENO); - mdbx_ensure(env, model->mp_meta.mm_geo.next <= model->mp_meta.mm_geo.now); - mdbx_ensure(env, model->mp_meta.mm_geo.grow == - bytes2pgno(env, env->me_dbgeo.grow)); - mdbx_ensure(env, model->mp_meta.mm_geo.shrink == - bytes2pgno(env, env->me_dbgeo.shrink)); - - model->mp_meta.mm_psize = env->me_psize; - model->mp_meta.mm_flags = (uint16_t)env->me_flags; - model->mp_meta.mm_flags |= - MDBX_INTEGERKEY; /* this is mm_dbs[FREE_DBI].md_flags */ - model->mp_meta.mm_dbs[FREE_DBI].md_root = P_INVALID; - model->mp_meta.mm_dbs[MAIN_DBI].md_root = P_INVALID; - mdbx_meta_set_txnid(env, &model->mp_meta, MIN_TXNID + num); - model->mp_meta.mm_datasync_sign = mdbx_meta_sign(&model->mp_meta); - return (MDBX_page *)((uint8_t *)model + env->me_psize); -} - -/* Fill in most of the zeroed meta-pages for an empty database environment. - * Return pointer to recenly (head) meta-page. */ -static MDBX_page *__cold mdbx_init_metas(const MDBX_env *env, void *buffer) { - MDBX_page *page0 = (MDBX_page *)buffer; - MDBX_page *page1 = mdbx_meta_model(env, page0, 0); - MDBX_page *page2 = mdbx_meta_model(env, page1, 1); - mdbx_meta_model(env, page2, 2); - page2->mp_meta.mm_datasync_sign = MDBX_DATASIGN_WEAK; - mdbx_assert(env, !mdbx_meta_eq(env, &page0->mp_meta, &page1->mp_meta)); - mdbx_assert(env, !mdbx_meta_eq(env, &page1->mp_meta, &page2->mp_meta)); - mdbx_assert(env, !mdbx_meta_eq(env, &page2->mp_meta, &page0->mp_meta)); - return page1; -} - -static int mdbx_sync_locked(MDBX_env *env, unsigned flags, - MDBX_meta *const pending) { - mdbx_assert(env, ((env->me_flags ^ flags) & MDBX_WRITEMAP) == 0); - MDBX_meta *const meta0 = METAPAGE(env, 0); - MDBX_meta *const meta1 = METAPAGE(env, 1); - MDBX_meta *const meta2 = METAPAGE(env, 2); - MDBX_meta *const head = mdbx_meta_head(env); - - mdbx_assert(env, mdbx_meta_eq_mask(env) == 0); - mdbx_assert(env, - pending < METAPAGE(env, 0) || pending > METAPAGE(env, NUM_METAS)); - mdbx_assert(env, (env->me_flags & (MDBX_RDONLY | MDBX_FATAL_ERROR)) == 0); - mdbx_assert(env, !META_IS_STEADY(head) || env->me_sync_pending != 0); - mdbx_assert(env, pending->mm_geo.next <= pending->mm_geo.now); - - const size_t usedbytes = pgno_align2os_bytes(env, pending->mm_geo.next); - if (env->me_sync_threshold && env->me_sync_pending >= env->me_sync_threshold) - flags &= MDBX_WRITEMAP | MDBX_SHRINK_ALLOWED; - - /* LY: step#1 - sync previously written/updated data-pages */ - int rc = MDBX_RESULT_TRUE; - if (env->me_sync_pending && (flags & MDBX_NOSYNC) == 0) { - mdbx_assert(env, ((flags ^ env->me_flags) & MDBX_WRITEMAP) == 0); - MDBX_meta *const steady = mdbx_meta_steady(env); - if (flags & MDBX_WRITEMAP) { - rc = mdbx_msync(&env->me_dxb_mmap, 0, usedbytes, flags & MDBX_MAPASYNC); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - if ((flags & MDBX_MAPASYNC) == 0) { - if (unlikely(pending->mm_geo.next > steady->mm_geo.now)) { - rc = mdbx_filesize_sync(env->me_fd); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - } - env->me_sync_pending = 0; - } - } else { - rc = mdbx_filesync(env->me_fd, pending->mm_geo.next > steady->mm_geo.now); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - env->me_sync_pending = 0; - } - } - -#if defined(_WIN32) || defined(_WIN64) -/* Windows is unable shrinking a mapped file */ -#else - /* LY: check conditions to shrink datafile */ - pgno_t shrink = 0; - if ((flags & MDBX_SHRINK_ALLOWED) && pending->mm_geo.shrink && - pending->mm_geo.now - pending->mm_geo.next > pending->mm_geo.shrink) { - const pgno_t aligner = - pending->mm_geo.grow ? pending->mm_geo.grow : pending->mm_geo.shrink; - const pgno_t aligned = pgno_align2os_pgno( - env, pending->mm_geo.next + aligner - pending->mm_geo.next % aligner); - const pgno_t bottom = - (aligned > pending->mm_geo.lower) ? aligned : pending->mm_geo.lower; - if (pending->mm_geo.now > bottom) { - shrink = pending->mm_geo.now - bottom; - pending->mm_geo.now = bottom; - if (mdbx_meta_txnid_stable(env, head) == pending->mm_txnid_a) - mdbx_meta_set_txnid(env, pending, pending->mm_txnid_a + 1); - } - } -#endif /* not a Windows */ - - /* Steady or Weak */ - if (env->me_sync_pending == 0) { - pending->mm_datasync_sign = mdbx_meta_sign(pending); - } else { - pending->mm_datasync_sign = - (flags & MDBX_UTTERLY_NOSYNC) == MDBX_UTTERLY_NOSYNC - ? MDBX_DATASIGN_NONE - : MDBX_DATASIGN_WEAK; - } - - MDBX_meta *target = nullptr; - if (mdbx_meta_txnid_stable(env, head) == pending->mm_txnid_a) { - mdbx_assert(env, memcmp(&head->mm_dbs, &pending->mm_dbs, - sizeof(head->mm_dbs)) == 0); - mdbx_assert(env, memcmp(&head->mm_canary, &pending->mm_canary, - sizeof(head->mm_canary)) == 0); - mdbx_assert(env, memcmp(&head->mm_geo, &pending->mm_geo, - sizeof(pending->mm_geo)) == 0); - if (!META_IS_STEADY(head) && META_IS_STEADY(pending)) - target = head; - else { - mdbx_ensure(env, mdbx_meta_eq(env, head, pending)); - mdbx_debug("skip update meta"); - return MDBX_SUCCESS; - } - } else if (head == meta0) - target = mdbx_meta_ancient(prefer_steady, env, meta1, meta2); - else if (head == meta1) - target = mdbx_meta_ancient(prefer_steady, env, meta0, meta2); - else { - mdbx_assert(env, head == meta2); - target = mdbx_meta_ancient(prefer_steady, env, meta0, meta1); - } - - /* LY: step#2 - update meta-page. */ - mdbx_debug("writing meta%" PRIaPGNO " = root %" PRIaPGNO "/%" PRIaPGNO - ", geo %" PRIaPGNO "/%" PRIaPGNO "-%" PRIaPGNO "/%" PRIaPGNO - " +%u -%u, txn_id %" PRIaTXN ", %s", - container_of(target, MDBX_page, mp_data)->mp_pgno, - pending->mm_dbs[MAIN_DBI].md_root, - pending->mm_dbs[FREE_DBI].md_root, pending->mm_geo.lower, - pending->mm_geo.next, pending->mm_geo.now, pending->mm_geo.upper, - pending->mm_geo.grow, pending->mm_geo.shrink, pending->mm_txnid_a, - mdbx_durable_str(pending)); - - mdbx_debug("meta0: %s, %s, txn_id %" PRIaTXN ", root %" PRIaPGNO - "/%" PRIaPGNO, - (meta0 == head) ? "head" : (meta0 == target) ? "tail" : "stay", - mdbx_durable_str(meta0), mdbx_meta_txnid_fluid(env, meta0), - meta0->mm_dbs[MAIN_DBI].md_root, meta0->mm_dbs[FREE_DBI].md_root); - mdbx_debug("meta1: %s, %s, txn_id %" PRIaTXN ", root %" PRIaPGNO - "/%" PRIaPGNO, - (meta1 == head) ? "head" : (meta1 == target) ? "tail" : "stay", - mdbx_durable_str(meta1), mdbx_meta_txnid_fluid(env, meta1), - meta1->mm_dbs[MAIN_DBI].md_root, meta1->mm_dbs[FREE_DBI].md_root); - mdbx_debug("meta2: %s, %s, txn_id %" PRIaTXN ", root %" PRIaPGNO - "/%" PRIaPGNO, - (meta2 == head) ? "head" : (meta2 == target) ? "tail" : "stay", - mdbx_durable_str(meta2), mdbx_meta_txnid_fluid(env, meta2), - meta2->mm_dbs[MAIN_DBI].md_root, meta2->mm_dbs[FREE_DBI].md_root); - - mdbx_assert(env, !mdbx_meta_eq(env, pending, meta0)); - mdbx_assert(env, !mdbx_meta_eq(env, pending, meta1)); - mdbx_assert(env, !mdbx_meta_eq(env, pending, meta2)); - - mdbx_assert(env, ((env->me_flags ^ flags) & MDBX_WRITEMAP) == 0); - mdbx_ensure(env, - target == head || - mdbx_meta_txnid_stable(env, target) < pending->mm_txnid_a); - if (env->me_flags & MDBX_WRITEMAP) { - mdbx_jitter4testing(true); - if (likely(target != head)) { - /* LY: 'invalidate' the meta. */ - target->mm_datasync_sign = MDBX_DATASIGN_WEAK; - mdbx_meta_update_begin(env, target, pending->mm_txnid_a); -#ifndef NDEBUG - /* debug: provoke failure to catch a violators */ - memset(target->mm_dbs, 0xCC, - sizeof(target->mm_dbs) + sizeof(target->mm_canary)); - mdbx_jitter4testing(false); -#endif - - /* LY: update info */ - target->mm_geo = pending->mm_geo; - target->mm_dbs[FREE_DBI] = pending->mm_dbs[FREE_DBI]; - target->mm_dbs[MAIN_DBI] = pending->mm_dbs[MAIN_DBI]; - target->mm_canary = pending->mm_canary; - mdbx_jitter4testing(true); - mdbx_coherent_barrier(); - - /* LY: 'commit' the meta */ - mdbx_meta_update_end(env, target, pending->mm_txnid_b); - mdbx_jitter4testing(true); - } else { - /* dangerous case (target == head), only mm_datasync_sign could - * me updated, check assertions once again */ - mdbx_ensure(env, - mdbx_meta_txnid_stable(env, head) == pending->mm_txnid_a && - !META_IS_STEADY(head) && META_IS_STEADY(pending)); - mdbx_ensure(env, memcmp(&head->mm_geo, &pending->mm_geo, - sizeof(head->mm_geo)) == 0); - mdbx_ensure(env, memcmp(&head->mm_dbs, &pending->mm_dbs, - sizeof(head->mm_dbs)) == 0); - mdbx_ensure(env, memcmp(&head->mm_canary, &pending->mm_canary, - sizeof(head->mm_canary)) == 0); - } - target->mm_datasync_sign = pending->mm_datasync_sign; - mdbx_coherent_barrier(); - mdbx_jitter4testing(true); - } else { - rc = mdbx_pwrite(env->me_fd, pending, sizeof(MDBX_meta), - (uint8_t *)target - env->me_map); - if (unlikely(rc != MDBX_SUCCESS)) { - undo: - mdbx_debug("write failed, disk error?"); - /* On a failure, the pagecache still contains the new data. - * Try write some old data back, to prevent it from being used. */ - mdbx_pwrite(env->me_fd, (void *)target, sizeof(MDBX_meta), - (uint8_t *)target - env->me_map); - goto fail; - } - mdbx_invalidate_cache(target, sizeof(MDBX_meta)); - } - - /* LY: step#3 - sync meta-pages. */ - mdbx_assert(env, ((env->me_flags ^ flags) & MDBX_WRITEMAP) == 0); - if ((flags & (MDBX_NOSYNC | MDBX_NOMETASYNC)) == 0) { - mdbx_assert(env, ((flags ^ env->me_flags) & MDBX_WRITEMAP) == 0); - if (flags & MDBX_WRITEMAP) { - const size_t offset = - ((uint8_t *)container_of(head, MDBX_page, mp_meta)) - - env->me_dxb_mmap.dxb; - const size_t paged_offset = offset & ~(env->me_os_psize - 1); - const size_t paged_length = mdbx_roundup2( - env->me_psize + offset - paged_offset, env->me_os_psize); - rc = mdbx_msync(&env->me_dxb_mmap, paged_offset, paged_length, - flags & MDBX_MAPASYNC); - if (unlikely(rc != MDBX_SUCCESS)) - goto fail; - } else { - rc = mdbx_filesync(env->me_fd, false); - if (rc != MDBX_SUCCESS) - goto undo; - } - } - -#if defined(_WIN32) || defined(_WIN64) -/* Windows is unable shrinking a mapped file */ -#else - /* LY: shrink datafile if needed */ - if (unlikely(shrink)) { - mdbx_info("shrink to %" PRIaPGNO " pages (-%" PRIaPGNO ")", - pending->mm_geo.now, shrink); - rc = mdbx_mapresize(env, pending->mm_geo.now, pending->mm_geo.upper); - if (MDBX_IS_ERROR(rc)) - goto fail; - } -#endif /* not a Windows */ - - return MDBX_SUCCESS; - -fail: - env->me_flags |= MDBX_FATAL_ERROR; - return rc; -} - -int __cold mdbx_env_get_maxkeysize(MDBX_env *env) { - if (!env || env->me_signature != MDBX_ME_SIGNATURE || !env->me_maxkey_limit) - return -MDBX_EINVAL; - return env->me_maxkey_limit; -} - -#define mdbx_nodemax(pagesize) \ - (((((pagesize)-PAGEHDRSZ) / MDBX_MINKEYS) & -(intptr_t)2) - sizeof(indx_t)) - -#define mdbx_maxkey(nodemax) ((nodemax) - (NODESIZE + sizeof(MDBX_db))) - -#define mdbx_maxfree1pg(pagesize) (((pagesize)-PAGEHDRSZ) / sizeof(pgno_t) - 1) - -int mdbx_get_maxkeysize(size_t pagesize) { - if (pagesize == 0) - pagesize = mdbx_syspagesize(); - - intptr_t nodemax = mdbx_nodemax(pagesize); - if (nodemax < 0) - return -MDBX_EINVAL; - - intptr_t maxkey = mdbx_maxkey(nodemax); - return (maxkey > 0 && maxkey < INT_MAX) ? (int)maxkey : -MDBX_EINVAL; -} - -static void __cold mdbx_setup_pagesize(MDBX_env *env, const size_t pagesize) { - STATIC_ASSERT(SSIZE_MAX > MAX_MAPSIZE); - STATIC_ASSERT(MIN_PAGESIZE > sizeof(MDBX_page)); - mdbx_ensure(env, mdbx_is_power2(pagesize)); - mdbx_ensure(env, pagesize >= MIN_PAGESIZE); - mdbx_ensure(env, pagesize <= MAX_PAGESIZE); - env->me_psize = (unsigned)pagesize; - - STATIC_ASSERT(mdbx_maxfree1pg(MIN_PAGESIZE) > 42); - STATIC_ASSERT(mdbx_maxfree1pg(MAX_PAGESIZE) < MDBX_PNL_DB_MAX); - const intptr_t maxfree_1pg = (pagesize - PAGEHDRSZ) / sizeof(pgno_t) - 1; - mdbx_ensure(env, maxfree_1pg > 42 && maxfree_1pg < MDBX_PNL_DB_MAX); - env->me_maxfree_1pg = (unsigned)maxfree_1pg; - - STATIC_ASSERT(mdbx_nodemax(MIN_PAGESIZE) > 42); - STATIC_ASSERT(mdbx_nodemax(MAX_PAGESIZE) < UINT16_MAX); - const intptr_t nodemax = mdbx_nodemax(pagesize); - mdbx_ensure(env, nodemax > 42 && nodemax < UINT16_MAX); - env->me_nodemax = (unsigned)nodemax; - - STATIC_ASSERT(mdbx_maxkey(MIN_PAGESIZE) > 42); - STATIC_ASSERT(mdbx_maxkey(MIN_PAGESIZE) < MIN_PAGESIZE); - STATIC_ASSERT(mdbx_maxkey(MAX_PAGESIZE) > 42); - STATIC_ASSERT(mdbx_maxkey(MAX_PAGESIZE) < MAX_PAGESIZE); - const intptr_t maxkey_limit = mdbx_maxkey(env->me_nodemax); - mdbx_ensure(env, maxkey_limit > 42 && (size_t)maxkey_limit < pagesize); - env->me_maxkey_limit = (unsigned)maxkey_limit; - - env->me_psize2log = mdbx_log2(pagesize); - mdbx_assert(env, pgno2bytes(env, 1) == pagesize); - mdbx_assert(env, bytes2pgno(env, pagesize + pagesize) == 2); -} - -int __cold mdbx_env_create(MDBX_env **penv) { - MDBX_env *env = calloc(1, sizeof(MDBX_env)); - if (!env) - return MDBX_ENOMEM; - - env->me_maxreaders = DEFAULT_READERS; - env->me_maxdbs = env->me_numdbs = CORE_DBS; - env->me_fd = INVALID_HANDLE_VALUE; - env->me_lfd = INVALID_HANDLE_VALUE; - env->me_pid = mdbx_getpid(); - - int rc; - const size_t os_psize = mdbx_syspagesize(); - if (!mdbx_is_power2(os_psize) || os_psize < MIN_PAGESIZE) { - mdbx_error("unsuitable system pagesize %" PRIuPTR, os_psize); - rc = MDBX_INCOMPATIBLE; - goto bailout; - } - env->me_os_psize = (unsigned)os_psize; - mdbx_setup_pagesize(env, env->me_os_psize); - - rc = mdbx_fastmutex_init(&env->me_dbi_lock); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - - VALGRIND_CREATE_MEMPOOL(env, 0, 0); - env->me_signature = MDBX_ME_SIGNATURE; - *penv = env; - return MDBX_SUCCESS; - -bailout: - free(env); - *penv = nullptr; - return rc; -} - -static int __cold mdbx_env_map(MDBX_env *env, size_t usedsize) { - int rc = mdbx_mmap(env->me_flags, &env->me_dxb_mmap, env->me_dbgeo.now, - env->me_dbgeo.upper); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - -#ifdef MADV_DONTFORK - if (madvise(env->me_map, env->me_mapsize, MADV_DONTFORK)) - return errno; -#endif - -#ifdef MADV_NOHUGEPAGE - (void)madvise(env->me_map, env->me_mapsize, MADV_NOHUGEPAGE); -#endif - -#if defined(MADV_DODUMP) && defined(MADV_DONTDUMP) - const size_t meta_length = pgno2bytes(env, NUM_METAS); - (void)madvise(env->me_map, meta_length, MADV_DODUMP); - if (!(env->me_flags & MDBX_PAGEPERTURB)) - (void)madvise(env->me_map + meta_length, env->me_mapsize - meta_length, - MADV_DONTDUMP); -#endif - -#ifdef MADV_REMOVE - if (usedsize && (env->me_flags & MDBX_WRITEMAP)) { - (void)madvise(env->me_map + usedsize, env->me_mapsize - usedsize, - MADV_REMOVE); - } -#else - (void)usedsize; -#endif - -#if defined(MADV_RANDOM) && defined(MADV_WILLNEED) - /* Turn on/off readahead. It's harmful when the DB is larger than RAM. */ - if (madvise(env->me_map, env->me_mapsize, - (env->me_flags & MDBX_NORDAHEAD) ? MADV_RANDOM : MADV_WILLNEED)) - return errno; -#endif - -#ifdef USE_VALGRIND - env->me_valgrind_handle = - VALGRIND_CREATE_BLOCK(env->me_map, env->me_mapsize, "mdbx"); -#endif - - return MDBX_SUCCESS; -} - -LIBMDBX_API int mdbx_env_set_geometry(MDBX_env *env, intptr_t size_lower, - intptr_t size_now, intptr_t size_upper, - intptr_t growth_step, - intptr_t shrink_threshold, - intptr_t pagesize) { - if (unlikely(!env)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - const bool outside_txn = - (!env->me_txn0 || env->me_txn0->mt_owner != mdbx_thread_self()); - -#if MDBX_DEBUG - if (growth_step < 0) - growth_step = 1; - if (shrink_threshold < 0) - shrink_threshold = 1; -#endif - - int rc = MDBX_PROBLEM; - if (env->me_map) { - /* env already mapped */ - if (!env->me_lck || (env->me_flags & MDBX_RDONLY)) - return MDBX_EACCESS; - - if (outside_txn) { - int err = mdbx_txn_lock(env, false); - if (unlikely(err != MDBX_SUCCESS)) - return err; - } - MDBX_meta *head = mdbx_meta_head(env); - - if (pagesize < 0) - pagesize = env->me_psize; - if (pagesize != (intptr_t)env->me_psize) { - rc = MDBX_EINVAL; - goto bailout; - } - - if (size_lower < 0) - size_lower = pgno2bytes(env, head->mm_geo.lower); - if (size_now < 0) - size_now = pgno2bytes(env, head->mm_geo.now); - if (size_upper < 0) - size_upper = pgno2bytes(env, head->mm_geo.upper); - if (growth_step < 0) - growth_step = pgno2bytes(env, head->mm_geo.grow); - if (shrink_threshold < 0) - shrink_threshold = pgno2bytes(env, head->mm_geo.shrink); - - const size_t usedbytes = pgno2bytes(env, head->mm_geo.next); - if ((size_t)size_upper < usedbytes) { - rc = MDBX_MAP_FULL; - goto bailout; - } - if ((size_t)size_now < usedbytes) - size_now = usedbytes; -#if defined(_WIN32) || defined(_WIN64) - if ((size_t)size_now < env->me_dbgeo.now || - (size_t)size_upper < env->me_dbgeo.upper) { - /* Windows is unable shrinking a mapped file */ - return ERROR_USER_MAPPED_FILE; - } -#endif /* Windows */ - } else { - /* env NOT yet mapped */ - if (!outside_txn) { - rc = MDBX_PANIC; - goto bailout; - } - - if (pagesize < 0) { - pagesize = env->me_os_psize; - if (pagesize > MAX_PAGESIZE) - pagesize = MAX_PAGESIZE; - mdbx_assert(env, pagesize >= MIN_PAGESIZE); - } - } - - if (pagesize < MIN_PAGESIZE || pagesize > MAX_PAGESIZE || - !mdbx_is_power2(pagesize)) { - rc = MDBX_EINVAL; - goto bailout; - } - - if (size_lower < 0) { - size_lower = MIN_MAPSIZE; - if (MIN_MAPSIZE / pagesize < MIN_PAGENO) - size_lower = MIN_PAGENO * pagesize; - } - - if (size_now < 0) { - size_now = DEFAULT_MAPSIZE; - if (size_now < size_lower) - size_now = size_lower; - } - - if (size_upper < 0) { - if ((size_t)size_now >= MAX_MAPSIZE / 2) - size_upper = MAX_MAPSIZE; - else if (MAX_MAPSIZE != MAX_MAPSIZE32 && - (size_t)size_now >= MAX_MAPSIZE32 / 2 && - (size_t)size_now <= MAX_MAPSIZE32 / 4 * 3) - size_upper = MAX_MAPSIZE32; - else { - size_upper = size_now + size_now; - if ((size_t)size_upper < DEFAULT_MAPSIZE * 2) - size_upper = DEFAULT_MAPSIZE * 2; - } - if ((size_t)size_upper / pagesize > MAX_PAGENO) - size_upper = pagesize * MAX_PAGENO; - } - - if (unlikely(size_lower < MIN_MAPSIZE || size_lower > size_upper)) { - rc = MDBX_EINVAL; - goto bailout; - } - - if ((uint64_t)size_lower / pagesize < MIN_PAGENO) { - rc = MDBX_EINVAL; - goto bailout; - } - - if (unlikely((size_t)size_upper > MAX_MAPSIZE || - (uint64_t)size_upper / pagesize > MAX_PAGENO)) { - rc = MDBX_TOO_LARGE; - goto bailout; - } - - size_lower = mdbx_roundup2(size_lower, env->me_os_psize); - size_upper = mdbx_roundup2(size_upper, env->me_os_psize); - size_now = mdbx_roundup2(size_now, env->me_os_psize); - - /* LY: подбираем значение size_upper: - * - кратное размеру системной страницы - * - без нарушения MAX_MAPSIZE или MAX_PAGENO */ - while (unlikely((size_t)size_upper > MAX_MAPSIZE || - (uint64_t)size_upper / pagesize > MAX_PAGENO)) { - if ((size_t)size_upper < env->me_os_psize + MIN_MAPSIZE || - (size_t)size_upper < env->me_os_psize * (MIN_PAGENO + 1)) { - /* паранойа на случай переполнения при невероятных значениях */ - rc = MDBX_EINVAL; - goto bailout; - } - size_upper -= env->me_os_psize; - if ((size_t)size_upper > (size_t)size_lower) - size_lower = size_upper; - } - mdbx_assert(env, (size_upper - size_lower) % env->me_os_psize == 0); - - if (size_now < size_lower) - size_now = size_lower; - if (size_now > size_upper) - size_now = size_upper; - - if (growth_step < 0) { - growth_step = ((size_t)(size_upper - size_lower)) / 42; - if (growth_step > size_lower) - growth_step = size_lower; - if (growth_step < 65536) - growth_step = 65536; - if ((size_t)growth_step > MEGABYTE * 16) - growth_step = MEGABYTE * 16; - } - growth_step = mdbx_roundup2(growth_step, env->me_os_psize); - if (bytes2pgno(env, growth_step) > UINT16_MAX) - growth_step = pgno2bytes(env, UINT16_MAX); - - if (shrink_threshold < 0) { - shrink_threshold = growth_step + growth_step; - if (shrink_threshold < growth_step) - shrink_threshold = growth_step; - } - shrink_threshold = mdbx_roundup2(shrink_threshold, env->me_os_psize); - if (bytes2pgno(env, shrink_threshold) > UINT16_MAX) - shrink_threshold = pgno2bytes(env, UINT16_MAX); - - /* save user's geo-params for future open/create */ - env->me_dbgeo.lower = size_lower; - env->me_dbgeo.now = size_now; - env->me_dbgeo.upper = size_upper; - env->me_dbgeo.grow = growth_step; - env->me_dbgeo.shrink = shrink_threshold; - rc = MDBX_SUCCESS; - - if (env->me_map) { - /* apply new params */ - mdbx_assert(env, pagesize == (intptr_t)env->me_psize); - - MDBX_meta *head = mdbx_meta_head(env); - MDBX_meta meta = *head; - meta.mm_geo.lower = bytes2pgno(env, env->me_dbgeo.lower); - meta.mm_geo.now = bytes2pgno(env, env->me_dbgeo.now); - meta.mm_geo.upper = bytes2pgno(env, env->me_dbgeo.upper); - meta.mm_geo.grow = (uint16_t)bytes2pgno(env, env->me_dbgeo.grow); - meta.mm_geo.shrink = (uint16_t)bytes2pgno(env, env->me_dbgeo.shrink); - - mdbx_assert(env, env->me_dbgeo.lower >= MIN_MAPSIZE); - mdbx_assert(env, meta.mm_geo.lower >= MIN_PAGENO); - mdbx_assert(env, env->me_dbgeo.upper <= MAX_MAPSIZE); - mdbx_assert(env, meta.mm_geo.upper <= MAX_PAGENO); - mdbx_assert(env, meta.mm_geo.now >= meta.mm_geo.next); - mdbx_assert(env, env->me_dbgeo.upper >= env->me_dbgeo.lower); - mdbx_assert(env, meta.mm_geo.upper >= meta.mm_geo.now); - mdbx_assert(env, meta.mm_geo.now >= meta.mm_geo.lower); - mdbx_assert(env, meta.mm_geo.grow == bytes2pgno(env, env->me_dbgeo.grow)); - mdbx_assert(env, - meta.mm_geo.shrink == bytes2pgno(env, env->me_dbgeo.shrink)); - - if (memcmp(&meta.mm_geo, &head->mm_geo, sizeof(meta.mm_geo))) { - if (meta.mm_geo.now != head->mm_geo.now || - meta.mm_geo.upper != head->mm_geo.upper) { - rc = mdbx_mapresize(env, meta.mm_geo.now, meta.mm_geo.upper); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - } - mdbx_meta_set_txnid(env, &meta, mdbx_meta_txnid_stable(env, head) + 1); - rc = mdbx_sync_locked(env, env->me_flags, &meta); - } - } else if (pagesize != (intptr_t)env->me_psize) { - mdbx_setup_pagesize(env, pagesize); - } - -bailout: - if (env->me_map && outside_txn) - mdbx_txn_unlock(env); - return rc; -} - -int __cold mdbx_env_set_mapsize(MDBX_env *env, size_t size) { - return mdbx_env_set_geometry(env, -1, size, -1, -1, -1, -1); -} - -int __cold mdbx_env_set_maxdbs(MDBX_env *env, MDBX_dbi dbs) { - if (unlikely(dbs > MAX_DBI)) - return MDBX_EINVAL; - - if (unlikely(!env)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(env->me_map)) - return MDBX_EPERM; - - env->me_maxdbs = dbs + CORE_DBS; - return MDBX_SUCCESS; -} - -int __cold mdbx_env_set_maxreaders(MDBX_env *env, unsigned readers) { - if (unlikely(readers < 1 || readers > INT16_MAX)) - return MDBX_EINVAL; - - if (unlikely(!env)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(env->me_map)) - return MDBX_EPERM; - - env->me_maxreaders = readers; - return MDBX_SUCCESS; -} - -int __cold mdbx_env_get_maxreaders(MDBX_env *env, unsigned *readers) { - if (!env || !readers) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - *readers = env->me_maxreaders; - return MDBX_SUCCESS; -} - -/* Further setup required for opening an MDBX environment */ -static int __cold mdbx_setup_dxb(MDBX_env *env, int lck_rc) { - MDBX_meta meta; - int rc = MDBX_RESULT_FALSE; - int err = mdbx_read_header(env, &meta); - if (unlikely(err != MDBX_SUCCESS)) { - if (lck_rc != /* lck exclusive */ MDBX_RESULT_TRUE || err != MDBX_ENODATA || - (env->me_flags & MDBX_RDONLY) != 0) - return err; - - mdbx_debug("create new database"); - rc = /* new database */ MDBX_RESULT_TRUE; - - if (!env->me_dbgeo.now) { - /* set defaults if not configured */ - err = mdbx_env_set_mapsize(env, DEFAULT_MAPSIZE); - if (unlikely(err != MDBX_SUCCESS)) - return err; - } - - void *buffer = calloc(NUM_METAS, env->me_psize); - if (!buffer) - return MDBX_ENOMEM; - - meta = mdbx_init_metas(env, buffer)->mp_meta; - err = mdbx_pwrite(env->me_fd, buffer, env->me_psize * NUM_METAS, 0); - free(buffer); - if (unlikely(err != MDBX_SUCCESS)) - return err; - - err = mdbx_ftruncate(env->me_fd, env->me_dbgeo.now); - if (unlikely(err != MDBX_SUCCESS)) - return err; - -#ifndef NDEBUG /* just for checking */ - err = mdbx_read_header(env, &meta); - if (unlikely(err != MDBX_SUCCESS)) - return err; -#endif - } - - mdbx_info("header: root %" PRIaPGNO "/%" PRIaPGNO ", geo %" PRIaPGNO - "/%" PRIaPGNO "-%" PRIaPGNO "/%" PRIaPGNO - " +%u -%u, txn_id %" PRIaTXN ", %s", - meta.mm_dbs[MAIN_DBI].md_root, meta.mm_dbs[FREE_DBI].md_root, - meta.mm_geo.lower, meta.mm_geo.next, meta.mm_geo.now, - meta.mm_geo.upper, meta.mm_geo.grow, meta.mm_geo.shrink, - meta.mm_txnid_a, mdbx_durable_str(&meta)); - - mdbx_setup_pagesize(env, meta.mm_psize); - if ((env->me_flags & MDBX_RDONLY) /* readonly */ - || lck_rc != MDBX_RESULT_TRUE /* not exclusive */) { - /* use present params from db */ - err = mdbx_env_set_geometry( - env, meta.mm_geo.lower * (uint64_t)meta.mm_psize, - meta.mm_geo.now * (uint64_t)meta.mm_psize, - meta.mm_geo.upper * (uint64_t)meta.mm_psize, - meta.mm_geo.grow * (uint64_t)meta.mm_psize, - meta.mm_geo.shrink * (uint64_t)meta.mm_psize, meta.mm_psize); - if (unlikely(err != MDBX_SUCCESS)) { - mdbx_error("could not use present dbsize-params from db"); - return MDBX_INCOMPATIBLE; - } - } else if (env->me_dbgeo.now) { - /* silently growth to last used page */ - const size_t used_bytes = pgno2bytes(env, meta.mm_geo.next); - if (env->me_dbgeo.lower < used_bytes) - env->me_dbgeo.lower = used_bytes; - if (env->me_dbgeo.now < used_bytes) - env->me_dbgeo.now = used_bytes; - if (env->me_dbgeo.upper < used_bytes) - env->me_dbgeo.upper = used_bytes; - - /* apply preconfigured params, but only if substantial changes: - * - upper or lower limit changes - * - shrink theshold or growth step - * But ignore just chagne just a 'now/current' size. */ - if (bytes_align2os_bytes(env, env->me_dbgeo.upper) != - pgno_align2os_bytes(env, meta.mm_geo.upper) || - bytes_align2os_bytes(env, env->me_dbgeo.lower) != - pgno_align2os_bytes(env, meta.mm_geo.lower) || - bytes_align2os_bytes(env, env->me_dbgeo.shrink) != - pgno_align2os_bytes(env, meta.mm_geo.shrink) || - bytes_align2os_bytes(env, env->me_dbgeo.grow) != - pgno_align2os_bytes(env, meta.mm_geo.grow)) { - - if (env->me_dbgeo.shrink && env->me_dbgeo.now > used_bytes) - /* pre-shrink if enabled */ - env->me_dbgeo.now = used_bytes + env->me_dbgeo.shrink - - used_bytes % env->me_dbgeo.shrink; - - err = mdbx_env_set_geometry(env, env->me_dbgeo.lower, env->me_dbgeo.now, - env->me_dbgeo.upper, env->me_dbgeo.grow, - env->me_dbgeo.shrink, meta.mm_psize); - if (unlikely(err != MDBX_SUCCESS)) { - mdbx_error("could not apply preconfigured dbsize-params to db"); - return MDBX_INCOMPATIBLE; - } - - /* update meta fields */ - meta.mm_geo.now = bytes2pgno(env, env->me_dbgeo.now); - meta.mm_geo.lower = bytes2pgno(env, env->me_dbgeo.lower); - meta.mm_geo.upper = bytes2pgno(env, env->me_dbgeo.upper); - meta.mm_geo.grow = (uint16_t)bytes2pgno(env, env->me_dbgeo.grow); - meta.mm_geo.shrink = (uint16_t)bytes2pgno(env, env->me_dbgeo.shrink); - - mdbx_info("amended: root %" PRIaPGNO "/%" PRIaPGNO ", geo %" PRIaPGNO - "/%" PRIaPGNO "-%" PRIaPGNO "/%" PRIaPGNO - " +%u -%u, txn_id %" PRIaTXN ", %s", - meta.mm_dbs[MAIN_DBI].md_root, meta.mm_dbs[FREE_DBI].md_root, - meta.mm_geo.lower, meta.mm_geo.next, meta.mm_geo.now, - meta.mm_geo.upper, meta.mm_geo.grow, meta.mm_geo.shrink, - meta.mm_txnid_a, mdbx_durable_str(&meta)); - } - mdbx_ensure(env, meta.mm_geo.now >= meta.mm_geo.next); - } else { - /* geo-params not pre-configured by user, - * get current values from a meta. */ - env->me_dbgeo.now = pgno2bytes(env, meta.mm_geo.now); - env->me_dbgeo.lower = pgno2bytes(env, meta.mm_geo.lower); - env->me_dbgeo.upper = pgno2bytes(env, meta.mm_geo.upper); - env->me_dbgeo.grow = pgno2bytes(env, meta.mm_geo.grow); - env->me_dbgeo.shrink = pgno2bytes(env, meta.mm_geo.shrink); - } - - uint64_t filesize_before_mmap; - err = mdbx_filesize(env->me_fd, &filesize_before_mmap); - if (unlikely(err != MDBX_SUCCESS)) - return err; - - const size_t expected_bytes = - mdbx_roundup2(pgno2bytes(env, meta.mm_geo.now), env->me_os_psize); - const size_t used_bytes = pgno2bytes(env, meta.mm_geo.next); - mdbx_ensure(env, expected_bytes >= used_bytes); - if (filesize_before_mmap != expected_bytes) { - if (lck_rc != /* lck exclusive */ MDBX_RESULT_TRUE) { - mdbx_info("filesize mismatch (expect %" PRIuPTR "/%" PRIaPGNO - ", have %" PRIu64 "/%" PRIaPGNO "), " - "assume collision in non-exclusive mode", - expected_bytes, bytes2pgno(env, expected_bytes), - filesize_before_mmap, - bytes2pgno(env, (size_t)filesize_before_mmap)); - } else { - mdbx_notice("filesize mismatch (expect %" PRIuPTR "/%" PRIaPGNO - ", have %" PRIu64 "/%" PRIaPGNO ")", - expected_bytes, bytes2pgno(env, expected_bytes), - filesize_before_mmap, - bytes2pgno(env, (size_t)filesize_before_mmap)); - if (filesize_before_mmap < used_bytes) { - mdbx_error("last-page beyond end-of-file (last %" PRIaPGNO - ", have %" PRIaPGNO ")", - meta.mm_geo.next, - bytes2pgno(env, (size_t)filesize_before_mmap)); - return MDBX_CORRUPTED; - } - - if (env->me_flags & MDBX_RDONLY) { - mdbx_notice("ignore filesize mismatch in readonly-mode"); - } else { - mdbx_info("resize datafile to %" PRIu64 " bytes, %" PRIaPGNO " pages", - expected_bytes, bytes2pgno(env, expected_bytes)); - err = mdbx_ftruncate(env->me_fd, expected_bytes); - if (unlikely(err != MDBX_SUCCESS)) { - mdbx_error("error %d, while resize datafile to %" PRIu64 - " bytes, %" PRIaPGNO " pages", - rc, expected_bytes, bytes2pgno(env, expected_bytes)); - return err; - } - filesize_before_mmap = expected_bytes; - } - } - } - - err = mdbx_env_map(env, (lck_rc != /* lck exclusive */ MDBX_RESULT_TRUE) - ? 0 - : expected_bytes); - if (err != MDBX_SUCCESS) - return err; - - const unsigned meta_clash_mask = mdbx_meta_eq_mask(env); - if (meta_clash_mask) { - mdbx_error("meta-pages are clashed: mask 0x%d", meta_clash_mask); - return MDBX_WANNA_RECOVERY; - } - - while (1) { - MDBX_meta *head = mdbx_meta_head(env); - const txnid_t head_txnid = mdbx_meta_txnid_fluid(env, head); - if (head_txnid == meta.mm_txnid_a) - break; - - if (lck_rc == /* lck exclusive */ MDBX_RESULT_TRUE) { - assert(META_IS_STEADY(&meta) && !META_IS_STEADY(head)); - if (env->me_flags & MDBX_RDONLY) { - mdbx_error("rollback needed: (from head %" PRIaTXN - " to steady %" PRIaTXN "), but unable in read-only mode", - head_txnid, meta.mm_txnid_a); - return MDBX_WANNA_RECOVERY /* LY: could not recovery/rollback */; - } - - /* LY: rollback weak checkpoint */ - mdbx_trace("rollback: from %" PRIaTXN ", to %" PRIaTXN, head_txnid, - meta.mm_txnid_a); - mdbx_ensure(env, head_txnid == mdbx_meta_txnid_stable(env, head)); - - if (env->me_flags & MDBX_WRITEMAP) { - head->mm_txnid_a = 0; - head->mm_datasync_sign = MDBX_DATASIGN_WEAK; - head->mm_txnid_b = 0; - const size_t offset = - ((uint8_t *)container_of(head, MDBX_page, mp_meta)) - - env->me_dxb_mmap.dxb; - const size_t paged_offset = offset & ~(env->me_os_psize - 1); - const size_t paged_length = mdbx_roundup2( - env->me_psize + offset - paged_offset, env->me_os_psize); - err = mdbx_msync(&env->me_dxb_mmap, paged_offset, paged_length, false); - } else { - MDBX_meta rollback = *head; - mdbx_meta_set_txnid(env, &rollback, 0); - rollback.mm_datasync_sign = MDBX_DATASIGN_WEAK; - err = mdbx_pwrite(env->me_fd, &rollback, sizeof(MDBX_meta), - (uint8_t *)head - (uint8_t *)env->me_map); - } - if (err) - return err; - - mdbx_invalidate_cache(env->me_map, pgno2bytes(env, NUM_METAS)); - mdbx_ensure(env, 0 == mdbx_meta_txnid_fluid(env, head)); - mdbx_ensure(env, 0 == mdbx_meta_eq_mask(env)); - continue; - } - - if (!env->me_lck) { - /* LY: without-lck (read-only) mode, so it is imposible that other - * process made weak checkpoint. */ - mdbx_error("without-lck, unable recovery/rollback"); - return MDBX_WANNA_RECOVERY; - } - - /* LY: assume just have a collision with other running process, - * or someone make a weak checkpoint */ - mdbx_info("assume collision or online weak checkpoint"); - break; - } - - const MDBX_meta *head = mdbx_meta_head(env); - if (lck_rc == /* lck exclusive */ MDBX_RESULT_TRUE) { - /* re-check file size after mmap */ - uint64_t filesize_after_mmap; - err = mdbx_filesize(env->me_fd, &filesize_after_mmap); - if (unlikely(err != MDBX_SUCCESS)) - return err; - if (filesize_after_mmap != expected_bytes) { - if (filesize_after_mmap != filesize_before_mmap) - mdbx_info("datafile resized by system to %" PRIu64 " bytes", - filesize_after_mmap); - if (filesize_after_mmap % env->me_os_psize || - filesize_after_mmap > env->me_dbgeo.upper || - filesize_after_mmap < used_bytes) { - mdbx_info("unacceptable/unexpected datafile size %" PRIu64, - filesize_after_mmap); - return MDBX_PROBLEM; - } - if ((env->me_flags & MDBX_RDONLY) == 0) { - meta.mm_geo.now = - bytes2pgno(env, env->me_dbgeo.now = (size_t)filesize_after_mmap); - mdbx_info("update meta-geo to filesize %" PRIuPTR " bytes, %" PRIaPGNO - " pages", - env->me_dbgeo.now, meta.mm_geo.now); - } - } - - if (memcmp(&meta.mm_geo, &head->mm_geo, sizeof(meta.mm_geo))) { - const txnid_t txnid = mdbx_meta_txnid_stable(env, head); - mdbx_info("updating meta.geo: " - "from l%" PRIaPGNO "-n%" PRIaPGNO "-u%" PRIaPGNO - "/s%u-g%u (txn#%" PRIaTXN "), " - "to l%" PRIaPGNO "-n%" PRIaPGNO "-u%" PRIaPGNO - "/s%u-g%u (txn#%" PRIaTXN ")", - head->mm_geo.lower, head->mm_geo.now, head->mm_geo.upper, - head->mm_geo.shrink, head->mm_geo.grow, txnid, - meta.mm_geo.lower, meta.mm_geo.now, meta.mm_geo.upper, - meta.mm_geo.shrink, meta.mm_geo.grow, txnid + 1); - - mdbx_ensure(env, mdbx_meta_eq(env, &meta, head)); - mdbx_meta_set_txnid(env, &meta, txnid + 1); - env->me_sync_pending += env->me_psize; - err = mdbx_sync_locked(env, env->me_flags | MDBX_SHRINK_ALLOWED, &meta); - if (err) { - mdbx_info("error %d, while updating meta.geo: " - "from l%" PRIaPGNO "-n%" PRIaPGNO "-u%" PRIaPGNO - "/s%u-g%u (txn#%" PRIaTXN "), " - "to l%" PRIaPGNO "-n%" PRIaPGNO "-u%" PRIaPGNO - "/s%u-g%u (txn#%" PRIaTXN ")", - err, head->mm_geo.lower, head->mm_geo.now, head->mm_geo.upper, - head->mm_geo.shrink, head->mm_geo.grow, txnid, - meta.mm_geo.lower, meta.mm_geo.now, meta.mm_geo.upper, - meta.mm_geo.shrink, meta.mm_geo.grow, txnid + 1); - return err; - } - } - } - - return rc; -} - -/****************************************************************************/ - -/* Open and/or initialize the lock region for the environment. */ -static int __cold mdbx_setup_lck(MDBX_env *env, char *lck_pathname, - mode_t mode) { - assert(env->me_fd != INVALID_HANDLE_VALUE); - assert(env->me_lfd == INVALID_HANDLE_VALUE); - - int err = mdbx_openfile(lck_pathname, O_RDWR | O_CREAT, mode, &env->me_lfd); - if (err != MDBX_SUCCESS) { - if (err != MDBX_EROFS || (env->me_flags & MDBX_RDONLY) == 0) - return err; - /* LY: without-lck mode (e.g. on read-only filesystem) */ - env->me_lfd = INVALID_HANDLE_VALUE; - env->me_oldest = &env->me_oldest_stub; - env->me_maxreaders = UINT_MAX; - mdbx_debug("lck-setup: %s ", "lockless mode (readonly)"); - return MDBX_SUCCESS; - } - - /* Try to get exclusive lock. If we succeed, then - * nobody is using the lock region and we should initialize it. */ - const int rc = mdbx_lck_seize(env); - if (MDBX_IS_ERROR(rc)) - return rc; - - mdbx_debug("lck-setup: %s ", - (rc == MDBX_RESULT_TRUE) ? "exclusive" : "shared"); - - uint64_t size; - err = mdbx_filesize(env->me_lfd, &size); - if (unlikely(err != MDBX_SUCCESS)) - return err; - - if (rc == MDBX_RESULT_TRUE) { - uint64_t wanna = mdbx_roundup2( - (env->me_maxreaders - 1) * sizeof(MDBX_reader) + sizeof(MDBX_lockinfo), - env->me_os_psize); -#ifndef NDEBUG - err = mdbx_ftruncate(env->me_lfd, size = 0); - if (unlikely(err != MDBX_SUCCESS)) - return err; -#endif - mdbx_jitter4testing(false); - - if (size != wanna) { - err = mdbx_ftruncate(env->me_lfd, wanna); - if (unlikely(err != MDBX_SUCCESS)) - return err; - size = wanna; - } - } else if (size > SSIZE_MAX || (size & (env->me_os_psize - 1)) || - size < env->me_os_psize) { - mdbx_notice("lck-file has invalid size %" PRIu64 " bytes", size); - return MDBX_PROBLEM; - } - - const size_t maxreaders = - ((size_t)size - sizeof(MDBX_lockinfo)) / sizeof(MDBX_reader) + 1; - if (maxreaders > UINT16_MAX) { - mdbx_error("lck-size too big (up to %" PRIuPTR " readers)", maxreaders); - return MDBX_PROBLEM; - } - env->me_maxreaders = (unsigned)maxreaders; - - err = mdbx_mmap(MDBX_WRITEMAP, &env->me_lck_mmap, (size_t)size, (size_t)size); - if (unlikely(err != MDBX_SUCCESS)) - return err; - -#ifdef MADV_DODUMP - (void)madvise(env->me_lck, size, MADV_DODUMP); -#endif - -#ifdef MADV_DONTFORK - if (madvise(env->me_lck, size, MADV_DONTFORK) < 0) - return errno; -#endif - -#ifdef MADV_WILLNEED - if (madvise(env->me_lck, size, MADV_WILLNEED) < 0) - return errno; -#endif - -#ifdef MADV_RANDOM - if (madvise(env->me_lck, size, MADV_RANDOM) < 0) - return errno; -#endif - - if (rc == MDBX_RESULT_TRUE) { - /* LY: exlcusive mode, init lck */ - memset(env->me_lck, 0, (size_t)size); - err = mdbx_lck_init(env); - if (err) - return err; - - env->me_lck->mti_magic_and_version = MDBX_LOCK_MAGIC; - env->me_lck->mti_os_and_format = MDBX_LOCK_FORMAT; - } else { - if (env->me_lck->mti_magic_and_version != MDBX_LOCK_MAGIC) { - mdbx_error("lock region has invalid magic/version"); - return ((env->me_lck->mti_magic_and_version >> 8) != MDBX_MAGIC) - ? MDBX_INVALID - : MDBX_VERSION_MISMATCH; - } - if (env->me_lck->mti_os_and_format != MDBX_LOCK_FORMAT) { - mdbx_error("lock region has os/format 0x%" PRIx32 ", expected 0x%" PRIx32, - env->me_lck->mti_os_and_format, MDBX_LOCK_FORMAT); - return MDBX_VERSION_MISMATCH; - } - } - - mdbx_assert(env, !MDBX_IS_ERROR(rc)); - env->me_oldest = &env->me_lck->mti_oldest; - return rc; -} - -/* Only a subset of the mdbx_env flags can be changed - * at runtime. Changing other flags requires closing the - * environment and re-opening it with the new flags. */ -#define CHANGEABLE \ - (MDBX_NOSYNC | MDBX_NOMETASYNC | MDBX_MAPASYNC | MDBX_NOMEMINIT | \ - MDBX_COALESCE | MDBX_PAGEPERTURB) -#define CHANGELESS \ - (MDBX_NOSUBDIR | MDBX_RDONLY | MDBX_WRITEMAP | MDBX_NOTLS | MDBX_NORDAHEAD | \ - MDBX_LIFORECLAIM) - -#if VALID_FLAGS & PERSISTENT_FLAGS & (CHANGEABLE | CHANGELESS) -#error "Persistent DB flags & env flags overlap, but both go in mm_flags" -#endif - -int __cold mdbx_env_open_ex(MDBX_env *env, const char *path, unsigned flags, - mode_t mode, int *exclusive) { - if (unlikely(!env || !path)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - if (env->me_fd != INVALID_HANDLE_VALUE || - (flags & ~(CHANGEABLE | CHANGELESS))) - return MDBX_EINVAL; - - size_t len_full, len = strlen(path); - if (flags & MDBX_NOSUBDIR) { - len_full = len + sizeof(MDBX_LOCK_SUFFIX) + len + 1; - } else { - len_full = len + sizeof(MDBX_LOCKNAME) + len + sizeof(MDBX_DATANAME); - } - char *lck_pathname = malloc(len_full); - if (!lck_pathname) - return MDBX_ENOMEM; - - char *dxb_pathname; - if (flags & MDBX_NOSUBDIR) { - dxb_pathname = lck_pathname + len + sizeof(MDBX_LOCK_SUFFIX); - sprintf(lck_pathname, "%s" MDBX_LOCK_SUFFIX, path); - strcpy(dxb_pathname, path); - } else { - dxb_pathname = lck_pathname + len + sizeof(MDBX_LOCKNAME); - sprintf(lck_pathname, "%s" MDBX_LOCKNAME, path); - sprintf(dxb_pathname, "%s" MDBX_DATANAME, path); - } - - int rc = MDBX_SUCCESS; - flags |= env->me_flags; - if (flags & MDBX_RDONLY) { - /* LY: silently ignore irrelevant flags when - * we're only getting read access */ - flags &= ~(MDBX_WRITEMAP | MDBX_MAPASYNC | MDBX_NOSYNC | MDBX_NOMETASYNC | - MDBX_COALESCE | MDBX_LIFORECLAIM | MDBX_NOMEMINIT); - } else { - if (!((env->me_free_pgs = mdbx_pnl_alloc(MDBX_PNL_UM_MAX)) && - (env->me_dirtylist = calloc(MDBX_PNL_UM_SIZE, sizeof(MDBX_ID2))))) - rc = MDBX_ENOMEM; - } - env->me_flags = flags |= MDBX_ENV_ACTIVE; - if (rc) - goto bailout; - - env->me_path = mdbx_strdup(path); - env->me_dbxs = calloc(env->me_maxdbs, sizeof(MDBX_dbx)); - env->me_dbflags = calloc(env->me_maxdbs, sizeof(uint16_t)); - env->me_dbiseqs = calloc(env->me_maxdbs, sizeof(unsigned)); - if (!(env->me_dbxs && env->me_path && env->me_dbflags && env->me_dbiseqs)) { - rc = MDBX_ENOMEM; - goto bailout; - } - env->me_dbxs[FREE_DBI].md_cmp = mdbx_cmp_int_ai; /* aligned MDBX_INTEGERKEY */ - - int oflags; - if (F_ISSET(flags, MDBX_RDONLY)) - oflags = O_RDONLY; - else - oflags = O_RDWR | O_CREAT; - - rc = mdbx_openfile(dxb_pathname, oflags, mode, &env->me_fd); - if (rc != MDBX_SUCCESS) - goto bailout; - - const int lck_rc = mdbx_setup_lck(env, lck_pathname, mode); - if (MDBX_IS_ERROR(lck_rc)) { - rc = lck_rc; - goto bailout; - } - - const int dxb_rc = mdbx_setup_dxb(env, lck_rc); - if (MDBX_IS_ERROR(dxb_rc)) { - rc = dxb_rc; - goto bailout; - } - - mdbx_debug("opened dbenv %p", (void *)env); - const unsigned mode_flags = - MDBX_WRITEMAP | MDBX_NOSYNC | MDBX_NOMETASYNC | MDBX_MAPASYNC; - if (lck_rc == MDBX_RESULT_TRUE) { - env->me_lck->mti_envmode = env->me_flags & (mode_flags | MDBX_RDONLY); - if (exclusive == NULL || *exclusive < 2) { - /* LY: downgrade lock only if exclusive access not requested. - * in case exclusive==1, just leave value as is. */ - rc = mdbx_lck_downgrade(env, true); - mdbx_debug("lck-downgrade-full: rc %i ", rc); - } else { - rc = mdbx_lck_downgrade(env, false); - mdbx_debug("lck-downgrade-partial: rc %i ", rc); - } - if (rc != MDBX_SUCCESS) - goto bailout; - } else { - if (exclusive) { - /* LY: just indicate that is not an exclusive access. */ - *exclusive = 0; - } - if ((env->me_flags & MDBX_RDONLY) == 0) { - while (env->me_lck->mti_envmode == MDBX_RDONLY) { - if (mdbx_atomic_compare_and_swap32(&env->me_lck->mti_envmode, - MDBX_RDONLY, - env->me_flags & mode_flags)) - break; - /* TODO: yield/relax cpu */ - } - if ((env->me_lck->mti_envmode ^ env->me_flags) & mode_flags) { - mdbx_error("current mode/flags incompatible with requested"); - rc = MDBX_INCOMPATIBLE; - goto bailout; - } - } - } - - if (env->me_lck && (env->me_flags & MDBX_NOTLS) == 0) { - rc = mdbx_rthc_alloc(&env->me_txkey, &env->me_lck->mti_readers[0], - &env->me_lck->mti_readers[env->me_maxreaders]); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - env->me_flags |= MDBX_ENV_TXKEY; - } - - if ((flags & MDBX_RDONLY) == 0) { - MDBX_txn *txn; - int tsize = sizeof(MDBX_txn), - size = tsize + - env->me_maxdbs * (sizeof(MDBX_db) + sizeof(MDBX_cursor *) + - sizeof(unsigned) + 1); - if ((env->me_pbuf = calloc(1, env->me_psize)) && (txn = calloc(1, size))) { - txn->mt_dbs = (MDBX_db *)((char *)txn + tsize); - txn->mt_cursors = (MDBX_cursor **)(txn->mt_dbs + env->me_maxdbs); - txn->mt_dbiseqs = (unsigned *)(txn->mt_cursors + env->me_maxdbs); - txn->mt_dbflags = (uint8_t *)(txn->mt_dbiseqs + env->me_maxdbs); - txn->mt_env = env; - txn->mt_dbxs = env->me_dbxs; - txn->mt_flags = MDBX_TXN_FINISHED; - env->me_txn0 = txn; - } else { - rc = MDBX_ENOMEM; - } - } - -#if MDBX_DEBUG - if (rc == MDBX_SUCCESS) { - MDBX_meta *meta = mdbx_meta_head(env); - MDBX_db *db = &meta->mm_dbs[MAIN_DBI]; - - mdbx_debug("opened database version %u, pagesize %u", - (uint8_t)meta->mm_magic_and_version, env->me_psize); - mdbx_debug("using meta page %" PRIaPGNO ", txn %" PRIaTXN "", - container_of(meta, MDBX_page, mp_data)->mp_pgno, - mdbx_meta_txnid_fluid(env, meta)); - mdbx_debug("depth: %u", db->md_depth); - mdbx_debug("entries: %" PRIu64 "", db->md_entries); - mdbx_debug("branch pages: %" PRIaPGNO "", db->md_branch_pages); - mdbx_debug("leaf pages: %" PRIaPGNO "", db->md_leaf_pages); - mdbx_debug("overflow pages: %" PRIaPGNO "", db->md_overflow_pages); - mdbx_debug("root: %" PRIaPGNO "", db->md_root); - } -#endif - -bailout: - if (rc) - mdbx_env_close0(env); - free(lck_pathname); - return rc; -} - -int __cold mdbx_env_open(MDBX_env *env, const char *path, unsigned flags, - mode_t mode) { - return mdbx_env_open_ex(env, path, flags, mode, NULL); -} - -/* Destroy resources from mdbx_env_open(), clear our readers & DBIs */ -static void __cold mdbx_env_close0(MDBX_env *env) { - if (!(env->me_flags & MDBX_ENV_ACTIVE)) - return; - env->me_flags &= ~MDBX_ENV_ACTIVE; - - /* Doing this here since me_dbxs may not exist during mdbx_env_close */ - if (env->me_dbxs) { - for (unsigned i = env->me_maxdbs; --i >= CORE_DBS;) - free(env->me_dbxs[i].md_name.iov_base); - free(env->me_dbxs); - } - - free(env->me_pbuf); - free(env->me_dbiseqs); - free(env->me_dbflags); - free(env->me_path); - free(env->me_dirtylist); - if (env->me_txn0) { - mdbx_txl_free(env->me_txn0->mt_lifo_reclaimed); - free(env->me_txn0); - } - mdbx_pnl_free(env->me_free_pgs); - - if (env->me_flags & MDBX_ENV_TXKEY) { - mdbx_rthc_remove(env->me_txkey); - env->me_flags &= ~MDBX_ENV_TXKEY; - } - - if (env->me_map) { - mdbx_munmap(&env->me_dxb_mmap); -#ifdef USE_VALGRIND - VALGRIND_DISCARD(env->me_valgrind_handle); - env->me_valgrind_handle = -1; -#endif - } - if (env->me_fd != INVALID_HANDLE_VALUE) { - (void)mdbx_closefile(env->me_fd); - env->me_fd = INVALID_HANDLE_VALUE; - } - - if (env->me_lck) - mdbx_munmap(&env->me_lck_mmap); - env->me_pid = 0; - env->me_oldest = nullptr; - - mdbx_lck_destroy(env); - if (env->me_lfd != INVALID_HANDLE_VALUE) { - (void)mdbx_closefile(env->me_lfd); - env->me_lfd = INVALID_HANDLE_VALUE; - } -} - -int __cold mdbx_env_close_ex(MDBX_env *env, int dont_sync) { - MDBX_page *dp; - int rc = MDBX_SUCCESS; - - if (unlikely(!env)) - return MDBX_EINVAL; - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - if (!dont_sync && !(env->me_flags & MDBX_RDONLY)) - rc = mdbx_env_sync(env, true); - - VALGRIND_DESTROY_MEMPOOL(env); - while ((dp = env->me_dpages) != NULL) { - ASAN_UNPOISON_MEMORY_REGION(&dp->mp_next, sizeof(dp->mp_next)); - VALGRIND_MAKE_MEM_DEFINED(&dp->mp_next, sizeof(dp->mp_next)); - env->me_dpages = dp->mp_next; - free(dp); - } - - mdbx_env_close0(env); - mdbx_ensure(env, mdbx_fastmutex_destroy(&env->me_dbi_lock) == MDBX_SUCCESS); - env->me_signature = 0; - free(env); - - return rc; -} - -void __cold mdbx_env_close(MDBX_env *env) { mdbx_env_close_ex(env, 0); } - -/* Compare two items pointing at aligned unsigned int's. */ -static int __hot mdbx_cmp_int_ai(const MDBX_val *a, const MDBX_val *b) { - mdbx_assert(NULL, a->iov_len == b->iov_len); - mdbx_assert(NULL, 0 == (uintptr_t)a->iov_base % sizeof(int) && - 0 == (uintptr_t)b->iov_base % sizeof(int)); - switch (a->iov_len) { - case 4: - return mdbx_cmp2int(*(uint32_t *)a->iov_base, *(uint32_t *)b->iov_base); - case 8: - return mdbx_cmp2int(*(uint64_t *)a->iov_base, *(uint64_t *)b->iov_base); - default: - mdbx_assert_fail(NULL, "invalid size for INTEGERKEY/INTEGERDUP", mdbx_func_, - __LINE__); - return 0; - } -} - -/* Compare two items pointing at 2-byte aligned unsigned int's. */ -static int __hot mdbx_cmp_int_a2(const MDBX_val *a, const MDBX_val *b) { - mdbx_assert(NULL, a->iov_len == b->iov_len); - mdbx_assert(NULL, 0 == (uintptr_t)a->iov_base % sizeof(uint16_t) && - 0 == (uintptr_t)b->iov_base % sizeof(uint16_t)); -#if UNALIGNED_OK - switch (a->iov_len) { - case 4: - return mdbx_cmp2int(*(uint32_t *)a->iov_base, *(uint32_t *)b->iov_base); - case 8: - return mdbx_cmp2int(*(uint64_t *)a->iov_base, *(uint64_t *)b->iov_base); - default: - mdbx_assert_fail(NULL, "invalid size for INTEGERKEY/INTEGERDUP", mdbx_func_, - __LINE__); - return 0; - } -#else - mdbx_assert(NULL, 0 == a->iov_len % sizeof(uint16_t)); - { - int diff; - const uint16_t *pa, *pb, *end; - -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - end = (const uint16_t *)a->iov_base; - pa = (const uint16_t *)((char *)a->iov_base + a->iov_len); - pb = (const uint16_t *)((char *)b->iov_base + a->iov_len); - do { - diff = *--pa - *--pb; -#else /* __BYTE_ORDER__ */ - end = (const uint16_t *)((char *)a->iov_base + a->iov_len); - pa = (const uint16_t *)a->iov_base; - pb = (const uint16_t *)b->iov_base; - do { - diff = *pa++ - *pb++; -#endif /* __BYTE_ORDER__ */ - if (likely(diff != 0)) - break; - } while (pa != end); - return diff; - } -#endif /* UNALIGNED_OK */ -} - -/* Compare two items pointing at unsigneds of unknown alignment. - * - * This is also set as MDBX_INTEGERDUP|MDBX_DUPFIXED's MDBX_dbx.md_dcmp. */ -static int __hot mdbx_cmp_int_ua(const MDBX_val *a, const MDBX_val *b) { - mdbx_assert(NULL, a->iov_len == b->iov_len); -#if UNALIGNED_OK - switch (a->iov_len) { - case 4: - return mdbx_cmp2int(*(uint32_t *)a->iov_base, *(uint32_t *)b->iov_base); - case 8: - return mdbx_cmp2int(*(uint64_t *)a->iov_base, *(uint64_t *)b->iov_base); - default: - mdbx_assert_fail(NULL, "invalid size for INTEGERKEY/INTEGERDUP", mdbx_func_, - __LINE__); - return 0; - } -#else - mdbx_assert(NULL, a->iov_len == sizeof(int) || a->iov_len == sizeof(size_t)); -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - { - int diff; - const uint8_t *pa, *pb; - - pa = (const uint8_t *)a->iov_base + a->iov_len; - pb = (const uint8_t *)b->iov_base + a->iov_len; - - do { - diff = *--pa - *--pb; - if (likely(diff != 0)) - break; - } while (pa != a->iov_base); - return diff; - } -#else /* __BYTE_ORDER__ */ - return memcmp(a->iov_base, b->iov_base, a->iov_len); -#endif /* __BYTE_ORDER__ */ -#endif /* UNALIGNED_OK */ -} - -/* Compare two items lexically */ -static int __hot mdbx_cmp_memn(const MDBX_val *a, const MDBX_val *b) { -/* LY: assumes that length of keys are NOT equal for most cases, - * if no then branch-prediction should mitigate the problem */ -#if 0 - /* LY: without branch instructions on x86, - * but isn't best for equal length of keys */ - int diff_len = mdbx_cmp2int(a->iov_len, b->iov_len); -#else - /* LY: best when length of keys are equal, - * but got a branch-penalty otherwise */ - if (likely(a->iov_len == b->iov_len)) - return memcmp(a->iov_base, b->iov_base, a->iov_len); - int diff_len = (a->iov_len < b->iov_len) ? -1 : 1; -#endif - size_t shortest = (a->iov_len < b->iov_len) ? a->iov_len : b->iov_len; - int diff_data = memcmp(a->iov_base, b->iov_base, shortest); - return likely(diff_data) ? diff_data : diff_len; -} - -/* Compare two items in reverse byte order */ -static int __hot mdbx_cmp_memnr(const MDBX_val *a, const MDBX_val *b) { - const uint8_t *pa, *pb, *end; - - pa = (const uint8_t *)a->iov_base + a->iov_len; - pb = (const uint8_t *)b->iov_base + b->iov_len; - size_t minlen = (a->iov_len < b->iov_len) ? a->iov_len : b->iov_len; - end = pa - minlen; - - while (pa != end) { - int diff = *--pa - *--pb; - if (likely(diff)) - return diff; - } - return mdbx_cmp2int(a->iov_len, b->iov_len); -} - -/* Search for key within a page, using binary search. - * Returns the smallest entry larger or equal to the key. - * If exactp is non-null, stores whether the found entry was an exact match - * in *exactp (1 or 0). - * Updates the cursor index with the index of the found entry. - * If no entry larger or equal to the key is found, returns NULL. */ -static MDBX_node *__hot mdbx_node_search(MDBX_cursor *mc, MDBX_val *key, - int *exactp) { - unsigned i = 0, nkeys; - int low, high; - int rc = 0; - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - MDBX_node *node = NULL; - MDBX_val nodekey; - MDBX_cmp_func *cmp; - DKBUF; - - nkeys = NUMKEYS(mp); - - mdbx_debug("searching %u keys in %s %spage %" PRIaPGNO "", nkeys, - IS_LEAF(mp) ? "leaf" : "branch", IS_SUBP(mp) ? "sub-" : "", - mp->mp_pgno); - - low = IS_LEAF(mp) ? 0 : 1; - high = nkeys - 1; - cmp = mc->mc_dbx->md_cmp; - - /* Branch pages have no data, so if using integer keys, - * alignment is guaranteed. Use faster mdbx_cmp_int_ai. - */ - if (cmp == mdbx_cmp_int_a2 && IS_BRANCH(mp)) - cmp = mdbx_cmp_int_ai; - - if (IS_LEAF2(mp)) { - nodekey.iov_len = mc->mc_db->md_xsize; - node = NODEPTR(mp, 0); /* fake */ - while (low <= high) { - i = (low + high) >> 1; - nodekey.iov_base = LEAF2KEY(mp, i, nodekey.iov_len); - rc = cmp(key, &nodekey); - mdbx_debug("found leaf index %u [%s], rc = %i", i, DKEY(&nodekey), rc); - if (rc == 0) - break; - if (rc > 0) - low = i + 1; - else - high = i - 1; - } - } else { - while (low <= high) { - i = (low + high) >> 1; - - node = NODEPTR(mp, i); - nodekey.iov_len = NODEKSZ(node); - nodekey.iov_base = NODEKEY(node); - - rc = cmp(key, &nodekey); - if (IS_LEAF(mp)) - mdbx_debug("found leaf index %u [%s], rc = %i", i, DKEY(&nodekey), rc); - else - mdbx_debug("found branch index %u [%s -> %" PRIaPGNO "], rc = %i", i, - DKEY(&nodekey), NODEPGNO(node), rc); - if (rc == 0) - break; - if (rc > 0) - low = i + 1; - else - high = i - 1; - } - } - - if (rc > 0) /* Found entry is less than the key. */ - i++; /* Skip to get the smallest entry larger than key. */ - - if (exactp) - *exactp = (rc == 0 && nkeys > 0); - /* store the key index */ - mdbx_cassert(mc, i <= UINT16_MAX); - mc->mc_ki[mc->mc_top] = (indx_t)i; - if (i >= nkeys) - /* There is no entry larger or equal to the key. */ - return NULL; - - /* nodeptr is fake for LEAF2 */ - return IS_LEAF2(mp) ? node : NODEPTR(mp, i); -} - -#if 0 /* unused for now */ -static void mdbx_cursor_adjust(MDBX_cursor *mc, func) { - MDBX_cursor *m2; - - for (m2 = mc->mc_txn->mt_cursors[mc->mc_dbi]; m2; m2 = m2->mc_next) { - if (m2->mc_pg[m2->mc_top] == mc->mc_pg[mc->mc_top]) { - func(mc, m2); - } - } -} -#endif - -/* Pop a page off the top of the cursor's stack. */ -static void mdbx_cursor_pop(MDBX_cursor *mc) { - if (mc->mc_snum) { - mdbx_debug("popped page %" PRIaPGNO " off db %d cursor %p", - mc->mc_pg[mc->mc_top]->mp_pgno, DDBI(mc), (void *)mc); - - mc->mc_snum--; - if (mc->mc_snum) { - mc->mc_top--; - } else { - mc->mc_flags &= ~C_INITIALIZED; - } - } -} - -/* Push a page onto the top of the cursor's stack. - * Set MDBX_TXN_ERROR on failure. */ -static int mdbx_cursor_push(MDBX_cursor *mc, MDBX_page *mp) { - mdbx_debug("pushing page %" PRIaPGNO " on db %d cursor %p", mp->mp_pgno, - DDBI(mc), (void *)mc); - - if (unlikely(mc->mc_snum >= CURSOR_STACK)) { - mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; - return MDBX_CURSOR_FULL; - } - - mdbx_cassert(mc, mc->mc_snum < UINT16_MAX); - mc->mc_top = mc->mc_snum++; - mc->mc_pg[mc->mc_top] = mp; - mc->mc_ki[mc->mc_top] = 0; - - return MDBX_SUCCESS; -} - -/* Find the address of the page corresponding to a given page number. - * Set MDBX_TXN_ERROR on failure. - * - * [in] mc the cursor accessing the page. - * [in] pgno the page number for the page to retrieve. - * [out] ret address of a pointer where the page's address will be - * stored. - * [out] lvl dirtylist inheritance level of found page. 1=current txn, - * 0=mapped page. - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_get(MDBX_cursor *mc, pgno_t pgno, MDBX_page **ret, - int *lvl) { - MDBX_txn *txn = mc->mc_txn; - MDBX_env *env = txn->mt_env; - MDBX_page *p = NULL; - int level; - - if (!(txn->mt_flags & (MDBX_TXN_RDONLY | MDBX_TXN_WRITEMAP))) { - MDBX_txn *tx2 = txn; - level = 1; - do { - MDBX_ID2L dl = tx2->mt_rw_dirtylist; - unsigned x; - /* Spilled pages were dirtied in this txn and flushed - * because the dirty list got full. Bring this page - * back in from the map (but don't unspill it here, - * leave that unless page_touch happens again). */ - if (tx2->mt_spill_pages) { - pgno_t pn = pgno << 1; - x = mdbx_pnl_search(tx2->mt_spill_pages, pn); - if (x <= tx2->mt_spill_pages[0] && tx2->mt_spill_pages[x] == pn) - goto mapped; - } - if (dl[0].mid) { - unsigned y = mdbx_mid2l_search(dl, pgno); - if (y <= dl[0].mid && dl[y].mid == pgno) { - p = dl[y].mptr; - goto done; - } - } - level++; - } while ((tx2 = tx2->mt_parent) != NULL); - } - - if (unlikely(pgno >= txn->mt_next_pgno)) { - mdbx_debug("page %" PRIaPGNO " not found", pgno); - txn->mt_flags |= MDBX_TXN_ERROR; - return MDBX_PAGE_NOTFOUND; - } - level = 0; - -mapped: - p = pgno2page(env, pgno); -/* TODO: check p->mp_validator here */ - -done: - *ret = p; - if (lvl) - *lvl = level; - return MDBX_SUCCESS; -} - -/* Finish mdbx_page_search() / mdbx_page_search_lowest(). - * The cursor is at the root page, set up the rest of it. */ -static int mdbx_page_search_root(MDBX_cursor *mc, MDBX_val *key, int flags) { - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - int rc; - DKBUF; - - while (IS_BRANCH(mp)) { - MDBX_node *node; - indx_t i; - - mdbx_debug("branch page %" PRIaPGNO " has %u keys", mp->mp_pgno, - NUMKEYS(mp)); - /* Don't assert on branch pages in the FreeDB. We can get here - * while in the process of rebalancing a FreeDB branch page; we must - * let that proceed. ITS#8336 */ - mdbx_cassert(mc, !mc->mc_dbi || NUMKEYS(mp) > 1); - mdbx_debug("found index 0 to page %" PRIaPGNO "", NODEPGNO(NODEPTR(mp, 0))); - - if (flags & (MDBX_PS_FIRST | MDBX_PS_LAST)) { - i = 0; - if (flags & MDBX_PS_LAST) { - i = NUMKEYS(mp) - 1; - /* if already init'd, see if we're already in right place */ - if (mc->mc_flags & C_INITIALIZED) { - if (mc->mc_ki[mc->mc_top] == i) { - mc->mc_top = mc->mc_snum++; - mp = mc->mc_pg[mc->mc_top]; - goto ready; - } - } - } - } else { - int exact; - node = mdbx_node_search(mc, key, &exact); - if (node == NULL) - i = NUMKEYS(mp) - 1; - else { - i = mc->mc_ki[mc->mc_top]; - if (!exact) { - mdbx_cassert(mc, i > 0); - i--; - } - } - mdbx_debug("following index %u for key [%s]", i, DKEY(key)); - } - - mdbx_cassert(mc, i < NUMKEYS(mp)); - node = NODEPTR(mp, i); - - if (unlikely((rc = mdbx_page_get(mc, NODEPGNO(node), &mp, NULL)) != 0)) - return rc; - - mc->mc_ki[mc->mc_top] = i; - if (unlikely(rc = mdbx_cursor_push(mc, mp))) - return rc; - - ready: - if (flags & MDBX_PS_MODIFY) { - if (unlikely((rc = mdbx_page_touch(mc)) != 0)) - return rc; - mp = mc->mc_pg[mc->mc_top]; - } - } - - if (unlikely(!IS_LEAF(mp))) { - mdbx_debug("internal error, index points to a page with 0x%02x flags!?", - mp->mp_flags); - mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; - return MDBX_CORRUPTED; - } - - mdbx_debug("found leaf page %" PRIaPGNO " for key [%s]", mp->mp_pgno, - DKEY(key)); - mc->mc_flags |= C_INITIALIZED; - mc->mc_flags &= ~C_EOF; - - return MDBX_SUCCESS; -} - -/* Search for the lowest key under the current branch page. - * This just bypasses a NUMKEYS check in the current page - * before calling mdbx_page_search_root(), because the callers - * are all in situations where the current page is known to - * be underfilled. */ -static int mdbx_page_search_lowest(MDBX_cursor *mc) { - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - MDBX_node *node = NODEPTR(mp, 0); - int rc; - - if (unlikely((rc = mdbx_page_get(mc, NODEPGNO(node), &mp, NULL)) != 0)) - return rc; - - mc->mc_ki[mc->mc_top] = 0; - if (unlikely(rc = mdbx_cursor_push(mc, mp))) - return rc; - return mdbx_page_search_root(mc, NULL, MDBX_PS_FIRST); -} - -/* Search for the page a given key should be in. - * Push it and its parent pages on the cursor stack. - * - * [in,out] mc the cursor for this operation. - * [in] key the key to search for, or NULL for first/last page. - * [in] flags If MDBX_PS_MODIFY is set, visited pages in the DB - * are touched (updated with new page numbers). - * If MDBX_PS_FIRST or MDBX_PS_LAST is set, find first or last - * leaf. - * This is used by mdbx_cursor_first() and mdbx_cursor_last(). - * If MDBX_PS_ROOTONLY set, just fetch root node, no further - * lookups. - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_search(MDBX_cursor *mc, MDBX_val *key, int flags) { - int rc; - pgno_t root; - - /* Make sure the txn is still viable, then find the root from - * the txn's db table and set it as the root of the cursor's stack. */ - if (unlikely(mc->mc_txn->mt_flags & MDBX_TXN_BLOCKED)) { - mdbx_debug("transaction has failed, must abort"); - return MDBX_BAD_TXN; - } - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - /* Make sure we're using an up-to-date root */ - if (unlikely(*mc->mc_dbflag & DB_STALE)) { - MDBX_cursor mc2; - if (unlikely(TXN_DBI_CHANGED(mc->mc_txn, mc->mc_dbi))) - return MDBX_BAD_DBI; - mdbx_cursor_init(&mc2, mc->mc_txn, MAIN_DBI, NULL); - rc = mdbx_page_search(&mc2, &mc->mc_dbx->md_name, 0); - if (rc) - return rc; - { - MDBX_val data; - int exact = 0; - MDBX_node *leaf = mdbx_node_search(&mc2, &mc->mc_dbx->md_name, &exact); - if (!exact) - return MDBX_NOTFOUND; - if (unlikely((leaf->mn_flags & (F_DUPDATA | F_SUBDATA)) != F_SUBDATA)) - return MDBX_INCOMPATIBLE; /* not a named DB */ - rc = mdbx_node_read(&mc2, leaf, &data); - if (rc) - return rc; - - uint16_t md_flags; - memcpy(&md_flags, ((char *)data.iov_base + offsetof(MDBX_db, md_flags)), - sizeof(uint16_t)); - /* The txn may not know this DBI, or another process may - * have dropped and recreated the DB with other flags. */ - if (unlikely((mc->mc_db->md_flags & PERSISTENT_FLAGS) != md_flags)) - return MDBX_INCOMPATIBLE; - memcpy(mc->mc_db, data.iov_base, sizeof(MDBX_db)); - } - *mc->mc_dbflag &= ~DB_STALE; - } - root = mc->mc_db->md_root; - - if (unlikely(root == P_INVALID)) { /* Tree is empty. */ - mdbx_debug("tree is empty"); - return MDBX_NOTFOUND; - } - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - mdbx_cassert(mc, root >= NUM_METAS); - if (!mc->mc_pg[0] || mc->mc_pg[0]->mp_pgno != root) - if (unlikely((rc = mdbx_page_get(mc, root, &mc->mc_pg[0], NULL)) != 0)) - return rc; - - mc->mc_snum = 1; - mc->mc_top = 0; - - mdbx_debug("db %d root page %" PRIaPGNO " has flags 0x%X", DDBI(mc), root, - mc->mc_pg[0]->mp_flags); - - if (flags & MDBX_PS_MODIFY) { - if (unlikely(rc = mdbx_page_touch(mc))) - return rc; - } - - if (flags & MDBX_PS_ROOTONLY) - return MDBX_SUCCESS; - - return mdbx_page_search_root(mc, key, flags); -} - -static int mdbx_ovpage_free(MDBX_cursor *mc, MDBX_page *mp) { - MDBX_txn *txn = mc->mc_txn; - pgno_t pg = mp->mp_pgno; - unsigned x = 0, ovpages = mp->mp_pages; - MDBX_env *env = txn->mt_env; - MDBX_PNL sl = txn->mt_spill_pages; - pgno_t pn = pg << 1; - int rc; - - mdbx_debug("free ov page %" PRIaPGNO " (%u)", pg, ovpages); - /* If the page is dirty or on the spill list we just acquired it, - * so we should give it back to our current free list, if any. - * Otherwise put it onto the list of pages we freed in this txn. - * - * Won't create me_reclaimed_pglist: me_last_reclaimed must be inited along - * with it. - * Unsupported in nested txns: They would need to hide the page - * range in ancestor txns' dirty and spilled lists. */ - if (env->me_reclaimed_pglist && !txn->mt_parent && - ((mp->mp_flags & P_DIRTY) || - (sl && (x = mdbx_pnl_search(sl, pn)) <= sl[0] && sl[x] == pn))) { - unsigned i, j; - pgno_t *mop; - MDBX_ID2 *dl, ix, iy; - rc = mdbx_pnl_need(&env->me_reclaimed_pglist, ovpages); - if (unlikely(rc)) - return rc; - if (!(mp->mp_flags & P_DIRTY)) { - /* This page is no longer spilled */ - if (x == sl[0]) - sl[0]--; - else - sl[x] |= 1; - goto release; - } - /* Remove from dirty list */ - dl = txn->mt_rw_dirtylist; - x = dl[0].mid--; - for (ix = dl[x]; ix.mptr != mp; ix = iy) { - if (likely(x > 1)) { - x--; - iy = dl[x]; - dl[x] = ix; - } else { - mdbx_cassert(mc, x > 1); - mdbx_error("not found page 0x%p #%" PRIaPGNO " in the dirtylist", mp, - mp->mp_pgno); - j = ++(dl[0].mid); - dl[j] = ix; /* Unsorted. OK when MDBX_TXN_ERROR. */ - txn->mt_flags |= MDBX_TXN_ERROR; - return MDBX_PROBLEM; - } - } - txn->mt_dirtyroom++; - if (!(env->me_flags & MDBX_WRITEMAP)) - mdbx_dpage_free(env, mp); - release: - /* Insert in me_reclaimed_pglist */ - mop = env->me_reclaimed_pglist; - j = mop[0] + ovpages; - for (i = mop[0]; i && mop[i] < pg; i--) - mop[j--] = mop[i]; - while (j > i) - mop[j--] = pg++; - mop[0] += ovpages; - } else { - rc = mdbx_pnl_append_range(&txn->mt_befree_pages, pg, ovpages); - if (unlikely(rc)) - return rc; - } - mc->mc_db->md_overflow_pages -= ovpages; - return 0; -} - -/* Return the data associated with a given node. - * - * [in] mc The cursor for this operation. - * [in] leaf The node being read. - * [out] data Updated to point to the node's data. - * - * Returns 0 on success, non-zero on failure. */ -static __inline int mdbx_node_read(MDBX_cursor *mc, MDBX_node *leaf, - MDBX_val *data) { - MDBX_page *omp; /* overflow page */ - pgno_t pgno; - int rc; - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - if (!F_ISSET(leaf->mn_flags, F_BIGDATA)) { - data->iov_len = NODEDSZ(leaf); - data->iov_base = NODEDATA(leaf); - return MDBX_SUCCESS; - } - - /* Read overflow data. */ - data->iov_len = NODEDSZ(leaf); - memcpy(&pgno, NODEDATA(leaf), sizeof(pgno)); - if (unlikely((rc = mdbx_page_get(mc, pgno, &omp, NULL)) != 0)) { - mdbx_debug("read overflow page %" PRIaPGNO " failed", pgno); - return rc; - } - data->iov_base = PAGEDATA(omp); - - return MDBX_SUCCESS; -} - -int mdbx_get(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data) { - MDBX_cursor mc; - MDBX_xcursor mx; - int exact = 0; - DKBUF; - - mdbx_debug("===> get db %u key [%s]", dbi, DKEY(key)); - - if (unlikely(!key || !data || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - mdbx_cursor_init(&mc, txn, dbi, &mx); - return mdbx_cursor_set(&mc, key, data, MDBX_SET, &exact); -} - -/* Find a sibling for a page. - * Replaces the page at the top of the cursor's stack with the specified - * sibling, if one exists. - * - * [in] mc The cursor for this operation. - * [in] move_right Non-zero if the right sibling is requested, - * otherwise the left sibling. - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_cursor_sibling(MDBX_cursor *mc, int move_right) { - int rc; - MDBX_node *indx; - MDBX_page *mp; - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - if (unlikely(mc->mc_snum < 2)) { - return MDBX_NOTFOUND; /* root has no siblings */ - } - - mdbx_cursor_pop(mc); - mdbx_debug("parent page is page %" PRIaPGNO ", index %u", - mc->mc_pg[mc->mc_top]->mp_pgno, mc->mc_ki[mc->mc_top]); - - if (move_right - ? (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mc->mc_pg[mc->mc_top])) - : (mc->mc_ki[mc->mc_top] == 0)) { - mdbx_debug("no more keys left, moving to %s sibling", - move_right ? "right" : "left"); - if (unlikely((rc = mdbx_cursor_sibling(mc, move_right)) != MDBX_SUCCESS)) { - /* undo cursor_pop before returning */ - mc->mc_top++; - mc->mc_snum++; - return rc; - } - } else { - if (move_right) - mc->mc_ki[mc->mc_top]++; - else - mc->mc_ki[mc->mc_top]--; - mdbx_debug("just moving to %s index key %u", move_right ? "right" : "left", - mc->mc_ki[mc->mc_top]); - } - mdbx_cassert(mc, IS_BRANCH(mc->mc_pg[mc->mc_top])); - - indx = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - if (unlikely((rc = mdbx_page_get(mc, NODEPGNO(indx), &mp, NULL)) != 0)) { - /* mc will be inconsistent if caller does mc_snum++ as above */ - mc->mc_flags &= ~(C_INITIALIZED | C_EOF); - return rc; - } - - mdbx_cursor_push(mc, mp); - if (!move_right) - mc->mc_ki[mc->mc_top] = NUMKEYS(mp) - 1; - - return MDBX_SUCCESS; -} - -/* Move the cursor to the next data item. */ -static int mdbx_cursor_next(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - MDBX_cursor_op op) { - MDBX_page *mp; - MDBX_node *leaf; - int rc; - - if ((mc->mc_flags & C_DEL) && op == MDBX_NEXT_DUP) - return MDBX_NOTFOUND; - - if (!(mc->mc_flags & C_INITIALIZED)) - return mdbx_cursor_first(mc, key, data); - - mp = mc->mc_pg[mc->mc_top]; - if (mc->mc_flags & C_EOF) { - if (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mp)) - return MDBX_NOTFOUND; - mc->mc_flags ^= C_EOF; - } - - if (mc->mc_db->md_flags & MDBX_DUPSORT) { - leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - if (op == MDBX_NEXT || op == MDBX_NEXT_DUP) { - rc = - mdbx_cursor_next(&mc->mc_xcursor->mx_cursor, data, NULL, MDBX_NEXT); - if (op != MDBX_NEXT || rc != MDBX_NOTFOUND) { - if (likely(rc == MDBX_SUCCESS)) - MDBX_GET_KEY(leaf, key); - return rc; - } - } - } else { - mc->mc_xcursor->mx_cursor.mc_flags &= ~(C_INITIALIZED | C_EOF); - if (op == MDBX_NEXT_DUP) - return MDBX_NOTFOUND; - } - } - - mdbx_debug("cursor_next: top page is %" PRIaPGNO " in cursor %p", mp->mp_pgno, - (void *)mc); - if (mc->mc_flags & C_DEL) { - mc->mc_flags ^= C_DEL; - goto skip; - } - - if (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mp)) { - mdbx_debug("=====> move to next sibling page"); - if (unlikely((rc = mdbx_cursor_sibling(mc, 1)) != MDBX_SUCCESS)) { - mc->mc_flags |= C_EOF; - return rc; - } - mp = mc->mc_pg[mc->mc_top]; - mdbx_debug("next page is %" PRIaPGNO ", key index %u", mp->mp_pgno, - mc->mc_ki[mc->mc_top]); - } else - mc->mc_ki[mc->mc_top]++; - -skip: - mdbx_debug("==> cursor points to page %" PRIaPGNO - " with %u keys, key index %u", - mp->mp_pgno, NUMKEYS(mp), mc->mc_ki[mc->mc_top]); - - if (IS_LEAF2(mp)) { - key->iov_len = mc->mc_db->md_xsize; - key->iov_base = LEAF2KEY(mp, mc->mc_ki[mc->mc_top], key->iov_len); - return MDBX_SUCCESS; - } - - mdbx_cassert(mc, IS_LEAF(mp)); - leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_xcursor_init1(mc, leaf); - } - if (data) { - if (unlikely((rc = mdbx_node_read(mc, leaf, data)) != MDBX_SUCCESS)) - return rc; - - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - rc = mdbx_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - } - - MDBX_GET_KEY(leaf, key); - return MDBX_SUCCESS; -} - -/* Move the cursor to the previous data item. */ -static int mdbx_cursor_prev(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - MDBX_cursor_op op) { - MDBX_page *mp; - MDBX_node *leaf; - int rc; - - if ((mc->mc_flags & C_DEL) && op == MDBX_PREV_DUP) - return MDBX_NOTFOUND; - - if (!(mc->mc_flags & C_INITIALIZED)) { - rc = mdbx_cursor_last(mc, key, data); - if (unlikely(rc)) - return rc; - mc->mc_ki[mc->mc_top]++; - } - - mp = mc->mc_pg[mc->mc_top]; - if ((mc->mc_db->md_flags & MDBX_DUPSORT) && - mc->mc_ki[mc->mc_top] < NUMKEYS(mp)) { - leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - if (op == MDBX_PREV || op == MDBX_PREV_DUP) { - rc = - mdbx_cursor_prev(&mc->mc_xcursor->mx_cursor, data, NULL, MDBX_PREV); - if (op != MDBX_PREV || rc != MDBX_NOTFOUND) { - if (likely(rc == MDBX_SUCCESS)) { - MDBX_GET_KEY(leaf, key); - mc->mc_flags &= ~C_EOF; - } - return rc; - } - } - } else { - mc->mc_xcursor->mx_cursor.mc_flags &= ~(C_INITIALIZED | C_EOF); - if (op == MDBX_PREV_DUP) - return MDBX_NOTFOUND; - } - } - - mdbx_debug("cursor_prev: top page is %" PRIaPGNO " in cursor %p", mp->mp_pgno, - (void *)mc); - - mc->mc_flags &= ~(C_EOF | C_DEL); - - if (mc->mc_ki[mc->mc_top] == 0) { - mdbx_debug("=====> move to prev sibling page"); - if ((rc = mdbx_cursor_sibling(mc, 0)) != MDBX_SUCCESS) { - return rc; - } - mp = mc->mc_pg[mc->mc_top]; - mc->mc_ki[mc->mc_top] = NUMKEYS(mp) - 1; - mdbx_debug("prev page is %" PRIaPGNO ", key index %u", mp->mp_pgno, - mc->mc_ki[mc->mc_top]); - } else - mc->mc_ki[mc->mc_top]--; - - mdbx_debug("==> cursor points to page %" PRIaPGNO - " with %u keys, key index %u", - mp->mp_pgno, NUMKEYS(mp), mc->mc_ki[mc->mc_top]); - - if (IS_LEAF2(mp)) { - key->iov_len = mc->mc_db->md_xsize; - key->iov_base = LEAF2KEY(mp, mc->mc_ki[mc->mc_top], key->iov_len); - return MDBX_SUCCESS; - } - - mdbx_cassert(mc, IS_LEAF(mp)); - leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_xcursor_init1(mc, leaf); - } - if (data) { - if (unlikely((rc = mdbx_node_read(mc, leaf, data)) != MDBX_SUCCESS)) - return rc; - - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - rc = mdbx_cursor_last(&mc->mc_xcursor->mx_cursor, data, NULL); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - } - - MDBX_GET_KEY(leaf, key); - return MDBX_SUCCESS; -} - -/* Set the cursor on a specific data item. */ -static int mdbx_cursor_set(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - MDBX_cursor_op op, int *exactp) { - int rc; - MDBX_page *mp; - MDBX_node *leaf = NULL; - DKBUF; - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - if ((mc->mc_db->md_flags & MDBX_INTEGERKEY) && - unlikely(key->iov_len != sizeof(uint32_t) && - key->iov_len != sizeof(uint64_t))) { - mdbx_cassert(mc, !"key-size is invalid for MDBX_INTEGERKEY"); - return MDBX_BAD_VALSIZE; - } - - if (mc->mc_xcursor) - mc->mc_xcursor->mx_cursor.mc_flags &= ~(C_INITIALIZED | C_EOF); - - /* See if we're already on the right page */ - if (mc->mc_flags & C_INITIALIZED) { - MDBX_val nodekey; - - mp = mc->mc_pg[mc->mc_top]; - if (!NUMKEYS(mp)) { - mc->mc_ki[mc->mc_top] = 0; - return MDBX_NOTFOUND; - } - if (mp->mp_flags & P_LEAF2) { - nodekey.iov_len = mc->mc_db->md_xsize; - nodekey.iov_base = LEAF2KEY(mp, 0, nodekey.iov_len); - } else { - leaf = NODEPTR(mp, 0); - MDBX_GET_KEY2(leaf, nodekey); - } - rc = mc->mc_dbx->md_cmp(key, &nodekey); - if (rc == 0) { - /* Probably happens rarely, but first node on the page - * was the one we wanted. - */ - mc->mc_ki[mc->mc_top] = 0; - if (exactp) - *exactp = 1; - goto set1; - } - if (rc > 0) { - unsigned i; - unsigned nkeys = NUMKEYS(mp); - if (nkeys > 1) { - if (mp->mp_flags & P_LEAF2) { - nodekey.iov_base = LEAF2KEY(mp, nkeys - 1, nodekey.iov_len); - } else { - leaf = NODEPTR(mp, nkeys - 1); - MDBX_GET_KEY2(leaf, nodekey); - } - rc = mc->mc_dbx->md_cmp(key, &nodekey); - if (rc == 0) { - /* last node was the one we wanted */ - mdbx_cassert(mc, nkeys >= 1 && nkeys <= UINT16_MAX + 1); - mc->mc_ki[mc->mc_top] = (indx_t)(nkeys - 1); - if (exactp) - *exactp = 1; - goto set1; - } - if (rc < 0) { - if (mc->mc_ki[mc->mc_top] < NUMKEYS(mp)) { - /* This is definitely the right page, skip search_page */ - if (mp->mp_flags & P_LEAF2) { - nodekey.iov_base = - LEAF2KEY(mp, mc->mc_ki[mc->mc_top], nodekey.iov_len); - } else { - leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - MDBX_GET_KEY2(leaf, nodekey); - } - rc = mc->mc_dbx->md_cmp(key, &nodekey); - if (rc == 0) { - /* current node was the one we wanted */ - if (exactp) - *exactp = 1; - goto set1; - } - } - rc = 0; - mc->mc_flags &= ~C_EOF; - goto set2; - } - } - /* If any parents have right-sibs, search. - * Otherwise, there's nothing further. */ - for (i = 0; i < mc->mc_top; i++) - if (mc->mc_ki[i] < NUMKEYS(mc->mc_pg[i]) - 1) - break; - if (i == mc->mc_top) { - /* There are no other pages */ - mdbx_cassert(mc, nkeys <= UINT16_MAX); - mc->mc_ki[mc->mc_top] = (uint16_t)nkeys; - return MDBX_NOTFOUND; - } - } - if (!mc->mc_top) { - /* There are no other pages */ - mc->mc_ki[mc->mc_top] = 0; - if (op == MDBX_SET_RANGE && !exactp) { - rc = 0; - goto set1; - } else - return MDBX_NOTFOUND; - } - } else { - mc->mc_pg[0] = 0; - } - - rc = mdbx_page_search(mc, key, 0); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - mp = mc->mc_pg[mc->mc_top]; - mdbx_cassert(mc, IS_LEAF(mp)); - -set2: - leaf = mdbx_node_search(mc, key, exactp); - if (exactp != NULL && !*exactp) { - /* MDBX_SET specified and not an exact match. */ - return MDBX_NOTFOUND; - } - - if (leaf == NULL) { - mdbx_debug("===> inexact leaf not found, goto sibling"); - if (unlikely((rc = mdbx_cursor_sibling(mc, 1)) != MDBX_SUCCESS)) { - mc->mc_flags |= C_EOF; - return rc; /* no entries matched */ - } - mp = mc->mc_pg[mc->mc_top]; - mdbx_cassert(mc, IS_LEAF(mp)); - leaf = NODEPTR(mp, 0); - } - -set1: - mc->mc_flags |= C_INITIALIZED; - mc->mc_flags &= ~C_EOF; - - if (IS_LEAF2(mp)) { - if (op == MDBX_SET_RANGE || op == MDBX_SET_KEY) { - key->iov_len = mc->mc_db->md_xsize; - key->iov_base = LEAF2KEY(mp, mc->mc_ki[mc->mc_top], key->iov_len); - } - return MDBX_SUCCESS; - } - - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_xcursor_init1(mc, leaf); - } - if (likely(data)) { - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - if (op == MDBX_SET || op == MDBX_SET_KEY || op == MDBX_SET_RANGE) { - rc = mdbx_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL); - } else { - int ex2, *ex2p; - if (op == MDBX_GET_BOTH) { - ex2p = &ex2; - ex2 = 0; - } else { - ex2p = NULL; - } - rc = mdbx_cursor_set(&mc->mc_xcursor->mx_cursor, data, NULL, - MDBX_SET_RANGE, ex2p); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - } else if (op == MDBX_GET_BOTH || op == MDBX_GET_BOTH_RANGE) { - MDBX_val olddata; - if (unlikely((rc = mdbx_node_read(mc, leaf, &olddata)) != MDBX_SUCCESS)) - return rc; - rc = mc->mc_dbx->md_dcmp(data, &olddata); - if (rc) { - if (op == MDBX_GET_BOTH || rc > 0) - return MDBX_NOTFOUND; - rc = 0; - } - *data = olddata; - } else { - if (mc->mc_xcursor) - mc->mc_xcursor->mx_cursor.mc_flags &= ~(C_INITIALIZED | C_EOF); - if (unlikely((rc = mdbx_node_read(mc, leaf, data)) != MDBX_SUCCESS)) - return rc; - } - } - - /* The key already matches in all other cases */ - if (op == MDBX_SET_RANGE || op == MDBX_SET_KEY) - MDBX_GET_KEY(leaf, key); - - mdbx_debug("==> cursor placed on key [%s], data [%s]", DKEY(key), DVAL(data)); - return rc; -} - -/* Move the cursor to the first item in the database. */ -static int mdbx_cursor_first(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data) { - int rc; - MDBX_node *leaf; - - if (mc->mc_xcursor) - mc->mc_xcursor->mx_cursor.mc_flags &= ~(C_INITIALIZED | C_EOF); - - if (!(mc->mc_flags & C_INITIALIZED) || mc->mc_top) { - rc = mdbx_page_search(mc, NULL, MDBX_PS_FIRST); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - mdbx_cassert(mc, IS_LEAF(mc->mc_pg[mc->mc_top])); - - leaf = NODEPTR(mc->mc_pg[mc->mc_top], 0); - mc->mc_flags |= C_INITIALIZED; - mc->mc_flags &= ~C_EOF; - - mc->mc_ki[mc->mc_top] = 0; - - if (IS_LEAF2(mc->mc_pg[mc->mc_top])) { - key->iov_len = mc->mc_db->md_xsize; - key->iov_base = LEAF2KEY(mc->mc_pg[mc->mc_top], 0, key->iov_len); - return MDBX_SUCCESS; - } - - if (likely(data)) { - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_cassert(mc, mc->mc_xcursor != nullptr); - mdbx_xcursor_init1(mc, leaf); - rc = mdbx_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL); - if (unlikely(rc)) - return rc; - } else { - if (unlikely((rc = mdbx_node_read(mc, leaf, data)) != MDBX_SUCCESS)) - return rc; - } - } - MDBX_GET_KEY(leaf, key); - return MDBX_SUCCESS; -} - -/* Move the cursor to the last item in the database. */ -static int mdbx_cursor_last(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data) { - int rc; - MDBX_node *leaf; - - if (mc->mc_xcursor) - mc->mc_xcursor->mx_cursor.mc_flags &= ~(C_INITIALIZED | C_EOF); - - if (likely((mc->mc_flags & (C_EOF | C_DEL)) != C_EOF)) { - if (!(mc->mc_flags & C_INITIALIZED) || mc->mc_top) { - rc = mdbx_page_search(mc, NULL, MDBX_PS_LAST); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - mdbx_cassert(mc, IS_LEAF(mc->mc_pg[mc->mc_top])); - } - - mc->mc_ki[mc->mc_top] = NUMKEYS(mc->mc_pg[mc->mc_top]) - 1; - mc->mc_flags |= C_INITIALIZED | C_EOF; - leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - - if (IS_LEAF2(mc->mc_pg[mc->mc_top])) { - key->iov_len = mc->mc_db->md_xsize; - key->iov_base = - LEAF2KEY(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], key->iov_len); - return MDBX_SUCCESS; - } - - if (likely(data)) { - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_cassert(mc, mc->mc_xcursor != nullptr); - mdbx_xcursor_init1(mc, leaf); - rc = mdbx_cursor_last(&mc->mc_xcursor->mx_cursor, data, NULL); - if (unlikely(rc)) - return rc; - } else { - if (unlikely((rc = mdbx_node_read(mc, leaf, data)) != MDBX_SUCCESS)) - return rc; - } - } - - MDBX_GET_KEY(leaf, key); - return MDBX_SUCCESS; -} - -int mdbx_cursor_get(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - MDBX_cursor_op op) { - int rc; - int exact = 0; - int (*mfunc)(MDBX_cursor * mc, MDBX_val * key, MDBX_val * data); - - if (unlikely(mc == NULL)) - return MDBX_EINVAL; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(mc->mc_txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - switch (op) { - case MDBX_GET_CURRENT: { - if (unlikely(!(mc->mc_flags & C_INITIALIZED))) - return MDBX_EINVAL; - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - unsigned nkeys = NUMKEYS(mp); - if (mc->mc_ki[mc->mc_top] >= nkeys) { - mdbx_cassert(mc, nkeys <= UINT16_MAX); - mc->mc_ki[mc->mc_top] = (uint16_t)nkeys; - return MDBX_NOTFOUND; - } - assert(nkeys > 0); - - rc = MDBX_SUCCESS; - if (IS_LEAF2(mp)) { - key->iov_len = mc->mc_db->md_xsize; - key->iov_base = LEAF2KEY(mp, mc->mc_ki[mc->mc_top], key->iov_len); - } else { - MDBX_node *leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - MDBX_GET_KEY(leaf, key); - if (data) { - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - if (unlikely(!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED))) { - mdbx_xcursor_init1(mc, leaf); - rc = mdbx_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL); - if (unlikely(rc)) - return rc; - } - rc = mdbx_cursor_get(&mc->mc_xcursor->mx_cursor, data, NULL, - MDBX_GET_CURRENT); - } else { - rc = mdbx_node_read(mc, leaf, data); - } - if (unlikely(rc)) - return rc; - } - } - break; - } - case MDBX_GET_BOTH: - case MDBX_GET_BOTH_RANGE: - if (unlikely(data == NULL)) - return MDBX_EINVAL; - if (unlikely(mc->mc_xcursor == NULL)) - return MDBX_INCOMPATIBLE; - /* FALLTHRU */ - case MDBX_SET: - case MDBX_SET_KEY: - case MDBX_SET_RANGE: - if (unlikely(key == NULL)) - return MDBX_EINVAL; - rc = mdbx_cursor_set(mc, key, data, op, - op == MDBX_SET_RANGE ? NULL : &exact); - break; - case MDBX_GET_MULTIPLE: - if (unlikely(data == NULL || !(mc->mc_flags & C_INITIALIZED))) - return MDBX_EINVAL; - if (unlikely(!(mc->mc_db->md_flags & MDBX_DUPFIXED))) - return MDBX_INCOMPATIBLE; - rc = MDBX_SUCCESS; - if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) || - (mc->mc_xcursor->mx_cursor.mc_flags & C_EOF)) - break; - goto fetchm; - case MDBX_NEXT_MULTIPLE: - if (unlikely(data == NULL)) - return MDBX_EINVAL; - if (unlikely(!(mc->mc_db->md_flags & MDBX_DUPFIXED))) - return MDBX_INCOMPATIBLE; - rc = mdbx_cursor_next(mc, key, data, MDBX_NEXT_DUP); - if (rc == MDBX_SUCCESS) { - if (mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) { - MDBX_cursor *mx; - fetchm: - mx = &mc->mc_xcursor->mx_cursor; - data->iov_len = NUMKEYS(mx->mc_pg[mx->mc_top]) * mx->mc_db->md_xsize; - data->iov_base = PAGEDATA(mx->mc_pg[mx->mc_top]); - mx->mc_ki[mx->mc_top] = NUMKEYS(mx->mc_pg[mx->mc_top]) - 1; - } else { - rc = MDBX_NOTFOUND; - } - } - break; - case MDBX_PREV_MULTIPLE: - if (data == NULL) - return MDBX_EINVAL; - if (!(mc->mc_db->md_flags & MDBX_DUPFIXED)) - return MDBX_INCOMPATIBLE; - rc = MDBX_SUCCESS; - if (!(mc->mc_flags & C_INITIALIZED)) - rc = mdbx_cursor_last(mc, key, data); - if (rc == MDBX_SUCCESS) { - MDBX_cursor *mx = &mc->mc_xcursor->mx_cursor; - if (mx->mc_flags & C_INITIALIZED) { - rc = mdbx_cursor_sibling(mx, 0); - if (rc == MDBX_SUCCESS) - goto fetchm; - } else { - rc = MDBX_NOTFOUND; - } - } - break; - case MDBX_NEXT: - case MDBX_NEXT_DUP: - case MDBX_NEXT_NODUP: - rc = mdbx_cursor_next(mc, key, data, op); - break; - case MDBX_PREV: - case MDBX_PREV_DUP: - case MDBX_PREV_NODUP: - rc = mdbx_cursor_prev(mc, key, data, op); - break; - case MDBX_FIRST: - rc = mdbx_cursor_first(mc, key, data); - break; - case MDBX_FIRST_DUP: - mfunc = mdbx_cursor_first; - mmove: - if (unlikely(data == NULL || !(mc->mc_flags & C_INITIALIZED))) - return MDBX_EINVAL; - if (unlikely(mc->mc_xcursor == NULL)) - return MDBX_INCOMPATIBLE; - if (mc->mc_ki[mc->mc_top] >= NUMKEYS(mc->mc_pg[mc->mc_top])) { - mc->mc_ki[mc->mc_top] = NUMKEYS(mc->mc_pg[mc->mc_top]); - return MDBX_NOTFOUND; - } - { - MDBX_node *leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - if (!F_ISSET(leaf->mn_flags, F_DUPDATA)) { - MDBX_GET_KEY(leaf, key); - rc = mdbx_node_read(mc, leaf, data); - break; - } - } - if (unlikely(!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED))) - return MDBX_EINVAL; - rc = mfunc(&mc->mc_xcursor->mx_cursor, data, NULL); - break; - case MDBX_LAST: - rc = mdbx_cursor_last(mc, key, data); - break; - case MDBX_LAST_DUP: - mfunc = mdbx_cursor_last; - goto mmove; - default: - mdbx_debug("unhandled/unimplemented cursor operation %u", op); - return MDBX_EINVAL; - } - - mc->mc_flags &= ~C_DEL; - return rc; -} - -/* Touch all the pages in the cursor stack. Set mc_top. - * Makes sure all the pages are writable, before attempting a write operation. - * [in] mc The cursor to operate on. */ -static int mdbx_cursor_touch(MDBX_cursor *mc) { - int rc = MDBX_SUCCESS; - - if (mc->mc_dbi >= CORE_DBS && !(*mc->mc_dbflag & (DB_DIRTY | DB_DUPDATA))) { - /* Touch DB record of named DB */ - MDBX_cursor mc2; - MDBX_xcursor mcx; - if (TXN_DBI_CHANGED(mc->mc_txn, mc->mc_dbi)) - return MDBX_BAD_DBI; - mdbx_cursor_init(&mc2, mc->mc_txn, MAIN_DBI, &mcx); - rc = mdbx_page_search(&mc2, &mc->mc_dbx->md_name, MDBX_PS_MODIFY); - if (unlikely(rc)) - return rc; - *mc->mc_dbflag |= DB_DIRTY; - } - mc->mc_top = 0; - if (mc->mc_snum) { - do { - rc = mdbx_page_touch(mc); - } while (!rc && ++(mc->mc_top) < mc->mc_snum); - mc->mc_top = mc->mc_snum - 1; - } - return rc; -} - -/* Do not spill pages to disk if txn is getting full, may fail instead */ -#define MDBX_NOSPILL 0x8000 - -int mdbx_cursor_put(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - unsigned flags) { - MDBX_env *env; - MDBX_page *fp, *sub_root = NULL; - uint16_t fp_flags; - MDBX_val xdata, *rdata, dkey, olddata; - MDBX_db dummy; - unsigned mcount = 0, dcount = 0, nospill; - size_t nsize; - int rc = MDBX_SUCCESS, rc2; - unsigned nflags; - DKBUF; - - if (unlikely(mc == NULL || key == NULL)) - return MDBX_EINVAL; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE)) - return MDBX_EBADSIGN; - - env = mc->mc_txn->mt_env; - - /* Check this first so counter will always be zero on any early failures. */ - if (flags & MDBX_MULTIPLE) { - if (unlikely(!F_ISSET(mc->mc_db->md_flags, MDBX_DUPFIXED))) - return MDBX_INCOMPATIBLE; - if (unlikely(data[1].iov_len >= INT_MAX)) - return MDBX_EINVAL; - dcount = (unsigned)data[1].iov_len; - data[1].iov_len = 0; - } - - if (flags & MDBX_RESERVE) { - if (unlikely(mc->mc_db->md_flags & (MDBX_DUPSORT | MDBX_REVERSEDUP))) - return MDBX_INCOMPATIBLE; - data->iov_base = nullptr; - } - - nospill = flags & MDBX_NOSPILL; - flags &= ~MDBX_NOSPILL; - - if (unlikely(mc->mc_txn->mt_flags & (MDBX_TXN_RDONLY | MDBX_TXN_BLOCKED))) - return (mc->mc_txn->mt_flags & MDBX_TXN_RDONLY) ? MDBX_EACCESS - : MDBX_BAD_TXN; - - if (unlikely(key->iov_len > env->me_maxkey_limit)) - return MDBX_BAD_VALSIZE; - - if (unlikely(data->iov_len > ((mc->mc_db->md_flags & MDBX_DUPSORT) - ? env->me_maxkey_limit - : MDBX_MAXDATASIZE))) - return MDBX_BAD_VALSIZE; - - if ((mc->mc_db->md_flags & MDBX_INTEGERKEY) && - unlikely(key->iov_len != sizeof(uint32_t) && - key->iov_len != sizeof(uint64_t))) { - mdbx_cassert(mc, !"key-size is invalid for MDBX_INTEGERKEY"); - return MDBX_BAD_VALSIZE; - } - - if ((mc->mc_db->md_flags & MDBX_INTEGERDUP) && - unlikely(data->iov_len != sizeof(uint32_t) && - data->iov_len != sizeof(uint64_t))) { - mdbx_cassert(mc, !"data-size is invalid MDBX_INTEGERDUP"); - return MDBX_BAD_VALSIZE; - } - - mdbx_debug("==> put db %d key [%s], size %" PRIuPTR - ", data [%s] size %" PRIuPTR, - DDBI(mc), DKEY(key), key ? key->iov_len : 0, - DVAL((flags & MDBX_RESERVE) ? nullptr : data), data->iov_len); - - int dupdata_flag = 0; - if (flags & MDBX_CURRENT) { - /* Опция MDBX_CURRENT означает, что запрошено обновление текущей записи, - * на которой сейчас стоит курсор. Проверяем что переданный ключ совпадает - * со значением в текущей позиции курсора. - * Здесь проще вызвать mdbx_cursor_get(), так как для обслуживания таблиц - * с MDBX_DUPSORT также требуется текущий размер данных. */ - MDBX_val current_key, current_data; - rc = mdbx_cursor_get(mc, ¤t_key, ¤t_data, MDBX_GET_CURRENT); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - if (mc->mc_dbx->md_cmp(key, ¤t_key) != 0) - return MDBX_EKEYMISMATCH; - - if (F_ISSET(mc->mc_db->md_flags, MDBX_DUPSORT)) { - MDBX_node *leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_cassert(mc, - mc->mc_xcursor != NULL && - (mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)); - /* Если за ключом более одного значения, либо если размер данных - * отличается, то вместо inplace обновления требуется удаление и - * последующая вставка. */ - if (mc->mc_xcursor->mx_db.md_entries > 1 || - current_data.iov_len != data->iov_len) { - rc = mdbx_cursor_del(mc, 0); - if (rc != MDBX_SUCCESS) - return rc; - flags -= MDBX_CURRENT; - } - } - } - } - - if (mc->mc_db->md_root == P_INVALID) { - /* new database, cursor has nothing to point to */ - mc->mc_snum = 0; - mc->mc_top = 0; - mc->mc_flags &= ~C_INITIALIZED; - rc = MDBX_NO_ROOT; - } else if ((flags & MDBX_CURRENT) == 0) { - int exact = 0; - MDBX_val d2; - if (flags & MDBX_APPEND) { - MDBX_val k2; - rc = mdbx_cursor_last(mc, &k2, &d2); - if (rc == 0) { - rc = mc->mc_dbx->md_cmp(key, &k2); - if (rc > 0) { - rc = MDBX_NOTFOUND; - mc->mc_ki[mc->mc_top]++; - } else { - /* new key is <= last key */ - rc = MDBX_EKEYMISMATCH; - } - } - } else { - rc = mdbx_cursor_set(mc, key, &d2, MDBX_SET, &exact); - } - if ((flags & MDBX_NOOVERWRITE) && rc == 0) { - mdbx_debug("duplicate key [%s]", DKEY(key)); - *data = d2; - return MDBX_KEYEXIST; - } - if (rc && unlikely(rc != MDBX_NOTFOUND)) - return rc; - } - - mc->mc_flags &= ~C_DEL; - - /* Cursor is positioned, check for room in the dirty list */ - if (!nospill) { - if (flags & MDBX_MULTIPLE) { - rdata = &xdata; - xdata.iov_len = data->iov_len * dcount; - } else { - rdata = data; - } - if (unlikely(rc2 = mdbx_page_spill(mc, key, rdata))) - return rc2; - } - - if (rc == MDBX_NO_ROOT) { - MDBX_page *np; - /* new database, write a root leaf page */ - mdbx_debug("allocating new root leaf page"); - if (unlikely(rc2 = mdbx_page_new(mc, P_LEAF, 1, &np))) { - return rc2; - } - assert(np->mp_flags & P_LEAF); - mdbx_cursor_push(mc, np); - mc->mc_db->md_root = np->mp_pgno; - mc->mc_db->md_depth++; - *mc->mc_dbflag |= DB_DIRTY; - if ((mc->mc_db->md_flags & (MDBX_DUPSORT | MDBX_DUPFIXED)) == MDBX_DUPFIXED) - np->mp_flags |= P_LEAF2; - mc->mc_flags |= C_INITIALIZED; - } else { - /* make sure all cursor pages are writable */ - rc2 = mdbx_cursor_touch(mc); - if (unlikely(rc2)) - return rc2; - } - - bool insert_key, insert_data, do_sub = false; - insert_key = insert_data = (rc != MDBX_SUCCESS); - if (insert_key) { - /* The key does not exist */ - mdbx_debug("inserting key at index %i", mc->mc_ki[mc->mc_top]); - if ((mc->mc_db->md_flags & MDBX_DUPSORT) && - LEAFSIZE(key, data) > env->me_nodemax) { - /* Too big for a node, insert in sub-DB. Set up an empty - * "old sub-page" for prep_subDB to expand to a full page. */ - fp_flags = P_LEAF | P_DIRTY; - fp = env->me_pbuf; - fp->mp_leaf2_ksize = (uint16_t)data->iov_len; /* used if MDBX_DUPFIXED */ - fp->mp_lower = fp->mp_upper = 0; - olddata.iov_len = PAGEHDRSZ; - goto prep_subDB; - } - } else { - /* there's only a key anyway, so this is a no-op */ - if (IS_LEAF2(mc->mc_pg[mc->mc_top])) { - char *ptr; - unsigned ksize = mc->mc_db->md_xsize; - if (key->iov_len != ksize) - return MDBX_BAD_VALSIZE; - ptr = LEAF2KEY(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], ksize); - memcpy(ptr, key->iov_base, ksize); - fix_parent: - /* if overwriting slot 0 of leaf, need to - * update branch key if there is a parent page */ - if (mc->mc_top && !mc->mc_ki[mc->mc_top]) { - unsigned dtop = 1; - mc->mc_top--; - /* slot 0 is always an empty key, find real slot */ - while (mc->mc_top && !mc->mc_ki[mc->mc_top]) { - mc->mc_top--; - dtop++; - } - if (mc->mc_ki[mc->mc_top]) - rc2 = mdbx_update_key(mc, key); - else - rc2 = MDBX_SUCCESS; - mdbx_cassert(mc, mc->mc_top + dtop < UINT16_MAX); - mc->mc_top += (uint16_t)dtop; - if (rc2) - return rc2; - } - return MDBX_SUCCESS; - } - - more:; - MDBX_node *leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - olddata.iov_len = NODEDSZ(leaf); - olddata.iov_base = NODEDATA(leaf); - - /* DB has dups? */ - if (F_ISSET(mc->mc_db->md_flags, MDBX_DUPSORT)) { - /* Prepare (sub-)page/sub-DB to accept the new item, if needed. - * fp: old sub-page or a header faking it. - * mp: new (sub-)page. offset: growth in page size. - * xdata: node data with new page or DB. */ - unsigned i, offset = 0; - MDBX_page *mp = fp = xdata.iov_base = env->me_pbuf; - mp->mp_pgno = mc->mc_pg[mc->mc_top]->mp_pgno; - - /* Was a single item before, must convert now */ - if (!F_ISSET(leaf->mn_flags, F_DUPDATA)) { - - /* does data match? */ - if (!mc->mc_dbx->md_dcmp(data, &olddata)) { - if (unlikely(flags & (MDBX_NODUPDATA | MDBX_APPENDDUP))) - return MDBX_KEYEXIST; - /* overwrite it */ - goto current; - } - - /* Just overwrite the current item */ - if (flags & MDBX_CURRENT) - goto current; - - /* Back up original data item */ - dupdata_flag = 1; - dkey.iov_len = olddata.iov_len; - dkey.iov_base = memcpy(fp + 1, olddata.iov_base, olddata.iov_len); - - /* Make sub-page header for the dup items, with dummy body */ - fp->mp_flags = P_LEAF | P_DIRTY | P_SUBP; - fp->mp_lower = 0; - xdata.iov_len = PAGEHDRSZ + dkey.iov_len + data->iov_len; - if (mc->mc_db->md_flags & MDBX_DUPFIXED) { - fp->mp_flags |= P_LEAF2; - fp->mp_leaf2_ksize = (uint16_t)data->iov_len; - xdata.iov_len += 2 * data->iov_len; /* leave space for 2 more */ - } else { - xdata.iov_len += 2 * (sizeof(indx_t) + NODESIZE) + - (dkey.iov_len & 1) + (data->iov_len & 1); - } - fp->mp_upper = (uint16_t)(xdata.iov_len - PAGEHDRSZ); - olddata.iov_len = xdata.iov_len; /* pretend olddata is fp */ - } else if (leaf->mn_flags & F_SUBDATA) { - /* Data is on sub-DB, just store it */ - flags |= F_DUPDATA | F_SUBDATA; - goto put_sub; - } else { - /* Data is on sub-page */ - fp = olddata.iov_base; - switch (flags) { - default: - if (!(mc->mc_db->md_flags & MDBX_DUPFIXED)) { - offset = EVEN(NODESIZE + sizeof(indx_t) + data->iov_len); - break; - } - offset = fp->mp_leaf2_ksize; - if (SIZELEFT(fp) < offset) { - offset *= 4; /* space for 4 more */ - break; - } - /* FALLTHRU: Big enough MDBX_DUPFIXaED sub-page */ - __fallthrough; - case MDBX_CURRENT | MDBX_NODUPDATA: - case MDBX_CURRENT: - fp->mp_flags |= P_DIRTY; - fp->mp_pgno = mp->mp_pgno; - mc->mc_xcursor->mx_cursor.mc_pg[0] = fp; - flags |= F_DUPDATA; - goto put_sub; - } - xdata.iov_len = olddata.iov_len + offset; - } - - fp_flags = fp->mp_flags; - if (NODESIZE + NODEKSZ(leaf) + xdata.iov_len > env->me_nodemax) { - /* Too big for a sub-page, convert to sub-DB */ - fp_flags &= ~P_SUBP; - prep_subDB: - dummy.md_xsize = 0; - dummy.md_flags = 0; - if (mc->mc_db->md_flags & MDBX_DUPFIXED) { - fp_flags |= P_LEAF2; - dummy.md_xsize = fp->mp_leaf2_ksize; - dummy.md_flags = MDBX_DUPFIXED; - if (mc->mc_db->md_flags & MDBX_INTEGERDUP) - dummy.md_flags |= MDBX_INTEGERKEY; - } - dummy.md_depth = 1; - dummy.md_branch_pages = 0; - dummy.md_leaf_pages = 1; - dummy.md_overflow_pages = 0; - dummy.md_entries = NUMKEYS(fp); - xdata.iov_len = sizeof(MDBX_db); - xdata.iov_base = &dummy; - if ((rc = mdbx_page_alloc(mc, 1, &mp, MDBX_ALLOC_ALL))) - return rc; - mdbx_cassert(mc, env->me_psize > olddata.iov_len); - offset = env->me_psize - (unsigned)olddata.iov_len; - flags |= F_DUPDATA | F_SUBDATA; - dummy.md_root = mp->mp_pgno; - sub_root = mp; - } - if (mp != fp) { - mp->mp_flags = fp_flags | P_DIRTY; - mp->mp_leaf2_ksize = fp->mp_leaf2_ksize; - mp->mp_lower = fp->mp_lower; - mdbx_cassert(mc, fp->mp_upper + offset <= UINT16_MAX); - mp->mp_upper = (indx_t)(fp->mp_upper + offset); - if (fp_flags & P_LEAF2) { - memcpy(PAGEDATA(mp), PAGEDATA(fp), NUMKEYS(fp) * fp->mp_leaf2_ksize); - } else { - memcpy((char *)mp + mp->mp_upper + PAGEHDRSZ, - (char *)fp + fp->mp_upper + PAGEHDRSZ, - olddata.iov_len - fp->mp_upper - PAGEHDRSZ); - for (i = 0; i < NUMKEYS(fp); i++) { - mdbx_cassert(mc, fp->mp_ptrs[i] + offset <= UINT16_MAX); - mp->mp_ptrs[i] = (indx_t)(fp->mp_ptrs[i] + offset); - } - } - } - - rdata = &xdata; - flags |= F_DUPDATA; - do_sub = true; - if (!insert_key) - mdbx_node_del(mc, 0); - goto new_sub; - } - current: - /* MDBX passes F_SUBDATA in 'flags' to write a DB record */ - if (unlikely((leaf->mn_flags ^ flags) & F_SUBDATA)) - return MDBX_INCOMPATIBLE; - /* overflow page overwrites need special handling */ - if (F_ISSET(leaf->mn_flags, F_BIGDATA)) { - MDBX_page *omp; - pgno_t pg; - int level, ovpages, dpages = OVPAGES(env, data->iov_len); - - memcpy(&pg, olddata.iov_base, sizeof(pg)); - if (unlikely((rc2 = mdbx_page_get(mc, pg, &omp, &level)) != 0)) - return rc2; - ovpages = omp->mp_pages; - - /* Is the ov page large enough? */ - if (ovpages >= dpages) { - if (!(omp->mp_flags & P_DIRTY) && - (level || (env->me_flags & MDBX_WRITEMAP))) { - rc = mdbx_page_unspill(mc->mc_txn, omp, &omp); - if (unlikely(rc)) - return rc; - level = 0; /* dirty in this txn or clean */ - } - /* Is it dirty? */ - if (omp->mp_flags & P_DIRTY) { - /* yes, overwrite it. Note in this case we don't - * bother to try shrinking the page if the new data - * is smaller than the overflow threshold. */ - if (unlikely(level > 1)) { - /* It is writable only in a parent txn */ - MDBX_page *np = mdbx_page_malloc(mc->mc_txn, ovpages); - MDBX_ID2 id2; - if (unlikely(!np)) - return MDBX_ENOMEM; - id2.mid = pg; - id2.mptr = np; - /* Note - this page is already counted in parent's dirtyroom */ - rc2 = mdbx_mid2l_insert(mc->mc_txn->mt_rw_dirtylist, &id2); - mdbx_cassert(mc, rc2 == 0); - - /* Currently we make the page look as with put() in the - * parent txn, in case the user peeks at MDBX_RESERVEd - * or unused parts. Some users treat ovpages specially. */ - const size_t whole = pgno2bytes(env, ovpages); - /* Skip the part where MDBX will put *data. - * Copy end of page, adjusting alignment so - * compiler may copy words instead of bytes. */ - const size_t off = - (PAGEHDRSZ + data->iov_len) & -(intptr_t)sizeof(size_t); - memcpy((size_t *)((char *)np + off), (size_t *)((char *)omp + off), - whole - off); - memcpy(np, omp, PAGEHDRSZ); /* Copy header of page */ - omp = np; - } - SETDSZ(leaf, data->iov_len); - if (F_ISSET(flags, MDBX_RESERVE)) - data->iov_base = PAGEDATA(omp); - else - memcpy(PAGEDATA(omp), data->iov_base, data->iov_len); - return MDBX_SUCCESS; - } - } - if ((rc2 = mdbx_ovpage_free(mc, omp)) != MDBX_SUCCESS) - return rc2; - } else if (data->iov_len == olddata.iov_len) { - assert(EVEN(key->iov_len) == EVEN(leaf->mn_ksize)); - /* same size, just replace it. Note that we could - * also reuse this node if the new data is smaller, - * but instead we opt to shrink the node in that case. */ - if (F_ISSET(flags, MDBX_RESERVE)) - data->iov_base = olddata.iov_base; - else if (!(mc->mc_flags & C_SUB)) - memcpy(olddata.iov_base, data->iov_base, data->iov_len); - else { - mdbx_cassert(mc, NUMKEYS(mc->mc_pg[mc->mc_top]) == 1); - mdbx_cassert(mc, mc->mc_pg[mc->mc_top]->mp_upper == - mc->mc_pg[mc->mc_top]->mp_lower); - mdbx_cassert(mc, IS_LEAF(mc->mc_pg[mc->mc_top]) && - !IS_LEAF2(mc->mc_pg[mc->mc_top])); - mdbx_cassert(mc, NODEDSZ(leaf) == 0); - mdbx_cassert(mc, leaf->mn_flags == 0); - mdbx_cassert(mc, key->iov_len < UINT16_MAX); - leaf->mn_ksize = (uint16_t)key->iov_len; - memcpy(NODEKEY(leaf), key->iov_base, key->iov_len); - assert((char *)NODEDATA(leaf) + NODEDSZ(leaf) < - (char *)(mc->mc_pg[mc->mc_top]) + env->me_psize); - goto fix_parent; - } - return MDBX_SUCCESS; - } - mdbx_node_del(mc, 0); - } - - rdata = data; - -new_sub: - nflags = flags & NODE_ADD_FLAGS; - nsize = IS_LEAF2(mc->mc_pg[mc->mc_top]) ? key->iov_len - : mdbx_leaf_size(env, key, rdata); - if (SIZELEFT(mc->mc_pg[mc->mc_top]) < nsize) { - if ((flags & (F_DUPDATA | F_SUBDATA)) == F_DUPDATA) - nflags &= ~MDBX_APPEND; /* sub-page may need room to grow */ - if (!insert_key) - nflags |= MDBX_SPLIT_REPLACE; - rc = mdbx_page_split(mc, key, rdata, P_INVALID, nflags); - } else { - /* There is room already in this leaf page. */ - rc = mdbx_node_add(mc, mc->mc_ki[mc->mc_top], key, rdata, 0, nflags); - if (likely(rc == 0)) { - /* Adjust other cursors pointing to mp */ - MDBX_cursor *m2, *m3; - MDBX_dbi dbi = mc->mc_dbi; - unsigned i = mc->mc_top; - MDBX_page *mp = mc->mc_pg[i]; - - for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - if (mc->mc_flags & C_SUB) - m3 = &m2->mc_xcursor->mx_cursor; - else - m3 = m2; - if (m3 == mc || m3->mc_snum < mc->mc_snum || m3->mc_pg[i] != mp) - continue; - if (m3->mc_ki[i] >= mc->mc_ki[i] && insert_key) { - m3->mc_ki[i]++; - } - if (XCURSOR_INITED(m3)) - XCURSOR_REFRESH(m3, mp, m3->mc_ki[i]); - } - } - } - - if (likely(rc == MDBX_SUCCESS)) { - /* Now store the actual data in the child DB. Note that we're - * storing the user data in the keys field, so there are strict - * size limits on dupdata. The actual data fields of the child - * DB are all zero size. */ - if (do_sub) { - int xflags; - size_t ecount; - put_sub: - xdata.iov_len = 0; - xdata.iov_base = ""; - MDBX_node *leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - if (flags & MDBX_CURRENT) { - xflags = (flags & MDBX_NODUPDATA) - ? MDBX_CURRENT | MDBX_NOOVERWRITE | MDBX_NOSPILL - : MDBX_CURRENT | MDBX_NOSPILL; - } else { - mdbx_xcursor_init1(mc, leaf); - xflags = (flags & MDBX_NODUPDATA) ? MDBX_NOOVERWRITE | MDBX_NOSPILL - : MDBX_NOSPILL; - } - if (sub_root) - mc->mc_xcursor->mx_cursor.mc_pg[0] = sub_root; - /* converted, write the original data first */ - if (dupdata_flag) { - rc = mdbx_cursor_put(&mc->mc_xcursor->mx_cursor, &dkey, &xdata, xflags); - if (unlikely(rc)) - goto bad_sub; - /* we've done our job */ - dkey.iov_len = 0; - } - if (!(leaf->mn_flags & F_SUBDATA) || sub_root) { - /* Adjust other cursors pointing to mp */ - MDBX_cursor *m2; - MDBX_xcursor *mx = mc->mc_xcursor; - unsigned i = mc->mc_top; - MDBX_page *mp = mc->mc_pg[i]; - int nkeys = NUMKEYS(mp); - - for (m2 = mc->mc_txn->mt_cursors[mc->mc_dbi]; m2; m2 = m2->mc_next) { - if (m2 == mc || m2->mc_snum < mc->mc_snum) - continue; - if (!(m2->mc_flags & C_INITIALIZED)) - continue; - if (m2->mc_pg[i] == mp) { - if (m2->mc_ki[i] == mc->mc_ki[i]) { - mdbx_xcursor_init2(m2, mx, dupdata_flag); - } else if (!insert_key && m2->mc_ki[i] < nkeys) { - XCURSOR_REFRESH(m2, mp, m2->mc_ki[i]); - } - } - } - } - mdbx_cassert(mc, mc->mc_xcursor->mx_db.md_entries < SIZE_MAX); - ecount = (size_t)mc->mc_xcursor->mx_db.md_entries; - if (flags & MDBX_APPENDDUP) - xflags |= MDBX_APPEND; - rc = mdbx_cursor_put(&mc->mc_xcursor->mx_cursor, data, &xdata, xflags); - if (flags & F_SUBDATA) { - void *db = NODEDATA(leaf); - memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDBX_db)); - } - insert_data = (ecount != (size_t)mc->mc_xcursor->mx_db.md_entries); - } - /* Increment count unless we just replaced an existing item. */ - if (insert_data) - mc->mc_db->md_entries++; - if (insert_key) { - /* Invalidate txn if we created an empty sub-DB */ - if (unlikely(rc)) - goto bad_sub; - /* If we succeeded and the key didn't exist before, - * make sure the cursor is marked valid. */ - mc->mc_flags |= C_INITIALIZED; - } - if (flags & MDBX_MULTIPLE) { - if (!rc) { - mcount++; - /* let caller know how many succeeded, if any */ - data[1].iov_len = mcount; - if (mcount < dcount) { - data[0].iov_base = (char *)data[0].iov_base + data[0].iov_len; - insert_key = insert_data = false; - goto more; - } - } - } - return rc; - bad_sub: - if (unlikely(rc == MDBX_KEYEXIST)) - mdbx_error("unexpected %s", "MDBX_KEYEXIST"); - /* should not happen, we deleted that item */ - rc = MDBX_PROBLEM; - } - mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; - return rc; -} - -int mdbx_cursor_del(MDBX_cursor *mc, unsigned flags) { - MDBX_node *leaf; - MDBX_page *mp; - int rc; - - if (unlikely(!mc)) - return MDBX_EINVAL; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(mc->mc_txn->mt_flags & (MDBX_TXN_RDONLY | MDBX_TXN_BLOCKED))) - return (mc->mc_txn->mt_flags & MDBX_TXN_RDONLY) ? MDBX_EACCESS - : MDBX_BAD_TXN; - - if (unlikely(!(mc->mc_flags & C_INITIALIZED))) - return MDBX_EINVAL; - - if (unlikely(mc->mc_ki[mc->mc_top] >= NUMKEYS(mc->mc_pg[mc->mc_top]))) - return MDBX_NOTFOUND; - - if (unlikely(!(flags & MDBX_NOSPILL) && - (rc = mdbx_page_spill(mc, NULL, NULL)))) - return rc; - - rc = mdbx_cursor_touch(mc); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - mp = mc->mc_pg[mc->mc_top]; - if (IS_LEAF2(mp)) - goto del_key; - leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - if (flags & MDBX_NODUPDATA) { - /* mdbx_cursor_del0() will subtract the final entry */ - mc->mc_db->md_entries -= mc->mc_xcursor->mx_db.md_entries - 1; - mc->mc_xcursor->mx_cursor.mc_flags &= ~C_INITIALIZED; - } else { - if (!F_ISSET(leaf->mn_flags, F_SUBDATA)) { - mc->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf); - } - rc = mdbx_cursor_del(&mc->mc_xcursor->mx_cursor, MDBX_NOSPILL); - if (unlikely(rc)) - return rc; - /* If sub-DB still has entries, we're done */ - if (mc->mc_xcursor->mx_db.md_entries) { - if (leaf->mn_flags & F_SUBDATA) { - /* update subDB info */ - void *db = NODEDATA(leaf); - memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDBX_db)); - } else { - MDBX_cursor *m2; - /* shrink fake page */ - mdbx_node_shrink(mp, mc->mc_ki[mc->mc_top]); - leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - mc->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf); - /* fix other sub-DB cursors pointed at fake pages on this page */ - for (m2 = mc->mc_txn->mt_cursors[mc->mc_dbi]; m2; m2 = m2->mc_next) { - if (m2 == mc || m2->mc_snum < mc->mc_snum) - continue; - if (!(m2->mc_flags & C_INITIALIZED)) - continue; - if (m2->mc_pg[mc->mc_top] == mp) { - MDBX_node *n2 = leaf; - if (m2->mc_ki[mc->mc_top] >= NUMKEYS(mp)) - continue; - if (m2->mc_ki[mc->mc_top] != mc->mc_ki[mc->mc_top]) { - n2 = NODEPTR(mp, m2->mc_ki[mc->mc_top]); - if (n2->mn_flags & F_SUBDATA) - continue; - } - m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(n2); - } - } - } - mc->mc_db->md_entries--; - return rc; - } else { - mc->mc_xcursor->mx_cursor.mc_flags &= ~C_INITIALIZED; - } - /* otherwise fall thru and delete the sub-DB */ - } - - if (leaf->mn_flags & F_SUBDATA) { - /* add all the child DB's pages to the free list */ - rc = mdbx_drop0(&mc->mc_xcursor->mx_cursor, 0); - if (unlikely(rc)) - goto fail; - } - } - /* MDBX passes F_SUBDATA in 'flags' to delete a DB record */ - else if (unlikely((leaf->mn_flags ^ flags) & F_SUBDATA)) { - rc = MDBX_INCOMPATIBLE; - goto fail; - } - - /* add overflow pages to free list */ - if (F_ISSET(leaf->mn_flags, F_BIGDATA)) { - MDBX_page *omp; - pgno_t pg; - - memcpy(&pg, NODEDATA(leaf), sizeof(pg)); - if (unlikely((rc = mdbx_page_get(mc, pg, &omp, NULL)) || - (rc = mdbx_ovpage_free(mc, omp)))) - goto fail; - } - -del_key: - return mdbx_cursor_del0(mc); - -fail: - mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; - return rc; -} - -/* Allocate and initialize new pages for a database. - * Set MDBX_TXN_ERROR on failure. - * - * [in] mc a cursor on the database being added to. - * [in] flags flags defining what type of page is being allocated. - * [in] num the number of pages to allocate. This is usually 1, - * unless allocating overflow pages for a large record. - * [out] mp Address of a page, or NULL on failure. - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_new(MDBX_cursor *mc, unsigned flags, unsigned num, - MDBX_page **mp) { - MDBX_page *np; - int rc; - - if (unlikely((rc = mdbx_page_alloc(mc, num, &np, MDBX_ALLOC_ALL)))) - return rc; - mdbx_debug("allocated new page #%" PRIaPGNO ", size %u", np->mp_pgno, - mc->mc_txn->mt_env->me_psize); - np->mp_flags = (uint16_t)(flags | P_DIRTY); - np->mp_lower = 0; - np->mp_upper = (indx_t)(mc->mc_txn->mt_env->me_psize - PAGEHDRSZ); - - if (IS_BRANCH(np)) - mc->mc_db->md_branch_pages++; - else if (IS_LEAF(np)) - mc->mc_db->md_leaf_pages++; - else if (IS_OVERFLOW(np)) { - mc->mc_db->md_overflow_pages += num; - np->mp_pages = num; - } - *mp = np; - - return MDBX_SUCCESS; -} - -/* Calculate the size of a leaf node. - * - * The size depends on the environment's page size; if a data item - * is too large it will be put onto an overflow page and the node - * size will only include the key and not the data. Sizes are always - * rounded up to an even number of bytes, to guarantee 2-byte alignment - * of the MDBX_node headers. - * - * [in] env The environment handle. - * [in] key The key for the node. - * [in] data The data for the node. - * - * Returns The number of bytes needed to store the node. */ -static __inline size_t mdbx_leaf_size(MDBX_env *env, MDBX_val *key, - MDBX_val *data) { - size_t sz; - - sz = LEAFSIZE(key, data); - if (sz > env->me_nodemax) { - /* put on overflow page */ - sz -= data->iov_len - sizeof(pgno_t); - } - - return EVEN(sz + sizeof(indx_t)); -} - -/* Calculate the size of a branch node. - * - * The size should depend on the environment's page size but since - * we currently don't support spilling large keys onto overflow - * pages, it's simply the size of the MDBX_node header plus the - * size of the key. Sizes are always rounded up to an even number - * of bytes, to guarantee 2-byte alignment of the MDBX_node headers. - * - * [in] env The environment handle. - * [in] key The key for the node. - * - * Returns The number of bytes needed to store the node. */ -static __inline size_t mdbx_branch_size(MDBX_env *env, MDBX_val *key) { - size_t sz; - - sz = INDXSIZE(key); - if (unlikely(sz > env->me_nodemax)) { - /* put on overflow page */ - /* not implemented */ - mdbx_assert_fail(env, "INDXSIZE(key) <= env->me_nodemax", __FUNCTION__, - __LINE__); - sz -= key->iov_len - sizeof(pgno_t); - } - - return sz + sizeof(indx_t); -} - -/* Add a node to the page pointed to by the cursor. - * Set MDBX_TXN_ERROR on failure. - * - * [in] mc The cursor for this operation. - * [in] indx The index on the page where the new node should be added. - * [in] key The key for the new node. - * [in] data The data for the new node, if any. - * [in] pgno The page number, if adding a branch node. - * [in] flags Flags for the node. - * - * Returns 0 on success, non-zero on failure. Possible errors are: - * - * MDBX_ENOMEM - failed to allocate overflow pages for the node. - * MDBX_PAGE_FULL - there is insufficient room in the page. This error - * should never happen since all callers already calculate - * the page's free space before calling this function. */ -static int mdbx_node_add(MDBX_cursor *mc, unsigned indx, MDBX_val *key, - MDBX_val *data, pgno_t pgno, unsigned flags) { - unsigned i; - size_t node_size = NODESIZE; - intptr_t room; - MDBX_node *node; - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - MDBX_page *ofp = NULL; /* overflow page */ - void *ndata; - DKBUF; - - mdbx_cassert(mc, mp->mp_upper >= mp->mp_lower); - - mdbx_debug("add to %s %spage %" PRIaPGNO " index %i, data size %" PRIuPTR - " key size %" PRIuPTR " [%s]", - IS_LEAF(mp) ? "leaf" : "branch", IS_SUBP(mp) ? "sub-" : "", - mp->mp_pgno, indx, data ? data->iov_len : 0, - key ? key->iov_len : 0, DKEY(key)); - - if (IS_LEAF2(mp)) { - mdbx_cassert(mc, key); - /* Move higher keys up one slot. */ - const int ksize = mc->mc_db->md_xsize; - char *const ptr = LEAF2KEY(mp, indx, ksize); - const int diff = NUMKEYS(mp) - indx; - if (diff > 0) - memmove(ptr + ksize, ptr, diff * ksize); - /* insert new key */ - memcpy(ptr, key->iov_base, ksize); - - /* Just using these for counting */ - mdbx_cassert(mc, UINT16_MAX - mp->mp_lower >= (int)sizeof(indx_t)); - mp->mp_lower += sizeof(indx_t); - mdbx_cassert(mc, mp->mp_upper >= ksize - sizeof(indx_t)); - mp->mp_upper -= (indx_t)(ksize - sizeof(indx_t)); - return MDBX_SUCCESS; - } - - room = (intptr_t)SIZELEFT(mp) - (intptr_t)sizeof(indx_t); - if (key != NULL) - node_size += key->iov_len; - if (IS_LEAF(mp)) { - mdbx_cassert(mc, key && data); - if (unlikely(F_ISSET(flags, F_BIGDATA))) { - /* Data already on overflow page. */ - node_size += sizeof(pgno_t); - } else if (unlikely(node_size + data->iov_len > - mc->mc_txn->mt_env->me_nodemax)) { - pgno_t ovpages = OVPAGES(mc->mc_txn->mt_env, data->iov_len); - int rc; - /* Put data on overflow page. */ - mdbx_debug("data size is %" PRIuPTR ", node would be %" PRIuPTR - ", put data on overflow page", - data->iov_len, node_size + data->iov_len); - node_size = EVEN(node_size + sizeof(pgno_t)); - if ((intptr_t)node_size > room) - goto full; - if ((rc = mdbx_page_new(mc, P_OVERFLOW, ovpages, &ofp))) - return rc; - mdbx_debug("allocated overflow page %" PRIaPGNO "", ofp->mp_pgno); - flags |= F_BIGDATA; - goto update; - } else { - node_size += data->iov_len; - } - } - node_size = EVEN(node_size); - if (unlikely((intptr_t)node_size > room)) - goto full; - -update: - /* Move higher pointers up one slot. */ - for (i = NUMKEYS(mp); i > indx; i--) - mp->mp_ptrs[i] = mp->mp_ptrs[i - 1]; - - /* Adjust free space offsets. */ - size_t ofs = mp->mp_upper - node_size; - mdbx_cassert(mc, ofs >= mp->mp_lower + sizeof(indx_t)); - mdbx_cassert(mc, ofs <= UINT16_MAX); - mp->mp_ptrs[indx] = (uint16_t)ofs; - mp->mp_upper = (uint16_t)ofs; - mp->mp_lower += sizeof(indx_t); - - /* Write the node data. */ - node = NODEPTR(mp, indx); - node->mn_ksize = (key == NULL) ? 0 : (uint16_t)key->iov_len; - node->mn_flags = (uint16_t)flags; - if (IS_LEAF(mp)) - SETDSZ(node, data->iov_len); - else - SETPGNO(node, pgno); - - if (key) - memcpy(NODEKEY(node), key->iov_base, key->iov_len); - - if (IS_LEAF(mp)) { - ndata = NODEDATA(node); - if (unlikely(ofp == NULL)) { - if (unlikely(F_ISSET(flags, F_BIGDATA))) - memcpy(ndata, data->iov_base, sizeof(pgno_t)); - else if (F_ISSET(flags, MDBX_RESERVE)) - data->iov_base = ndata; - else if (likely(ndata != data->iov_base)) - memcpy(ndata, data->iov_base, data->iov_len); - } else { - memcpy(ndata, &ofp->mp_pgno, sizeof(pgno_t)); - ndata = PAGEDATA(ofp); - if (F_ISSET(flags, MDBX_RESERVE)) - data->iov_base = ndata; - else if (likely(ndata != data->iov_base)) - memcpy(ndata, data->iov_base, data->iov_len); - } - } - - return MDBX_SUCCESS; - -full: - mdbx_debug("not enough room in page %" PRIaPGNO ", got %u ptrs", mp->mp_pgno, - NUMKEYS(mp)); - mdbx_debug("upper-lower = %u - %u = %" PRIiPTR "", mp->mp_upper, mp->mp_lower, - room); - mdbx_debug("node size = %" PRIuPTR "", node_size); - mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; - return MDBX_PAGE_FULL; -} - -/* Delete the specified node from a page. - * [in] mc Cursor pointing to the node to delete. - * [in] ksize The size of a node. Only used if the page is - * part of a MDBX_DUPFIXED database. */ -static void mdbx_node_del(MDBX_cursor *mc, size_t ksize) { - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - indx_t indx = mc->mc_ki[mc->mc_top]; - indx_t i, j, numkeys, ptr; - MDBX_node *node; - char *base; - - mdbx_debug("delete node %u on %s page %" PRIaPGNO "", indx, - IS_LEAF(mp) ? "leaf" : "branch", mp->mp_pgno); - numkeys = NUMKEYS(mp); - mdbx_cassert(mc, indx < numkeys); - - if (IS_LEAF2(mp)) { - mdbx_cassert(mc, ksize >= sizeof(indx_t)); - unsigned diff = numkeys - 1 - indx; - base = LEAF2KEY(mp, indx, ksize); - if (diff) - memmove(base, base + ksize, diff * ksize); - mdbx_cassert(mc, mp->mp_lower >= sizeof(indx_t)); - mp->mp_lower -= sizeof(indx_t); - mdbx_cassert(mc, - (size_t)UINT16_MAX - mp->mp_upper >= ksize - sizeof(indx_t)); - mp->mp_upper += (indx_t)(ksize - sizeof(indx_t)); - return; - } - - node = NODEPTR(mp, indx); - size_t sz = NODESIZE + node->mn_ksize; - if (IS_LEAF(mp)) { - if (F_ISSET(node->mn_flags, F_BIGDATA)) - sz += sizeof(pgno_t); - else - sz += NODEDSZ(node); - } - sz = EVEN(sz); - - ptr = mp->mp_ptrs[indx]; - for (i = j = 0; i < numkeys; i++) { - if (i != indx) { - mp->mp_ptrs[j] = mp->mp_ptrs[i]; - if (mp->mp_ptrs[i] < ptr) { - mdbx_cassert(mc, (size_t)UINT16_MAX - mp->mp_ptrs[j] >= sz); - mp->mp_ptrs[j] += (indx_t)sz; - } - j++; - } - } - - base = (char *)mp + mp->mp_upper + PAGEHDRSZ; - memmove(base + sz, base, ptr - mp->mp_upper); - - mdbx_cassert(mc, mp->mp_lower >= sizeof(indx_t)); - mp->mp_lower -= sizeof(indx_t); - mdbx_cassert(mc, (size_t)UINT16_MAX - mp->mp_upper >= sz); - mp->mp_upper += (indx_t)sz; -} - -/* Compact the main page after deleting a node on a subpage. - * [in] mp The main page to operate on. - * [in] indx The index of the subpage on the main page. */ -static void mdbx_node_shrink(MDBX_page *mp, unsigned indx) { - MDBX_node *node; - MDBX_page *sp, *xp; - char *base; - size_t nsize, delta, len, ptr; - int i; - - node = NODEPTR(mp, indx); - sp = (MDBX_page *)NODEDATA(node); - delta = SIZELEFT(sp); - nsize = NODEDSZ(node) - delta; - - /* Prepare to shift upward, set len = length(subpage part to shift) */ - if (IS_LEAF2(sp)) { - len = nsize; - if (nsize & 1) - return; /* do not make the node uneven-sized */ - } else { - xp = (MDBX_page *)((char *)sp + delta); /* destination subpage */ - for (i = NUMKEYS(sp); --i >= 0;) { - assert(sp->mp_ptrs[i] >= delta); - xp->mp_ptrs[i] = (indx_t)(sp->mp_ptrs[i] - delta); - } - len = PAGEHDRSZ; - } - sp->mp_upper = sp->mp_lower; - sp->mp_pgno = mp->mp_pgno; - SETDSZ(node, nsize); - - /* Shift <lower nodes...initial part of subpage> upward */ - base = (char *)mp + mp->mp_upper + PAGEHDRSZ; - memmove(base + delta, base, (char *)sp + len - base); - - ptr = mp->mp_ptrs[indx]; - for (i = NUMKEYS(mp); --i >= 0;) { - if (mp->mp_ptrs[i] <= ptr) { - assert((size_t)UINT16_MAX - mp->mp_ptrs[i] >= delta); - mp->mp_ptrs[i] += (indx_t)delta; - } - } - assert((size_t)UINT16_MAX - mp->mp_upper >= delta); - mp->mp_upper += (indx_t)delta; -} - -/* Initial setup of a sorted-dups cursor. - * - * Sorted duplicates are implemented as a sub-database for the given key. - * The duplicate data items are actually keys of the sub-database. - * Operations on the duplicate data items are performed using a sub-cursor - * initialized when the sub-database is first accessed. This function does - * the preliminary setup of the sub-cursor, filling in the fields that - * depend only on the parent DB. - * - * [in] mc The main cursor whose sorted-dups cursor is to be initialized. */ -static void mdbx_xcursor_init0(MDBX_cursor *mc) { - MDBX_xcursor *mx = mc->mc_xcursor; - - mx->mx_cursor.mc_xcursor = NULL; - mx->mx_cursor.mc_txn = mc->mc_txn; - mx->mx_cursor.mc_db = &mx->mx_db; - mx->mx_cursor.mc_dbx = &mx->mx_dbx; - mx->mx_cursor.mc_dbi = mc->mc_dbi; - mx->mx_cursor.mc_dbflag = &mx->mx_dbflag; - mx->mx_cursor.mc_snum = 0; - mx->mx_cursor.mc_top = 0; - mx->mx_cursor.mc_flags = C_SUB; - mx->mx_dbx.md_name.iov_len = 0; - mx->mx_dbx.md_name.iov_base = NULL; - mx->mx_dbx.md_cmp = mc->mc_dbx->md_dcmp; - mx->mx_dbx.md_dcmp = NULL; -} - -/* Final setup of a sorted-dups cursor. - * Sets up the fields that depend on the data from the main cursor. - * [in] mc The main cursor whose sorted-dups cursor is to be initialized. - * [in] node The data containing the MDBX_db record for the sorted-dup database. - */ -static void mdbx_xcursor_init1(MDBX_cursor *mc, MDBX_node *node) { - MDBX_xcursor *mx = mc->mc_xcursor; - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - if (node->mn_flags & F_SUBDATA) { - memcpy(&mx->mx_db, NODEDATA(node), sizeof(MDBX_db)); - mx->mx_cursor.mc_pg[0] = 0; - mx->mx_cursor.mc_snum = 0; - mx->mx_cursor.mc_top = 0; - mx->mx_cursor.mc_flags = C_SUB; - } else { - MDBX_page *fp = NODEDATA(node); - mx->mx_db.md_xsize = 0; - mx->mx_db.md_flags = 0; - mx->mx_db.md_depth = 1; - mx->mx_db.md_branch_pages = 0; - mx->mx_db.md_leaf_pages = 1; - mx->mx_db.md_overflow_pages = 0; - mx->mx_db.md_entries = NUMKEYS(fp); - mx->mx_db.md_root = fp->mp_pgno; - mx->mx_cursor.mc_snum = 1; - mx->mx_cursor.mc_top = 0; - mx->mx_cursor.mc_flags = C_INITIALIZED | C_SUB; - mx->mx_cursor.mc_pg[0] = fp; - mx->mx_cursor.mc_ki[0] = 0; - if (mc->mc_db->md_flags & MDBX_DUPFIXED) { - mx->mx_db.md_flags = MDBX_DUPFIXED; - mx->mx_db.md_xsize = fp->mp_leaf2_ksize; - if (mc->mc_db->md_flags & MDBX_INTEGERDUP) - mx->mx_db.md_flags |= MDBX_INTEGERKEY; - } - } - mdbx_debug("Sub-db -%u root page %" PRIaPGNO "", mx->mx_cursor.mc_dbi, - mx->mx_db.md_root); - mx->mx_dbflag = DB_VALID | DB_USRVALID | DB_DUPDATA; - /* FIXME: #if UINT_MAX < SIZE_MAX - if (mx->mx_dbx.md_cmp == mdbx_cmp_int && mx->mx_db.md_pad == - sizeof(size_t)) - mx->mx_dbx.md_cmp = mdbx_cmp_clong; - #endif */ -} - -/* Fixup a sorted-dups cursor due to underlying update. - * Sets up some fields that depend on the data from the main cursor. - * Almost the same as init1, but skips initialization steps if the - * xcursor had already been used. - * [in] mc The main cursor whose sorted-dups cursor is to be fixed up. - * [in] src_mx The xcursor of an up-to-date cursor. - * [in] new_dupdata True if converting from a non-F_DUPDATA item. */ -static void mdbx_xcursor_init2(MDBX_cursor *mc, MDBX_xcursor *src_mx, - int new_dupdata) { - MDBX_xcursor *mx = mc->mc_xcursor; - - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - if (new_dupdata) { - mx->mx_cursor.mc_snum = 1; - mx->mx_cursor.mc_top = 0; - mx->mx_cursor.mc_flags |= C_INITIALIZED; - mx->mx_cursor.mc_ki[0] = 0; - mx->mx_dbflag = DB_VALID | DB_USRVALID | DB_DUPDATA; - mx->mx_dbx.md_cmp = src_mx->mx_dbx.md_cmp; - } else if (!(mx->mx_cursor.mc_flags & C_INITIALIZED)) { - return; - } - mx->mx_db = src_mx->mx_db; - mx->mx_cursor.mc_pg[0] = src_mx->mx_cursor.mc_pg[0]; - mdbx_debug("Sub-db -%u root page %" PRIaPGNO "", mx->mx_cursor.mc_dbi, - mx->mx_db.md_root); -} - -/* Initialize a cursor for a given transaction and database. */ -static void mdbx_cursor_init(MDBX_cursor *mc, MDBX_txn *txn, MDBX_dbi dbi, - MDBX_xcursor *mx) { - mc->mc_signature = MDBX_MC_SIGNATURE; - mc->mc_next = NULL; - mc->mc_backup = NULL; - mc->mc_dbi = dbi; - mc->mc_txn = txn; - mc->mc_db = &txn->mt_dbs[dbi]; - mc->mc_dbx = &txn->mt_dbxs[dbi]; - mc->mc_dbflag = &txn->mt_dbflags[dbi]; - mc->mc_snum = 0; - mc->mc_top = 0; - mc->mc_pg[0] = 0; - mc->mc_flags = 0; - mc->mc_ki[0] = 0; - mc->mc_xcursor = NULL; - if (txn->mt_dbs[dbi].md_flags & MDBX_DUPSORT) { - mdbx_tassert(txn, mx != NULL); - mx->mx_cursor.mc_signature = MDBX_MC_SIGNATURE; - mc->mc_xcursor = mx; - mdbx_xcursor_init0(mc); - } - mdbx_cassert(mc, mc->mc_txn->mt_txnid >= mc->mc_txn->mt_env->me_oldest[0]); - if (unlikely(*mc->mc_dbflag & DB_STALE)) { - mdbx_page_search(mc, NULL, MDBX_PS_ROOTONLY); - } -} - -int mdbx_cursor_open(MDBX_txn *txn, MDBX_dbi dbi, MDBX_cursor **ret) { - MDBX_cursor *mc; - size_t size = sizeof(MDBX_cursor); - - if (unlikely(!ret || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_VALID))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - if (unlikely(dbi == FREE_DBI && !F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY))) - return MDBX_EINVAL; - - if (txn->mt_dbs[dbi].md_flags & MDBX_DUPSORT) - size += sizeof(MDBX_xcursor); - - if (likely((mc = malloc(size)) != NULL)) { - mdbx_cursor_init(mc, txn, dbi, (MDBX_xcursor *)(mc + 1)); - if (txn->mt_cursors) { - mc->mc_next = txn->mt_cursors[dbi]; - txn->mt_cursors[dbi] = mc; - mc->mc_flags |= C_UNTRACK; - } - } else { - return MDBX_ENOMEM; - } - - *ret = mc; - - return MDBX_SUCCESS; -} - -int mdbx_cursor_renew(MDBX_txn *txn, MDBX_cursor *mc) { - if (unlikely(!mc || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE && - mc->mc_signature != MDBX_MC_READY4CLOSE)) - return MDBX_EINVAL; - - if (unlikely(!TXN_DBI_EXIST(txn, mc->mc_dbi, DB_VALID))) - return MDBX_EINVAL; - - if (unlikely(mc->mc_backup)) - return MDBX_EINVAL; - - if (unlikely((mc->mc_flags & C_UNTRACK) || txn->mt_cursors)) { - MDBX_cursor **prev = &mc->mc_txn->mt_cursors[mc->mc_dbi]; - while (*prev && *prev != mc) - prev = &(*prev)->mc_next; - if (*prev == mc) - *prev = mc->mc_next; - mc->mc_signature = MDBX_MC_READY4CLOSE; - } - - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - mdbx_cursor_init(mc, txn, mc->mc_dbi, mc->mc_xcursor); - return MDBX_SUCCESS; -} - -/* Return the count of duplicate data items for the current key */ -int mdbx_cursor_count(MDBX_cursor *mc, size_t *countp) { - if (unlikely(mc == NULL || countp == NULL)) - return MDBX_EINVAL; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(mc->mc_txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(mc->mc_txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - if (unlikely(!(mc->mc_flags & C_INITIALIZED))) - return MDBX_EINVAL; - - if (!mc->mc_snum) { - *countp = 0; - return MDBX_NOTFOUND; - } - - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - if ((mc->mc_flags & C_EOF) && mc->mc_ki[mc->mc_top] >= NUMKEYS(mp)) { - *countp = 0; - return MDBX_NOTFOUND; - } - - *countp = 1; - if (mc->mc_xcursor != NULL) { - MDBX_node *leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_cassert(mc, mc->mc_xcursor && (mc->mc_xcursor->mx_cursor.mc_flags & - C_INITIALIZED)); - *countp = unlikely(mc->mc_xcursor->mx_db.md_entries > SIZE_MAX) - ? SIZE_MAX - : (size_t)mc->mc_xcursor->mx_db.md_entries; - } - } - return MDBX_SUCCESS; -} - -void mdbx_cursor_close(MDBX_cursor *mc) { - if (mc) { - mdbx_ensure(NULL, mc->mc_signature == MDBX_MC_SIGNATURE || - mc->mc_signature == MDBX_MC_READY4CLOSE); - if (!mc->mc_backup) { - /* Remove from txn, if tracked. - * A read-only txn (!C_UNTRACK) may have been freed already, - * so do not peek inside it. Only write txns track cursors. */ - if ((mc->mc_flags & C_UNTRACK) && mc->mc_txn->mt_cursors) { - MDBX_cursor **prev = &mc->mc_txn->mt_cursors[mc->mc_dbi]; - while (*prev && *prev != mc) - prev = &(*prev)->mc_next; - if (*prev == mc) - *prev = mc->mc_next; - } - mc->mc_signature = 0; - free(mc); - } else { - /* cursor closed before nested txn ends */ - mdbx_cassert(mc, mc->mc_signature == MDBX_MC_SIGNATURE); - mc->mc_signature = MDBX_MC_WAIT4EOT; - } - } -} - -MDBX_txn *mdbx_cursor_txn(MDBX_cursor *mc) { - if (unlikely(!mc || mc->mc_signature != MDBX_MC_SIGNATURE)) - return NULL; - return mc->mc_txn; -} - -MDBX_dbi mdbx_cursor_dbi(MDBX_cursor *mc) { - if (unlikely(!mc || mc->mc_signature != MDBX_MC_SIGNATURE)) - return UINT_MAX; - return mc->mc_dbi; -} - -/* Replace the key for a branch node with a new key. - * Set MDBX_TXN_ERROR on failure. - * [in] mc Cursor pointing to the node to operate on. - * [in] key The new key to use. - * Returns 0 on success, non-zero on failure. */ -static int mdbx_update_key(MDBX_cursor *mc, MDBX_val *key) { - MDBX_page *mp; - MDBX_node *node; - char *base; - size_t len; - int delta, ksize, oksize; - indx_t ptr, i, numkeys, indx; - DKBUF; - - indx = mc->mc_ki[mc->mc_top]; - mp = mc->mc_pg[mc->mc_top]; - node = NODEPTR(mp, indx); - ptr = mp->mp_ptrs[indx]; - if (MDBX_DEBUG) { - MDBX_val k2; - char kbuf2[DKBUF_MAXKEYSIZE * 2 + 1]; - k2.iov_base = NODEKEY(node); - k2.iov_len = node->mn_ksize; - mdbx_debug("update key %u (ofs %u) [%s] to [%s] on page %" PRIaPGNO "", - indx, ptr, mdbx_dkey(&k2, kbuf2, sizeof(kbuf2)), DKEY(key), - mp->mp_pgno); - } - - /* Sizes must be 2-byte aligned. */ - ksize = EVEN(key->iov_len); - oksize = EVEN(node->mn_ksize); - delta = ksize - oksize; - - /* Shift node contents if EVEN(key length) changed. */ - if (delta) { - if (delta > 0 && SIZELEFT(mp) < delta) { - pgno_t pgno; - /* not enough space left, do a delete and split */ - mdbx_debug("Not enough room, delta = %d, splitting...", delta); - pgno = NODEPGNO(node); - mdbx_node_del(mc, 0); - return mdbx_page_split(mc, key, NULL, pgno, MDBX_SPLIT_REPLACE); - } - - numkeys = NUMKEYS(mp); - for (i = 0; i < numkeys; i++) { - if (mp->mp_ptrs[i] <= ptr) { - mdbx_cassert(mc, mp->mp_ptrs[i] >= delta); - mp->mp_ptrs[i] -= (indx_t)delta; - } - } - - base = (char *)mp + mp->mp_upper + PAGEHDRSZ; - len = ptr - mp->mp_upper + NODESIZE; - memmove(base - delta, base, len); - mdbx_cassert(mc, mp->mp_upper >= delta); - mp->mp_upper -= (indx_t)delta; - - node = NODEPTR(mp, indx); - } - - /* But even if no shift was needed, update ksize */ - if (node->mn_ksize != key->iov_len) - node->mn_ksize = (uint16_t)key->iov_len; - - if (key->iov_len) - memcpy(NODEKEY(node), key->iov_base, key->iov_len); - - return MDBX_SUCCESS; -} - -static void mdbx_cursor_copy(const MDBX_cursor *csrc, MDBX_cursor *cdst); - -/* Perform act while tracking temporary cursor mn */ -#define WITH_CURSOR_TRACKING(mn, act) \ - do { \ - mdbx_cassert(&(mn), \ - mn.mc_txn->mt_cursors != NULL /* must be not rdonly txt */); \ - MDBX_cursor mc_dummy, *tracked, \ - **tp = &(mn).mc_txn->mt_cursors[mn.mc_dbi]; \ - if ((mn).mc_flags & C_SUB) { \ - mc_dummy.mc_flags = C_INITIALIZED; \ - mc_dummy.mc_xcursor = (MDBX_xcursor *)&(mn); \ - tracked = &mc_dummy; \ - } else { \ - tracked = &(mn); \ - } \ - tracked->mc_next = *tp; \ - *tp = tracked; \ - { act; } \ - *tp = tracked->mc_next; \ - } while (0) - -/* Move a node from csrc to cdst. */ -static int mdbx_node_move(MDBX_cursor *csrc, MDBX_cursor *cdst, int fromleft) { - MDBX_node *srcnode; - MDBX_val key, data; - pgno_t srcpg; - MDBX_cursor mn; - int rc; - unsigned flags; - - DKBUF; - - /* Mark src and dst as dirty. */ - if (unlikely((rc = mdbx_page_touch(csrc)) || (rc = mdbx_page_touch(cdst)))) - return rc; - - if (IS_LEAF2(csrc->mc_pg[csrc->mc_top])) { - key.iov_len = csrc->mc_db->md_xsize; - key.iov_base = LEAF2KEY(csrc->mc_pg[csrc->mc_top], - csrc->mc_ki[csrc->mc_top], key.iov_len); - data.iov_len = 0; - data.iov_base = NULL; - srcpg = 0; - flags = 0; - } else { - srcnode = NODEPTR(csrc->mc_pg[csrc->mc_top], csrc->mc_ki[csrc->mc_top]); - mdbx_cassert(csrc, !((size_t)srcnode & 1)); - srcpg = NODEPGNO(srcnode); - flags = srcnode->mn_flags; - if (csrc->mc_ki[csrc->mc_top] == 0 && - IS_BRANCH(csrc->mc_pg[csrc->mc_top])) { - unsigned snum = csrc->mc_snum; - MDBX_node *s2; - /* must find the lowest key below src */ - rc = mdbx_page_search_lowest(csrc); - if (unlikely(rc)) - return rc; - if (IS_LEAF2(csrc->mc_pg[csrc->mc_top])) { - key.iov_len = csrc->mc_db->md_xsize; - key.iov_base = LEAF2KEY(csrc->mc_pg[csrc->mc_top], 0, key.iov_len); - } else { - s2 = NODEPTR(csrc->mc_pg[csrc->mc_top], 0); - key.iov_len = NODEKSZ(s2); - key.iov_base = NODEKEY(s2); - } - mdbx_cassert(csrc, snum >= 1 && snum <= UINT16_MAX); - csrc->mc_snum = (uint16_t)snum--; - csrc->mc_top = (uint16_t)snum; - } else { - key.iov_len = NODEKSZ(srcnode); - key.iov_base = NODEKEY(srcnode); - } - data.iov_len = NODEDSZ(srcnode); - data.iov_base = NODEDATA(srcnode); - } - mn.mc_xcursor = NULL; - if (IS_BRANCH(cdst->mc_pg[cdst->mc_top]) && cdst->mc_ki[cdst->mc_top] == 0) { - unsigned snum = cdst->mc_snum; - MDBX_node *s2; - MDBX_val bkey; - /* must find the lowest key below dst */ - mdbx_cursor_copy(cdst, &mn); - rc = mdbx_page_search_lowest(&mn); - if (unlikely(rc)) - return rc; - if (IS_LEAF2(mn.mc_pg[mn.mc_top])) { - bkey.iov_len = mn.mc_db->md_xsize; - bkey.iov_base = LEAF2KEY(mn.mc_pg[mn.mc_top], 0, bkey.iov_len); - } else { - s2 = NODEPTR(mn.mc_pg[mn.mc_top], 0); - bkey.iov_len = NODEKSZ(s2); - bkey.iov_base = NODEKEY(s2); - } - mdbx_cassert(csrc, snum >= 1 && snum <= UINT16_MAX); - mn.mc_snum = (uint16_t)snum--; - mn.mc_top = (uint16_t)snum; - mn.mc_ki[snum] = 0; - rc = mdbx_update_key(&mn, &bkey); - if (unlikely(rc)) - return rc; - } - - mdbx_debug("moving %s node %u [%s] on page %" PRIaPGNO - " to node %u on page %" PRIaPGNO "", - IS_LEAF(csrc->mc_pg[csrc->mc_top]) ? "leaf" : "branch", - csrc->mc_ki[csrc->mc_top], DKEY(&key), - csrc->mc_pg[csrc->mc_top]->mp_pgno, cdst->mc_ki[cdst->mc_top], - cdst->mc_pg[cdst->mc_top]->mp_pgno); - - /* Add the node to the destination page. */ - rc = - mdbx_node_add(cdst, cdst->mc_ki[cdst->mc_top], &key, &data, srcpg, flags); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - /* Delete the node from the source page. */ - mdbx_node_del(csrc, key.iov_len); - - { - /* Adjust other cursors pointing to mp */ - MDBX_cursor *m2, *m3; - MDBX_dbi dbi = csrc->mc_dbi; - MDBX_page *mpd, *mps; - - mps = csrc->mc_pg[csrc->mc_top]; - /* If we're adding on the left, bump others up */ - if (fromleft) { - mpd = cdst->mc_pg[csrc->mc_top]; - for (m2 = csrc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - if (csrc->mc_flags & C_SUB) - m3 = &m2->mc_xcursor->mx_cursor; - else - m3 = m2; - if (!(m3->mc_flags & C_INITIALIZED) || m3->mc_top < csrc->mc_top) - continue; - if (m3 != cdst && m3->mc_pg[csrc->mc_top] == mpd && - m3->mc_ki[csrc->mc_top] >= cdst->mc_ki[csrc->mc_top]) { - m3->mc_ki[csrc->mc_top]++; - } - if (m3 != csrc && m3->mc_pg[csrc->mc_top] == mps && - m3->mc_ki[csrc->mc_top] == csrc->mc_ki[csrc->mc_top]) { - m3->mc_pg[csrc->mc_top] = cdst->mc_pg[cdst->mc_top]; - m3->mc_ki[csrc->mc_top] = cdst->mc_ki[cdst->mc_top]; - m3->mc_ki[csrc->mc_top - 1]++; - } - if (XCURSOR_INITED(m3) && IS_LEAF(mps)) - XCURSOR_REFRESH(m3, m3->mc_pg[csrc->mc_top], m3->mc_ki[csrc->mc_top]); - } - } else - /* Adding on the right, bump others down */ - { - for (m2 = csrc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - if (csrc->mc_flags & C_SUB) - m3 = &m2->mc_xcursor->mx_cursor; - else - m3 = m2; - if (m3 == csrc) - continue; - if (!(m3->mc_flags & C_INITIALIZED) || m3->mc_top < csrc->mc_top) - continue; - if (m3->mc_pg[csrc->mc_top] == mps) { - if (!m3->mc_ki[csrc->mc_top]) { - m3->mc_pg[csrc->mc_top] = cdst->mc_pg[cdst->mc_top]; - m3->mc_ki[csrc->mc_top] = cdst->mc_ki[cdst->mc_top]; - m3->mc_ki[csrc->mc_top - 1]--; - } else { - m3->mc_ki[csrc->mc_top]--; - } - if (XCURSOR_INITED(m3) && IS_LEAF(mps)) - XCURSOR_REFRESH(m3, m3->mc_pg[csrc->mc_top], - m3->mc_ki[csrc->mc_top]); - } - } - } - } - - /* Update the parent separators. */ - if (csrc->mc_ki[csrc->mc_top] == 0) { - if (csrc->mc_ki[csrc->mc_top - 1] != 0) { - if (IS_LEAF2(csrc->mc_pg[csrc->mc_top])) { - key.iov_base = LEAF2KEY(csrc->mc_pg[csrc->mc_top], 0, key.iov_len); - } else { - srcnode = NODEPTR(csrc->mc_pg[csrc->mc_top], 0); - key.iov_len = NODEKSZ(srcnode); - key.iov_base = NODEKEY(srcnode); - } - mdbx_debug("update separator for source page %" PRIaPGNO " to [%s]", - csrc->mc_pg[csrc->mc_top]->mp_pgno, DKEY(&key)); - mdbx_cursor_copy(csrc, &mn); - mn.mc_snum--; - mn.mc_top--; - /* We want mdbx_rebalance to find mn when doing fixups */ - WITH_CURSOR_TRACKING(mn, rc = mdbx_update_key(&mn, &key)); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - if (IS_BRANCH(csrc->mc_pg[csrc->mc_top])) { - MDBX_val nullkey; - indx_t ix = csrc->mc_ki[csrc->mc_top]; - nullkey.iov_len = 0; - csrc->mc_ki[csrc->mc_top] = 0; - rc = mdbx_update_key(csrc, &nullkey); - csrc->mc_ki[csrc->mc_top] = ix; - mdbx_cassert(csrc, rc == MDBX_SUCCESS); - } - } - - if (cdst->mc_ki[cdst->mc_top] == 0) { - if (cdst->mc_ki[cdst->mc_top - 1] != 0) { - if (IS_LEAF2(csrc->mc_pg[csrc->mc_top])) { - key.iov_base = LEAF2KEY(cdst->mc_pg[cdst->mc_top], 0, key.iov_len); - } else { - srcnode = NODEPTR(cdst->mc_pg[cdst->mc_top], 0); - key.iov_len = NODEKSZ(srcnode); - key.iov_base = NODEKEY(srcnode); - } - mdbx_debug("update separator for destination page %" PRIaPGNO " to [%s]", - cdst->mc_pg[cdst->mc_top]->mp_pgno, DKEY(&key)); - mdbx_cursor_copy(cdst, &mn); - mn.mc_snum--; - mn.mc_top--; - /* We want mdbx_rebalance to find mn when doing fixups */ - WITH_CURSOR_TRACKING(mn, rc = mdbx_update_key(&mn, &key)); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - if (IS_BRANCH(cdst->mc_pg[cdst->mc_top])) { - MDBX_val nullkey; - indx_t ix = cdst->mc_ki[cdst->mc_top]; - nullkey.iov_len = 0; - cdst->mc_ki[cdst->mc_top] = 0; - rc = mdbx_update_key(cdst, &nullkey); - cdst->mc_ki[cdst->mc_top] = ix; - mdbx_cassert(cdst, rc == MDBX_SUCCESS); - } - } - - return MDBX_SUCCESS; -} - -/* Merge one page into another. - * - * The nodes from the page pointed to by csrc will be copied to the page - * pointed to by cdst and then the csrc page will be freed. - * - * [in] csrc Cursor pointing to the source page. - * [in] cdst Cursor pointing to the destination page. - * - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_merge(MDBX_cursor *csrc, MDBX_cursor *cdst) { - MDBX_page *psrc, *pdst; - MDBX_node *srcnode; - MDBX_val key, data; - unsigned nkeys; - int rc; - unsigned i, j; - - psrc = csrc->mc_pg[csrc->mc_top]; - pdst = cdst->mc_pg[cdst->mc_top]; - - mdbx_debug("merging page %" PRIaPGNO " into %" PRIaPGNO "", psrc->mp_pgno, - pdst->mp_pgno); - - mdbx_cassert(csrc, csrc->mc_snum > 1); /* can't merge root page */ - mdbx_cassert(csrc, cdst->mc_snum > 1); - - /* Mark dst as dirty. */ - if (unlikely(rc = mdbx_page_touch(cdst))) - return rc; - - /* get dst page again now that we've touched it. */ - pdst = cdst->mc_pg[cdst->mc_top]; - - /* Move all nodes from src to dst. */ - j = nkeys = NUMKEYS(pdst); - if (IS_LEAF2(psrc)) { - key.iov_len = csrc->mc_db->md_xsize; - key.iov_base = PAGEDATA(psrc); - for (i = 0; i < NUMKEYS(psrc); i++, j++) { - rc = mdbx_node_add(cdst, j, &key, NULL, 0, 0); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - key.iov_base = (char *)key.iov_base + key.iov_len; - } - } else { - for (i = 0; i < NUMKEYS(psrc); i++, j++) { - srcnode = NODEPTR(psrc, i); - if (i == 0 && IS_BRANCH(psrc)) { - MDBX_cursor mn; - MDBX_node *s2; - mdbx_cursor_copy(csrc, &mn); - mn.mc_xcursor = NULL; - /* must find the lowest key below src */ - rc = mdbx_page_search_lowest(&mn); - if (unlikely(rc)) - return rc; - if (IS_LEAF2(mn.mc_pg[mn.mc_top])) { - key.iov_len = mn.mc_db->md_xsize; - key.iov_base = LEAF2KEY(mn.mc_pg[mn.mc_top], 0, key.iov_len); - } else { - s2 = NODEPTR(mn.mc_pg[mn.mc_top], 0); - key.iov_len = NODEKSZ(s2); - key.iov_base = NODEKEY(s2); - } - } else { - key.iov_len = srcnode->mn_ksize; - key.iov_base = NODEKEY(srcnode); - } - - data.iov_len = NODEDSZ(srcnode); - data.iov_base = NODEDATA(srcnode); - rc = mdbx_node_add(cdst, j, &key, &data, NODEPGNO(srcnode), - srcnode->mn_flags); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - } - } - - mdbx_debug("dst page %" PRIaPGNO " now has %u keys (%.1f%% filled)", - pdst->mp_pgno, NUMKEYS(pdst), - (float)PAGEFILL(cdst->mc_txn->mt_env, pdst) / 10); - - /* Unlink the src page from parent and add to free list. */ - csrc->mc_top--; - mdbx_node_del(csrc, 0); - if (csrc->mc_ki[csrc->mc_top] == 0) { - key.iov_len = 0; - rc = mdbx_update_key(csrc, &key); - if (unlikely(rc)) { - csrc->mc_top++; - return rc; - } - } - csrc->mc_top++; - - psrc = csrc->mc_pg[csrc->mc_top]; - /* If not operating on FreeDB, allow this page to be reused - * in this txn. Otherwise just add to free list. */ - rc = mdbx_page_loose(csrc, psrc); - if (unlikely(rc)) - return rc; - if (IS_LEAF(psrc)) - csrc->mc_db->md_leaf_pages--; - else - csrc->mc_db->md_branch_pages--; - { - /* Adjust other cursors pointing to mp */ - MDBX_cursor *m2, *m3; - MDBX_dbi dbi = csrc->mc_dbi; - unsigned top = csrc->mc_top; - - for (m2 = csrc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - if (csrc->mc_flags & C_SUB) - m3 = &m2->mc_xcursor->mx_cursor; - else - m3 = m2; - if (m3 == csrc) - continue; - if (m3->mc_snum < csrc->mc_snum) - continue; - if (m3->mc_pg[top] == psrc) { - m3->mc_pg[top] = pdst; - mdbx_cassert(m3, nkeys + m3->mc_ki[top] <= UINT16_MAX); - m3->mc_ki[top] += (indx_t)nkeys; - m3->mc_ki[top - 1] = cdst->mc_ki[top - 1]; - } else if (m3->mc_pg[top - 1] == csrc->mc_pg[top - 1] && - m3->mc_ki[top - 1] > csrc->mc_ki[top - 1]) { - m3->mc_ki[top - 1]--; - } - if (XCURSOR_INITED(m3) && IS_LEAF(psrc)) - XCURSOR_REFRESH(m3, m3->mc_pg[top], m3->mc_ki[top]); - } - } - { - unsigned snum = cdst->mc_snum; - uint16_t depth = cdst->mc_db->md_depth; - mdbx_cursor_pop(cdst); - rc = mdbx_rebalance(cdst); - /* Did the tree height change? */ - if (depth != cdst->mc_db->md_depth) - snum += cdst->mc_db->md_depth - depth; - mdbx_cassert(cdst, snum >= 1 && snum <= UINT16_MAX); - cdst->mc_snum = (uint16_t)snum; - cdst->mc_top = (uint16_t)(snum - 1); - } - return rc; -} - -/* Copy the contents of a cursor. - * [in] csrc The cursor to copy from. - * [out] cdst The cursor to copy to. */ -static void mdbx_cursor_copy(const MDBX_cursor *csrc, MDBX_cursor *cdst) { - unsigned i; - - mdbx_cassert(csrc, - csrc->mc_txn->mt_txnid >= csrc->mc_txn->mt_env->me_oldest[0]); - cdst->mc_txn = csrc->mc_txn; - cdst->mc_dbi = csrc->mc_dbi; - cdst->mc_db = csrc->mc_db; - cdst->mc_dbx = csrc->mc_dbx; - cdst->mc_snum = csrc->mc_snum; - cdst->mc_top = csrc->mc_top; - cdst->mc_flags = csrc->mc_flags; - - for (i = 0; i < csrc->mc_snum; i++) { - cdst->mc_pg[i] = csrc->mc_pg[i]; - cdst->mc_ki[i] = csrc->mc_ki[i]; - } -} - -/* Rebalance the tree after a delete operation. - * [in] mc Cursor pointing to the page where rebalancing should begin. - * Returns 0 on success, non-zero on failure. */ -static int mdbx_rebalance(MDBX_cursor *mc) { - MDBX_node *node; - int rc, fromleft; - unsigned ptop, minkeys, thresh; - MDBX_cursor mn; - indx_t oldki; - - if (IS_BRANCH(mc->mc_pg[mc->mc_top])) { - minkeys = 2; - thresh = 1; - } else { - minkeys = 1; - thresh = FILL_THRESHOLD; - } - mdbx_debug("rebalancing %s page %" PRIaPGNO " (has %u keys, %.1f%% full)", - IS_LEAF(mc->mc_pg[mc->mc_top]) ? "leaf" : "branch", - mc->mc_pg[mc->mc_top]->mp_pgno, NUMKEYS(mc->mc_pg[mc->mc_top]), - (float)PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) / 10); - - if (PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) >= thresh && - NUMKEYS(mc->mc_pg[mc->mc_top]) >= minkeys) { - mdbx_debug("no need to rebalance page %" PRIaPGNO ", above fill threshold", - mc->mc_pg[mc->mc_top]->mp_pgno); - return MDBX_SUCCESS; - } - - if (mc->mc_snum < 2) { - MDBX_page *mp = mc->mc_pg[0]; - unsigned nkeys = NUMKEYS(mp); - if (IS_SUBP(mp)) { - mdbx_debug("Can't rebalance a subpage, ignoring"); - return MDBX_SUCCESS; - } - if (nkeys == 0) { - mdbx_debug("tree is completely empty"); - mc->mc_db->md_root = P_INVALID; - mc->mc_db->md_depth = 0; - mc->mc_db->md_leaf_pages = 0; - rc = mdbx_pnl_append(&mc->mc_txn->mt_befree_pages, mp->mp_pgno); - if (unlikely(rc)) - return rc; - /* Adjust cursors pointing to mp */ - mc->mc_snum = 0; - mc->mc_top = 0; - mc->mc_flags &= ~C_INITIALIZED; - { - MDBX_cursor *m2, *m3; - MDBX_dbi dbi = mc->mc_dbi; - - for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - if (mc->mc_flags & C_SUB) - m3 = &m2->mc_xcursor->mx_cursor; - else - m3 = m2; - if (!(m3->mc_flags & C_INITIALIZED) || (m3->mc_snum < mc->mc_snum)) - continue; - if (m3->mc_pg[0] == mp) { - m3->mc_snum = 0; - m3->mc_top = 0; - m3->mc_flags &= ~C_INITIALIZED; - } - } - } - } else if (IS_BRANCH(mp) && NUMKEYS(mp) == 1) { - int i; - mdbx_debug("collapsing root page!"); - rc = mdbx_pnl_append(&mc->mc_txn->mt_befree_pages, mp->mp_pgno); - if (unlikely(rc)) - return rc; - mc->mc_db->md_root = NODEPGNO(NODEPTR(mp, 0)); - rc = mdbx_page_get(mc, mc->mc_db->md_root, &mc->mc_pg[0], NULL); - if (unlikely(rc)) - return rc; - mc->mc_db->md_depth--; - mc->mc_db->md_branch_pages--; - mc->mc_ki[0] = mc->mc_ki[1]; - for (i = 1; i < mc->mc_db->md_depth; i++) { - mc->mc_pg[i] = mc->mc_pg[i + 1]; - mc->mc_ki[i] = mc->mc_ki[i + 1]; - } - { - /* Adjust other cursors pointing to mp */ - MDBX_cursor *m2, *m3; - MDBX_dbi dbi = mc->mc_dbi; - - for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - if (mc->mc_flags & C_SUB) - m3 = &m2->mc_xcursor->mx_cursor; - else - m3 = m2; - if (m3 == mc) - continue; - if (!(m3->mc_flags & C_INITIALIZED)) - continue; - if (m3->mc_pg[0] == mp) { - for (i = 0; i < mc->mc_db->md_depth; i++) { - m3->mc_pg[i] = m3->mc_pg[i + 1]; - m3->mc_ki[i] = m3->mc_ki[i + 1]; - } - m3->mc_snum--; - m3->mc_top--; - } - } - } - } else { - mdbx_debug("root page %" PRIaPGNO - " doesn't need rebalancing (flags 0x%x)", - mp->mp_pgno, mp->mp_flags); - } - return MDBX_SUCCESS; - } - - /* The parent (branch page) must have at least 2 pointers, - * otherwise the tree is invalid. */ - ptop = mc->mc_top - 1; - mdbx_cassert(mc, NUMKEYS(mc->mc_pg[ptop]) > 1); - - /* Leaf page fill factor is below the threshold. - * Try to move keys from left or right neighbor, or - * merge with a neighbor page. */ - - /* Find neighbors. */ - mdbx_cursor_copy(mc, &mn); - mn.mc_xcursor = NULL; - - oldki = mc->mc_ki[mc->mc_top]; - if (mc->mc_ki[ptop] == 0) { - /* We're the leftmost leaf in our parent. */ - mdbx_debug("reading right neighbor"); - mn.mc_ki[ptop]++; - node = NODEPTR(mc->mc_pg[ptop], mn.mc_ki[ptop]); - rc = mdbx_page_get(mc, NODEPGNO(node), &mn.mc_pg[mn.mc_top], NULL); - if (unlikely(rc)) - return rc; - mn.mc_ki[mn.mc_top] = 0; - mc->mc_ki[mc->mc_top] = NUMKEYS(mc->mc_pg[mc->mc_top]); - fromleft = 0; - } else { - /* There is at least one neighbor to the left. */ - mdbx_debug("reading left neighbor"); - mn.mc_ki[ptop]--; - node = NODEPTR(mc->mc_pg[ptop], mn.mc_ki[ptop]); - rc = mdbx_page_get(mc, NODEPGNO(node), &mn.mc_pg[mn.mc_top], NULL); - if (unlikely(rc)) - return rc; - mn.mc_ki[mn.mc_top] = NUMKEYS(mn.mc_pg[mn.mc_top]) - 1; - mc->mc_ki[mc->mc_top] = 0; - fromleft = 1; - } - - mdbx_debug("found neighbor page %" PRIaPGNO " (%u keys, %.1f%% full)", - mn.mc_pg[mn.mc_top]->mp_pgno, NUMKEYS(mn.mc_pg[mn.mc_top]), - (float)PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) / 10); - - /* If the neighbor page is above threshold and has enough keys, - * move one key from it. Otherwise we should try to merge them. - * (A branch page must never have less than 2 keys.) */ - if (PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) >= thresh && - NUMKEYS(mn.mc_pg[mn.mc_top]) > minkeys) { - rc = mdbx_node_move(&mn, mc, fromleft); - if (fromleft) { - /* if we inserted on left, bump position up */ - oldki++; - } - } else { - if (!fromleft) { - rc = mdbx_page_merge(&mn, mc); - } else { - oldki += NUMKEYS(mn.mc_pg[mn.mc_top]); - mn.mc_ki[mn.mc_top] += mc->mc_ki[mn.mc_top] + 1; - /* We want mdbx_rebalance to find mn when doing fixups */ - WITH_CURSOR_TRACKING(mn, rc = mdbx_page_merge(mc, &mn)); - mdbx_cursor_copy(&mn, mc); - } - mc->mc_flags &= ~C_EOF; - } - mc->mc_ki[mc->mc_top] = oldki; - return rc; -} - -/* Complete a delete operation started by mdbx_cursor_del(). */ -static int mdbx_cursor_del0(MDBX_cursor *mc) { - int rc; - MDBX_page *mp; - indx_t ki; - unsigned nkeys; - MDBX_cursor *m2, *m3; - MDBX_dbi dbi = mc->mc_dbi; - - ki = mc->mc_ki[mc->mc_top]; - mp = mc->mc_pg[mc->mc_top]; - mdbx_node_del(mc, mc->mc_db->md_xsize); - mc->mc_db->md_entries--; - { - /* Adjust other cursors pointing to mp */ - for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - m3 = (mc->mc_flags & C_SUB) ? &m2->mc_xcursor->mx_cursor : m2; - if (!(m2->mc_flags & m3->mc_flags & C_INITIALIZED)) - continue; - if (m3 == mc || m3->mc_snum < mc->mc_snum) - continue; - if (m3->mc_pg[mc->mc_top] == mp) { - if (m3->mc_ki[mc->mc_top] == ki) { - m3->mc_flags |= C_DEL; - if (mc->mc_db->md_flags & MDBX_DUPSORT) { - /* Sub-cursor referred into dataset which is gone */ - m3->mc_xcursor->mx_cursor.mc_flags &= ~(C_INITIALIZED | C_EOF); - } - continue; - } else if (m3->mc_ki[mc->mc_top] > ki) { - m3->mc_ki[mc->mc_top]--; - } - if (XCURSOR_INITED(m3)) - XCURSOR_REFRESH(m3, m3->mc_pg[mc->mc_top], m3->mc_ki[mc->mc_top]); - } - } - } - rc = mdbx_rebalance(mc); - - if (likely(rc == MDBX_SUCCESS)) { - /* DB is totally empty now, just bail out. - * Other cursors adjustments were already done - * by mdbx_rebalance and aren't needed here. */ - if (!mc->mc_snum) { - mc->mc_flags |= C_DEL | C_EOF; - return rc; - } - - mp = mc->mc_pg[mc->mc_top]; - nkeys = NUMKEYS(mp); - - /* Adjust other cursors pointing to mp */ - for (m2 = mc->mc_txn->mt_cursors[dbi]; !rc && m2; m2 = m2->mc_next) { - m3 = (mc->mc_flags & C_SUB) ? &m2->mc_xcursor->mx_cursor : m2; - if (!(m2->mc_flags & m3->mc_flags & C_INITIALIZED)) - continue; - if (m3->mc_snum < mc->mc_snum) - continue; - if (m3->mc_pg[mc->mc_top] == mp) { - /* if m3 points past last node in page, find next sibling */ - if (m3->mc_ki[mc->mc_top] >= mc->mc_ki[mc->mc_top]) { - if (m3->mc_ki[mc->mc_top] >= nkeys) { - rc = mdbx_cursor_sibling(m3, 1); - if (rc == MDBX_NOTFOUND) { - m3->mc_flags |= C_EOF; - rc = MDBX_SUCCESS; - continue; - } - } - if (mc->mc_db->md_flags & MDBX_DUPSORT) { - MDBX_node *node = - NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]); - /* If this node has dupdata, it may need to be reinited - * because its data has moved. - * If the xcursor was not initd it must be reinited. - * Else if node points to a subDB, nothing is needed. */ - if (node->mn_flags & F_DUPDATA) { - if (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) { - if (!(node->mn_flags & F_SUBDATA)) - m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node); - } else { - mdbx_xcursor_init1(m3, node); - m3->mc_xcursor->mx_cursor.mc_flags |= C_DEL; - } - } - } - } - } - } - mc->mc_flags |= C_DEL; - } - - if (unlikely(rc)) - mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; - return rc; -} - -int mdbx_del(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data) { - if (unlikely(!key || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & (MDBX_TXN_RDONLY | MDBX_TXN_BLOCKED))) - return (txn->mt_flags & MDBX_TXN_RDONLY) ? MDBX_EACCESS : MDBX_BAD_TXN; - - return mdbx_del0(txn, dbi, key, data, 0); -} - -static int mdbx_del0(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data, - unsigned flags) { - MDBX_cursor mc; - MDBX_xcursor mx; - MDBX_cursor_op op; - MDBX_val rdata; - int rc, exact = 0; - DKBUF; - - mdbx_debug("====> delete db %u key [%s], data [%s]", dbi, DKEY(key), - DVAL(data)); - - mdbx_cursor_init(&mc, txn, dbi, &mx); - - if (data) { - op = MDBX_GET_BOTH; - rdata = *data; - data = &rdata; - } else { - op = MDBX_SET; - flags |= MDBX_NODUPDATA; - } - rc = mdbx_cursor_set(&mc, key, data, op, &exact); - if (likely(rc == MDBX_SUCCESS)) { - /* let mdbx_page_split know about this cursor if needed: - * delete will trigger a rebalance; if it needs to move - * a node from one page to another, it will have to - * update the parent's separator key(s). If the new sepkey - * is larger than the current one, the parent page may - * run out of space, triggering a split. We need this - * cursor to be consistent until the end of the rebalance. */ - mc.mc_next = txn->mt_cursors[dbi]; - txn->mt_cursors[dbi] = &mc; - rc = mdbx_cursor_del(&mc, flags); - txn->mt_cursors[dbi] = mc.mc_next; - } - return rc; -} - -/* Split a page and insert a new node. - * Set MDBX_TXN_ERROR on failure. - * [in,out] mc Cursor pointing to the page and desired insertion index. - * The cursor will be updated to point to the actual page and index where - * the node got inserted after the split. - * [in] newkey The key for the newly inserted node. - * [in] newdata The data for the newly inserted node. - * [in] newpgno The page number, if the new node is a branch node. - * [in] nflags The NODE_ADD_FLAGS for the new node. - * Returns 0 on success, non-zero on failure. */ -static int mdbx_page_split(MDBX_cursor *mc, MDBX_val *newkey, MDBX_val *newdata, - pgno_t newpgno, unsigned nflags) { - unsigned flags; - int rc = MDBX_SUCCESS, new_root = 0, did_split = 0; - pgno_t pgno = 0; - unsigned i, ptop; - MDBX_env *env = mc->mc_txn->mt_env; - MDBX_node *node; - MDBX_val sepkey, rkey, xdata, *rdata = &xdata; - MDBX_page *copy = NULL; - MDBX_page *rp, *pp; - MDBX_cursor mn; - DKBUF; - - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - unsigned newindx = mc->mc_ki[mc->mc_top]; - unsigned nkeys = NUMKEYS(mp); - - mdbx_debug("-----> splitting %s page %" PRIaPGNO - " and adding [%s] at index %i/%i", - IS_LEAF(mp) ? "leaf" : "branch", mp->mp_pgno, DKEY(newkey), - mc->mc_ki[mc->mc_top], nkeys); - - /* Create a right sibling. */ - if ((rc = mdbx_page_new(mc, mp->mp_flags, 1, &rp))) - return rc; - rp->mp_leaf2_ksize = mp->mp_leaf2_ksize; - mdbx_debug("new right sibling: page %" PRIaPGNO "", rp->mp_pgno); - - /* Usually when splitting the root page, the cursor - * height is 1. But when called from mdbx_update_key, - * the cursor height may be greater because it walks - * up the stack while finding the branch slot to update. */ - if (mc->mc_top < 1) { - if ((rc = mdbx_page_new(mc, P_BRANCH, 1, &pp))) - goto done; - /* shift current top to make room for new parent */ - for (i = mc->mc_snum; i > 0; i--) { - mc->mc_pg[i] = mc->mc_pg[i - 1]; - mc->mc_ki[i] = mc->mc_ki[i - 1]; - } - mc->mc_pg[0] = pp; - mc->mc_ki[0] = 0; - mc->mc_db->md_root = pp->mp_pgno; - mdbx_debug("root split! new root = %" PRIaPGNO "", pp->mp_pgno); - new_root = mc->mc_db->md_depth++; - - /* Add left (implicit) pointer. */ - if (unlikely((rc = mdbx_node_add(mc, 0, NULL, NULL, mp->mp_pgno, 0)) != - MDBX_SUCCESS)) { - /* undo the pre-push */ - mc->mc_pg[0] = mc->mc_pg[1]; - mc->mc_ki[0] = mc->mc_ki[1]; - mc->mc_db->md_root = mp->mp_pgno; - mc->mc_db->md_depth--; - goto done; - } - mc->mc_snum++; - mc->mc_top++; - ptop = 0; - } else { - ptop = mc->mc_top - 1; - mdbx_debug("parent branch page is %" PRIaPGNO "", mc->mc_pg[ptop]->mp_pgno); - } - - mdbx_cursor_copy(mc, &mn); - mn.mc_xcursor = NULL; - mn.mc_pg[mn.mc_top] = rp; - mn.mc_ki[ptop] = mc->mc_ki[ptop] + 1; - - unsigned split_indx; - if (nflags & MDBX_APPEND) { - mn.mc_ki[mn.mc_top] = 0; - sepkey = *newkey; - split_indx = newindx; - nkeys = 0; - } else { - split_indx = (nkeys + 1) / 2; - - if (IS_LEAF2(rp)) { - char *split, *ins; - int x; - unsigned lsize, rsize, ksize; - /* Move half of the keys to the right sibling */ - x = mc->mc_ki[mc->mc_top] - split_indx; - ksize = mc->mc_db->md_xsize; - split = LEAF2KEY(mp, split_indx, ksize); - rsize = (nkeys - split_indx) * ksize; - lsize = (nkeys - split_indx) * sizeof(indx_t); - mdbx_cassert(mc, mp->mp_lower >= lsize); - mp->mp_lower -= (indx_t)lsize; - mdbx_cassert(mc, rp->mp_lower + lsize <= UINT16_MAX); - rp->mp_lower += (indx_t)lsize; - mdbx_cassert(mc, mp->mp_upper + rsize - lsize <= UINT16_MAX); - mp->mp_upper += (indx_t)(rsize - lsize); - mdbx_cassert(mc, rp->mp_upper >= rsize - lsize); - rp->mp_upper -= (indx_t)(rsize - lsize); - sepkey.iov_len = ksize; - if (newindx == split_indx) { - sepkey.iov_base = newkey->iov_base; - } else { - sepkey.iov_base = split; - } - if (x < 0) { - mdbx_cassert(mc, ksize >= sizeof(indx_t)); - ins = LEAF2KEY(mp, mc->mc_ki[mc->mc_top], ksize); - memcpy(rp->mp_ptrs, split, rsize); - sepkey.iov_base = rp->mp_ptrs; - memmove(ins + ksize, ins, (split_indx - mc->mc_ki[mc->mc_top]) * ksize); - memcpy(ins, newkey->iov_base, ksize); - mdbx_cassert(mc, UINT16_MAX - mp->mp_lower >= (int)sizeof(indx_t)); - mp->mp_lower += sizeof(indx_t); - mdbx_cassert(mc, mp->mp_upper >= ksize - sizeof(indx_t)); - mp->mp_upper -= (indx_t)(ksize - sizeof(indx_t)); - } else { - if (x) - memcpy(rp->mp_ptrs, split, x * ksize); - ins = LEAF2KEY(rp, x, ksize); - memcpy(ins, newkey->iov_base, ksize); - memcpy(ins + ksize, split + x * ksize, rsize - x * ksize); - mdbx_cassert(mc, UINT16_MAX - rp->mp_lower >= (int)sizeof(indx_t)); - rp->mp_lower += sizeof(indx_t); - mdbx_cassert(mc, rp->mp_upper >= ksize - sizeof(indx_t)); - rp->mp_upper -= (indx_t)(ksize - sizeof(indx_t)); - mdbx_cassert(mc, x <= UINT16_MAX); - mc->mc_ki[mc->mc_top] = (indx_t)x; - } - } else { - size_t psize, nsize, k; - /* Maximum free space in an empty page */ - unsigned pmax = env->me_psize - PAGEHDRSZ; - if (IS_LEAF(mp)) - nsize = mdbx_leaf_size(env, newkey, newdata); - else - nsize = mdbx_branch_size(env, newkey); - nsize = EVEN(nsize); - - /* grab a page to hold a temporary copy */ - copy = mdbx_page_malloc(mc->mc_txn, 1); - if (unlikely(copy == NULL)) { - rc = MDBX_ENOMEM; - goto done; - } - copy->mp_pgno = mp->mp_pgno; - copy->mp_flags = mp->mp_flags; - copy->mp_lower = 0; - mdbx_cassert(mc, env->me_psize - PAGEHDRSZ <= UINT16_MAX); - copy->mp_upper = (indx_t)(env->me_psize - PAGEHDRSZ); - - /* prepare to insert */ - for (unsigned j = i = 0; i < nkeys; i++) { - if (i == newindx) - copy->mp_ptrs[j++] = 0; - copy->mp_ptrs[j++] = mp->mp_ptrs[i]; - } - - /* When items are relatively large the split point needs - * to be checked, because being off-by-one will make the - * difference between success or failure in mdbx_node_add. - * - * It's also relevant if a page happens to be laid out - * such that one half of its nodes are all "small" and - * the other half of its nodes are "large." If the new - * item is also "large" and falls on the half with - * "large" nodes, it also may not fit. - * - * As a final tweak, if the new item goes on the last - * spot on the page (and thus, onto the new page), bias - * the split so the new page is emptier than the old page. - * This yields better packing during sequential inserts. - */ - int dir; - if (nkeys < 20 || nsize > pmax / 16 || newindx >= nkeys) { - /* Find split point */ - psize = 0; - if (newindx <= split_indx || newindx >= nkeys) { - i = 0; - dir = 1; - k = (newindx >= nkeys) ? nkeys : split_indx + 1 + IS_LEAF(mp); - } else { - i = nkeys; - dir = -1; - k = split_indx - 1; - } - for (; i != k; i += dir) { - if (i == newindx) { - psize += nsize; - node = NULL; - } else { - node = (MDBX_node *)((char *)mp + copy->mp_ptrs[i] + PAGEHDRSZ); - psize += NODESIZE + NODEKSZ(node) + sizeof(indx_t); - if (IS_LEAF(mp)) { - if (F_ISSET(node->mn_flags, F_BIGDATA)) - psize += sizeof(pgno_t); - else - psize += NODEDSZ(node); - } - psize = EVEN(psize); - } - if (psize > pmax || i == k - dir) { - split_indx = i + (dir < 0); - break; - } - } - } - if (split_indx == newindx) { - sepkey.iov_len = newkey->iov_len; - sepkey.iov_base = newkey->iov_base; - } else { - node = - (MDBX_node *)((char *)mp + copy->mp_ptrs[split_indx] + PAGEHDRSZ); - sepkey.iov_len = node->mn_ksize; - sepkey.iov_base = NODEKEY(node); - } - } - } - - mdbx_debug("separator is %d [%s]", split_indx, DKEY(&sepkey)); - - /* Copy separator key to the parent. */ - if (SIZELEFT(mn.mc_pg[ptop]) < mdbx_branch_size(env, &sepkey)) { - int snum = mc->mc_snum; - mn.mc_snum--; - mn.mc_top--; - did_split = 1; - /* We want other splits to find mn when doing fixups */ - WITH_CURSOR_TRACKING( - mn, rc = mdbx_page_split(&mn, &sepkey, NULL, rp->mp_pgno, 0)); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - - /* root split? */ - if (mc->mc_snum > snum) - ptop++; - - /* Right page might now have changed parent. - * Check if left page also changed parent. */ - if (mn.mc_pg[ptop] != mc->mc_pg[ptop] && - mc->mc_ki[ptop] >= NUMKEYS(mc->mc_pg[ptop])) { - for (i = 0; i < ptop; i++) { - mc->mc_pg[i] = mn.mc_pg[i]; - mc->mc_ki[i] = mn.mc_ki[i]; - } - mc->mc_pg[ptop] = mn.mc_pg[ptop]; - if (mn.mc_ki[ptop]) { - mc->mc_ki[ptop] = mn.mc_ki[ptop] - 1; - } else { - /* find right page's left sibling */ - mc->mc_ki[ptop] = mn.mc_ki[ptop]; - rc = mdbx_cursor_sibling(mc, 0); - } - } - } else { - mn.mc_top--; - rc = mdbx_node_add(&mn, mn.mc_ki[ptop], &sepkey, NULL, rp->mp_pgno, 0); - mn.mc_top++; - } - if (unlikely(rc != MDBX_SUCCESS)) { - if (rc == MDBX_NOTFOUND) /* improper mdbx_cursor_sibling() result */ { - mdbx_error("unexpected %s", "MDBX_NOTFOUND"); - rc = MDBX_PROBLEM; - } - goto done; - } - if (nflags & MDBX_APPEND) { - mc->mc_pg[mc->mc_top] = rp; - mc->mc_ki[mc->mc_top] = 0; - rc = mdbx_node_add(mc, 0, newkey, newdata, newpgno, nflags); - if (rc) - goto done; - for (i = 0; i < mc->mc_top; i++) - mc->mc_ki[i] = mn.mc_ki[i]; - } else if (!IS_LEAF2(mp)) { - /* Move nodes */ - mc->mc_pg[mc->mc_top] = rp; - i = split_indx; - indx_t n = 0; - do { - if (i == newindx) { - rkey.iov_base = newkey->iov_base; - rkey.iov_len = newkey->iov_len; - if (IS_LEAF(mp)) { - rdata = newdata; - } else - pgno = newpgno; - flags = nflags; - /* Update index for the new key. */ - mc->mc_ki[mc->mc_top] = n; - } else { - node = (MDBX_node *)((char *)mp + copy->mp_ptrs[i] + PAGEHDRSZ); - rkey.iov_base = NODEKEY(node); - rkey.iov_len = node->mn_ksize; - if (IS_LEAF(mp)) { - xdata.iov_base = NODEDATA(node); - xdata.iov_len = NODEDSZ(node); - rdata = &xdata; - } else - pgno = NODEPGNO(node); - flags = node->mn_flags; - } - - if (!IS_LEAF(mp) && n == 0) { - /* First branch index doesn't need key data. */ - rkey.iov_len = 0; - } - - rc = mdbx_node_add(mc, n, &rkey, rdata, pgno, flags); - if (rc) - goto done; - if (i == nkeys) { - i = 0; - n = 0; - mc->mc_pg[mc->mc_top] = copy; - } else { - i++; - n++; - } - } while (i != split_indx); - - nkeys = NUMKEYS(copy); - for (i = 0; i < nkeys; i++) - mp->mp_ptrs[i] = copy->mp_ptrs[i]; - mp->mp_lower = copy->mp_lower; - mp->mp_upper = copy->mp_upper; - memcpy(NODEPTR(mp, nkeys - 1), NODEPTR(copy, nkeys - 1), - env->me_psize - copy->mp_upper - PAGEHDRSZ); - - /* reset back to original page */ - if (newindx < split_indx) { - mc->mc_pg[mc->mc_top] = mp; - } else { - mc->mc_pg[mc->mc_top] = rp; - mc->mc_ki[ptop]++; - /* Make sure mc_ki is still valid. */ - if (mn.mc_pg[ptop] != mc->mc_pg[ptop] && - mc->mc_ki[ptop] >= NUMKEYS(mc->mc_pg[ptop])) { - for (i = 0; i <= ptop; i++) { - mc->mc_pg[i] = mn.mc_pg[i]; - mc->mc_ki[i] = mn.mc_ki[i]; - } - } - } - if (nflags & MDBX_RESERVE) { - node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); - if (!(node->mn_flags & F_BIGDATA)) - newdata->iov_base = NODEDATA(node); - } - } else { - if (newindx >= split_indx) { - mc->mc_pg[mc->mc_top] = rp; - mc->mc_ki[ptop]++; - /* Make sure mc_ki is still valid. */ - if (mn.mc_pg[ptop] != mc->mc_pg[ptop] && - mc->mc_ki[ptop] >= NUMKEYS(mc->mc_pg[ptop])) { - for (i = 0; i <= ptop; i++) { - mc->mc_pg[i] = mn.mc_pg[i]; - mc->mc_ki[i] = mn.mc_ki[i]; - } - } - } - } - - { - /* Adjust other cursors pointing to mp */ - MDBX_cursor *m2, *m3; - MDBX_dbi dbi = mc->mc_dbi; - nkeys = NUMKEYS(mp); - - for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { - if (mc->mc_flags & C_SUB) - m3 = &m2->mc_xcursor->mx_cursor; - else - m3 = m2; - if (m3 == mc) - continue; - if (!(m2->mc_flags & m3->mc_flags & C_INITIALIZED)) - continue; - if (new_root) { - int k; - /* sub cursors may be on different DB */ - if (m3->mc_pg[0] != mp) - continue; - /* root split */ - for (k = new_root; k >= 0; k--) { - m3->mc_ki[k + 1] = m3->mc_ki[k]; - m3->mc_pg[k + 1] = m3->mc_pg[k]; - } - if (m3->mc_ki[0] >= nkeys) { - m3->mc_ki[0] = 1; - } else { - m3->mc_ki[0] = 0; - } - m3->mc_pg[0] = mc->mc_pg[0]; - m3->mc_snum++; - m3->mc_top++; - } - if (m3->mc_top >= mc->mc_top && m3->mc_pg[mc->mc_top] == mp) { - if (m3->mc_ki[mc->mc_top] >= newindx && !(nflags & MDBX_SPLIT_REPLACE)) - m3->mc_ki[mc->mc_top]++; - if (m3->mc_ki[mc->mc_top] >= nkeys) { - m3->mc_pg[mc->mc_top] = rp; - mdbx_cassert(mc, m3->mc_ki[mc->mc_top] >= nkeys); - m3->mc_ki[mc->mc_top] -= (indx_t)nkeys; - for (i = 0; i < mc->mc_top; i++) { - m3->mc_ki[i] = mn.mc_ki[i]; - m3->mc_pg[i] = mn.mc_pg[i]; - } - } - } else if (!did_split && m3->mc_top >= ptop && - m3->mc_pg[ptop] == mc->mc_pg[ptop] && - m3->mc_ki[ptop] >= mc->mc_ki[ptop]) { - m3->mc_ki[ptop]++; - } - if (XCURSOR_INITED(m3) && IS_LEAF(mp)) - XCURSOR_REFRESH(m3, m3->mc_pg[mc->mc_top], m3->mc_ki[mc->mc_top]); - } - } - mdbx_debug("mp left: %d, rp left: %d", SIZELEFT(mp), SIZELEFT(rp)); - -done: - if (copy) /* tmp page */ - mdbx_page_free(env, copy); - if (unlikely(rc)) - mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; - return rc; -} - -int mdbx_put(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data, - unsigned flags) { - MDBX_cursor mc; - MDBX_xcursor mx; - - if (unlikely(!key || !data || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(flags & - ~(MDBX_NOOVERWRITE | MDBX_NODUPDATA | MDBX_RESERVE | - MDBX_APPEND | MDBX_APPENDDUP | MDBX_CURRENT))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & (MDBX_TXN_RDONLY | MDBX_TXN_BLOCKED))) - return (txn->mt_flags & MDBX_TXN_RDONLY) ? MDBX_EACCESS : MDBX_BAD_TXN; - - mdbx_cursor_init(&mc, txn, dbi, &mx); - mc.mc_next = txn->mt_cursors[dbi]; - txn->mt_cursors[dbi] = &mc; - - int rc = MDBX_SUCCESS; - /* LY: support for update (explicit overwrite) */ - if (flags & MDBX_CURRENT) { - rc = mdbx_cursor_get(&mc, key, NULL, MDBX_SET); - if (likely(rc == MDBX_SUCCESS) && - (txn->mt_dbs[dbi].md_flags & MDBX_DUPSORT)) { - /* LY: allows update (explicit overwrite) only for unique keys */ - MDBX_node *leaf = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]); - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_tassert(txn, XCURSOR_INITED(&mc) && - mc.mc_xcursor->mx_db.md_entries > 1); - rc = MDBX_EMULTIVAL; - } - } - } - - if (likely(rc == MDBX_SUCCESS)) - rc = mdbx_cursor_put(&mc, key, data, flags); - txn->mt_cursors[dbi] = mc.mc_next; - - return rc; -} - -#ifndef MDBX_WBUF -#define MDBX_WBUF (1024 * 1024) -#endif -#define MDBX_EOF 0x10 /* mdbx_env_copyfd1() is done reading */ - -/* State needed for a double-buffering compacting copy. */ -typedef struct mdbx_copy { - MDBX_env *mc_env; - MDBX_txn *mc_txn; - mdbx_condmutex_t mc_condmutex; - char *mc_wbuf[2]; - char *mc_over[2]; - size_t mc_wlen[2]; - size_t mc_olen[2]; - mdbx_filehandle_t mc_fd; - volatile int mc_error; - pgno_t mc_next_pgno; - short mc_toggle; /* Buffer number in provider */ - short mc_new; /* (0-2 buffers to write) | (MDBX_EOF at end) */ - /* Error code. Never cleared if set. Both threads can set nonzero - * to fail the copy. Not mutex-protected, MDBX expects atomic int. */ -} mdbx_copy; - -/* Dedicated writer thread for compacting copy. */ -static THREAD_RESULT __cold THREAD_CALL mdbx_env_copythr(void *arg) { - mdbx_copy *my = arg; - char *ptr; - int toggle = 0; - int rc; - -#if defined(F_SETNOSIGPIPE) - /* OS X delivers SIGPIPE to the whole process, not the thread that caused it. - * Disable SIGPIPE using platform specific fcntl. */ - int enabled = 1; - if (fcntl(my->mc_fd, F_SETNOSIGPIPE, &enabled)) - my->mc_error = errno; -#endif - -#if defined(SIGPIPE) && !defined(_WIN32) && !defined(_WIN64) - sigset_t set; - sigemptyset(&set); - sigaddset(&set, SIGPIPE); - rc = pthread_sigmask(SIG_BLOCK, &set, NULL); - if (rc != 0) - my->mc_error = rc; -#endif - - mdbx_condmutex_lock(&my->mc_condmutex); - while (!my->mc_error) { - while (!my->mc_new) - mdbx_condmutex_wait(&my->mc_condmutex); - if (my->mc_new == 0 + MDBX_EOF) /* 0 buffers, just EOF */ - break; - size_t wsize = my->mc_wlen[toggle]; - ptr = my->mc_wbuf[toggle]; - again: - if (wsize > 0 && !my->mc_error) { - rc = mdbx_write(my->mc_fd, ptr, wsize); - if (rc != MDBX_SUCCESS) { -#if defined(SIGPIPE) && !defined(_WIN32) && !defined(_WIN64) - if (rc == EPIPE) { - /* Collect the pending SIGPIPE, otherwise (at least OS X) - * gives it to the process on thread-exit (ITS#8504). */ - int tmp; - sigwait(&set, &tmp); - } -#endif - my->mc_error = rc; - } - } - - /* If there's an overflow page tail, write it too */ - if (my->mc_olen[toggle]) { - wsize = my->mc_olen[toggle]; - ptr = my->mc_over[toggle]; - my->mc_olen[toggle] = 0; - goto again; - } - my->mc_wlen[toggle] = 0; - toggle ^= 1; - /* Return the empty buffer to provider */ - my->mc_new--; - mdbx_condmutex_signal(&my->mc_condmutex); - } - mdbx_condmutex_unlock(&my->mc_condmutex); - return (THREAD_RESULT)0; -} - -/* Give buffer and/or MDBX_EOF to writer thread, await unused buffer. - * - * [in] my control structure. - * [in] adjust (1 to hand off 1 buffer) | (MDBX_EOF when ending). */ -static int __cold mdbx_env_cthr_toggle(mdbx_copy *my, int adjust) { - mdbx_condmutex_lock(&my->mc_condmutex); - my->mc_new += (short)adjust; - mdbx_condmutex_signal(&my->mc_condmutex); - while (my->mc_new & 2) /* both buffers in use */ - mdbx_condmutex_wait(&my->mc_condmutex); - mdbx_condmutex_unlock(&my->mc_condmutex); - - my->mc_toggle ^= (adjust & 1); - /* Both threads reset mc_wlen, to be safe from threading errors */ - my->mc_wlen[my->mc_toggle] = 0; - return my->mc_error; -} - -/* Depth-first tree traversal for compacting copy. - * [in] my control structure. - * [in,out] pg database root. - * [in] flags includes F_DUPDATA if it is a sorted-duplicate sub-DB. */ -static int __cold mdbx_env_cwalk(mdbx_copy *my, pgno_t *pg, int flags) { - MDBX_cursor mc; - MDBX_node *ni; - MDBX_page *mo, *mp, *leaf; - char *buf, *ptr; - int rc, toggle; - unsigned i; - - /* Empty DB, nothing to do */ - if (*pg == P_INVALID) - return MDBX_SUCCESS; - - memset(&mc, 0, sizeof(mc)); - mc.mc_snum = 1; - mc.mc_txn = my->mc_txn; - - rc = mdbx_page_get(&mc, *pg, &mc.mc_pg[0], NULL); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - rc = mdbx_page_search_root(&mc, NULL, MDBX_PS_FIRST); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - /* Make cursor pages writable */ - buf = ptr = malloc(pgno2bytes(my->mc_env, mc.mc_snum)); - if (buf == NULL) - return MDBX_ENOMEM; - - for (i = 0; i < mc.mc_top; i++) { - mdbx_page_copy((MDBX_page *)ptr, mc.mc_pg[i], my->mc_env->me_psize); - mc.mc_pg[i] = (MDBX_page *)ptr; - ptr += my->mc_env->me_psize; - } - - /* This is writable space for a leaf page. Usually not needed. */ - leaf = (MDBX_page *)ptr; - - toggle = my->mc_toggle; - while (mc.mc_snum > 0) { - unsigned n; - mp = mc.mc_pg[mc.mc_top]; - n = NUMKEYS(mp); - - if (IS_LEAF(mp)) { - if (!IS_LEAF2(mp) && !(flags & F_DUPDATA)) { - for (i = 0; i < n; i++) { - ni = NODEPTR(mp, i); - if (ni->mn_flags & F_BIGDATA) { - MDBX_page *omp; - - /* Need writable leaf */ - if (mp != leaf) { - mc.mc_pg[mc.mc_top] = leaf; - mdbx_page_copy(leaf, mp, my->mc_env->me_psize); - mp = leaf; - ni = NODEPTR(mp, i); - } - - pgno_t pgno; - memcpy(&pgno, NODEDATA(ni), sizeof(pgno)); - memcpy(NODEDATA(ni), &my->mc_next_pgno, sizeof(pgno_t)); - rc = mdbx_page_get(&mc, pgno, &omp, NULL); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - if (my->mc_wlen[toggle] >= MDBX_WBUF) { - rc = mdbx_env_cthr_toggle(my, 1); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - toggle = my->mc_toggle; - } - mo = (MDBX_page *)(my->mc_wbuf[toggle] + my->mc_wlen[toggle]); - memcpy(mo, omp, my->mc_env->me_psize); - mo->mp_pgno = my->mc_next_pgno; - my->mc_next_pgno += omp->mp_pages; - my->mc_wlen[toggle] += my->mc_env->me_psize; - if (omp->mp_pages > 1) { - my->mc_olen[toggle] = pgno2bytes(my->mc_env, omp->mp_pages - 1); - my->mc_over[toggle] = (char *)omp + my->mc_env->me_psize; - rc = mdbx_env_cthr_toggle(my, 1); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - toggle = my->mc_toggle; - } - } else if (ni->mn_flags & F_SUBDATA) { - MDBX_db db; - - /* Need writable leaf */ - if (mp != leaf) { - mc.mc_pg[mc.mc_top] = leaf; - mdbx_page_copy(leaf, mp, my->mc_env->me_psize); - mp = leaf; - ni = NODEPTR(mp, i); - } - - memcpy(&db, NODEDATA(ni), sizeof(db)); - my->mc_toggle = (short)toggle; - rc = mdbx_env_cwalk(my, &db.md_root, ni->mn_flags & F_DUPDATA); - if (rc) - goto done; - toggle = my->mc_toggle; - memcpy(NODEDATA(ni), &db, sizeof(db)); - } - } - } - } else { - mc.mc_ki[mc.mc_top]++; - if (mc.mc_ki[mc.mc_top] < n) { - pgno_t pgno; - again: - ni = NODEPTR(mp, mc.mc_ki[mc.mc_top]); - pgno = NODEPGNO(ni); - rc = mdbx_page_get(&mc, pgno, &mp, NULL); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - mc.mc_top++; - mc.mc_snum++; - mc.mc_ki[mc.mc_top] = 0; - if (IS_BRANCH(mp)) { - /* Whenever we advance to a sibling branch page, - * we must proceed all the way down to its first leaf. */ - mdbx_page_copy(mc.mc_pg[mc.mc_top], mp, my->mc_env->me_psize); - goto again; - } else - mc.mc_pg[mc.mc_top] = mp; - continue; - } - } - if (my->mc_wlen[toggle] >= MDBX_WBUF) { - rc = mdbx_env_cthr_toggle(my, 1); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - toggle = my->mc_toggle; - } - mo = (MDBX_page *)(my->mc_wbuf[toggle] + my->mc_wlen[toggle]); - mdbx_page_copy(mo, mp, my->mc_env->me_psize); - mo->mp_pgno = my->mc_next_pgno++; - my->mc_wlen[toggle] += my->mc_env->me_psize; - if (mc.mc_top) { - /* Update parent if there is one */ - ni = NODEPTR(mc.mc_pg[mc.mc_top - 1], mc.mc_ki[mc.mc_top - 1]); - SETPGNO(ni, mo->mp_pgno); - mdbx_cursor_pop(&mc); - } else { - /* Otherwise we're done */ - *pg = mo->mp_pgno; - break; - } - } -done: - free(buf); - return rc; -} - -/* Copy environment with compaction. */ -static int __cold mdbx_env_compact(MDBX_env *env, mdbx_filehandle_t fd) { - MDBX_txn *txn = NULL; - mdbx_thread_t thr; - mdbx_copy my; - memset(&my, 0, sizeof(my)); - - int rc = mdbx_condmutex_init(&my.mc_condmutex); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - rc = mdbx_memalign_alloc(env->me_os_psize, MDBX_WBUF * 2, - (void **)&my.mc_wbuf[0]); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - - memset(my.mc_wbuf[0], 0, MDBX_WBUF * 2); - my.mc_wbuf[1] = my.mc_wbuf[0] + MDBX_WBUF; - my.mc_next_pgno = NUM_METAS; - my.mc_env = env; - my.mc_fd = fd; - rc = mdbx_thread_create(&thr, mdbx_env_copythr, &my); - if (unlikely(rc != MDBX_SUCCESS)) - goto done; - - rc = mdbx_txn_begin(env, NULL, MDBX_RDONLY, &txn); - if (unlikely(rc != MDBX_SUCCESS)) - goto finish; - - MDBX_page *meta = mdbx_init_metas(env, my.mc_wbuf[0]); - - /* Set metapage 1 with current main DB */ - pgno_t new_root, root = txn->mt_dbs[MAIN_DBI].md_root; - if ((new_root = root) != P_INVALID) { - /* Count free pages + freeDB pages. Subtract from last_pg - * to find the new last_pg, which also becomes the new root. */ - pgno_t freecount = 0; - MDBX_cursor mc; - MDBX_val key, data; - - mdbx_cursor_init(&mc, txn, FREE_DBI, NULL); - while ((rc = mdbx_cursor_get(&mc, &key, &data, MDBX_NEXT)) == 0) - freecount += *(pgno_t *)data.iov_base; - if (unlikely(rc != MDBX_NOTFOUND)) - goto finish; - - freecount += txn->mt_dbs[FREE_DBI].md_branch_pages + - txn->mt_dbs[FREE_DBI].md_leaf_pages + - txn->mt_dbs[FREE_DBI].md_overflow_pages; - - new_root = txn->mt_next_pgno - 1 - freecount; - meta->mp_meta.mm_geo.next = meta->mp_meta.mm_geo.now = new_root + 1; - meta->mp_meta.mm_dbs[MAIN_DBI] = txn->mt_dbs[MAIN_DBI]; - meta->mp_meta.mm_dbs[MAIN_DBI].md_root = new_root; - } else { - /* When the DB is empty, handle it specially to - * fix any breakage like page leaks from ITS#8174. */ - meta->mp_meta.mm_dbs[MAIN_DBI].md_flags = txn->mt_dbs[MAIN_DBI].md_flags; - } - - /* copy canary sequenses if present */ - if (txn->mt_canary.v) { - meta->mp_meta.mm_canary = txn->mt_canary; - meta->mp_meta.mm_canary.v = mdbx_meta_txnid_stable(env, &meta->mp_meta); - } - - /* update signature */ - meta->mp_meta.mm_datasync_sign = mdbx_meta_sign(&meta->mp_meta); - - my.mc_wlen[0] = pgno2bytes(env, NUM_METAS); - my.mc_txn = txn; - rc = mdbx_env_cwalk(&my, &root, 0); - if (rc == MDBX_SUCCESS && root != new_root) { - mdbx_error("unexpected root %" PRIaPGNO " (%" PRIaPGNO ")", root, new_root); - rc = MDBX_PROBLEM; /* page leak or corrupt DB */ - } - -finish: - if (rc != MDBX_SUCCESS) - my.mc_error = rc; - mdbx_env_cthr_toggle(&my, 1 | MDBX_EOF); - rc = mdbx_thread_join(thr); - mdbx_txn_abort(txn); - -done: - mdbx_memalign_free(my.mc_wbuf[0]); - mdbx_condmutex_destroy(&my.mc_condmutex); - return rc ? rc : my.mc_error; -} - -/* Copy environment as-is. */ -static int __cold mdbx_env_copy_asis(MDBX_env *env, mdbx_filehandle_t fd) { - MDBX_txn *txn = NULL; - - /* Do the lock/unlock of the reader mutex before starting the - * write txn. Otherwise other read txns could block writers. */ - int rc = mdbx_txn_begin(env, NULL, MDBX_RDONLY, &txn); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - /* We must start the actual read txn after blocking writers */ - rc = mdbx_txn_end(txn, MDBX_END_RESET_TMP); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; /* FIXME: or just return? */ - - /* Temporarily block writers until we snapshot the meta pages */ - rc = mdbx_txn_lock(env, false); - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - - rc = mdbx_txn_renew0(txn, MDBX_RDONLY); - if (unlikely(rc != MDBX_SUCCESS)) { - mdbx_txn_unlock(env); - goto bailout; - } - - rc = mdbx_write(fd, env->me_map, pgno2bytes(env, NUM_METAS)); - MDBX_meta *const head = mdbx_meta_head(env); - const uint64_t size = - mdbx_roundup2(pgno2bytes(env, head->mm_geo.now), env->me_os_psize); - mdbx_txn_unlock(env); - - if (likely(rc == MDBX_SUCCESS)) - rc = mdbx_write(fd, env->me_map + pgno2bytes(env, NUM_METAS), - pgno2bytes(env, txn->mt_next_pgno - NUM_METAS)); - - if (likely(rc == MDBX_SUCCESS)) - rc = mdbx_ftruncate(fd, size); - -bailout: - mdbx_txn_abort(txn); - return rc; -} - -int __cold mdbx_env_copy2fd(MDBX_env *env, mdbx_filehandle_t fd, - unsigned flags) { - if (flags & MDBX_CP_COMPACT) - return mdbx_env_compact(env, fd); - - return mdbx_env_copy_asis(env, fd); -} - -int __cold mdbx_env_copy(MDBX_env *env, const char *path, unsigned flags) { - char *lck_pathname; - mdbx_filehandle_t newfd = INVALID_HANDLE_VALUE; - - if (env->me_flags & MDBX_NOSUBDIR) { - lck_pathname = (char *)path; - } else { - size_t len = strlen(path); - len += sizeof(MDBX_DATANAME); - lck_pathname = malloc(len); - if (!lck_pathname) - return MDBX_ENOMEM; - sprintf(lck_pathname, "%s" MDBX_DATANAME, path); - } - - /* The destination path must exist, but the destination file must not. - * We don't want the OS to cache the writes, since the source data is - * already in the OS cache. */ - int rc = - mdbx_openfile(lck_pathname, O_WRONLY | O_CREAT | O_EXCL, 0666, &newfd); - if (rc == MDBX_SUCCESS) { - if (env->me_psize >= env->me_os_psize) { -#ifdef F_NOCACHE /* __APPLE__ */ - (void)fcntl(newfd, F_NOCACHE, 1); -#elif defined(O_DIRECT) && defined(F_GETFL) - /* Set O_DIRECT if the file system supports it */ - if ((rc = fcntl(newfd, F_GETFL)) != -1) - (void)fcntl(newfd, F_SETFL, rc | O_DIRECT); -#endif - } - rc = mdbx_env_copy2fd(env, newfd, flags); - } - - if (!(env->me_flags & MDBX_NOSUBDIR)) - free(lck_pathname); - - if (newfd != INVALID_HANDLE_VALUE) { - int err = mdbx_closefile(newfd); - if (rc == MDBX_SUCCESS && err != rc) - rc = err; - } - - return rc; -} - -int __cold mdbx_env_set_flags(MDBX_env *env, unsigned flags, int onoff) { - if (unlikely(flags & ~CHANGEABLE)) - return MDBX_EINVAL; - - int rc = mdbx_txn_lock(env, false); - if (unlikely(rc)) - return rc; - - if (onoff) - env->me_flags |= flags; - else - env->me_flags &= ~flags; - - mdbx_txn_unlock(env); - return MDBX_SUCCESS; -} - -int __cold mdbx_env_get_flags(MDBX_env *env, unsigned *arg) { - if (unlikely(!env || !arg)) - return MDBX_EINVAL; - - *arg = env->me_flags & (CHANGEABLE | CHANGELESS); - return MDBX_SUCCESS; -} - -int __cold mdbx_env_set_userctx(MDBX_env *env, void *ctx) { - if (unlikely(!env)) - return MDBX_EINVAL; - env->me_userctx = ctx; - return MDBX_SUCCESS; -} - -void *__cold mdbx_env_get_userctx(MDBX_env *env) { - return env ? env->me_userctx : NULL; -} - -int __cold mdbx_env_set_assert(MDBX_env *env, MDBX_assert_func *func) { - if (unlikely(!env)) - return MDBX_EINVAL; -#if MDBX_DEBUG - env->me_assert_func = func; - return MDBX_SUCCESS; -#else - (void)func; - return MDBX_ENOSYS; -#endif -} - -int __cold mdbx_env_get_path(MDBX_env *env, const char **arg) { - if (unlikely(!env || !arg)) - return MDBX_EINVAL; - - *arg = env->me_path; - return MDBX_SUCCESS; -} - -int __cold mdbx_env_get_fd(MDBX_env *env, mdbx_filehandle_t *arg) { - if (unlikely(!env || !arg)) - return MDBX_EINVAL; - - *arg = env->me_fd; - return MDBX_SUCCESS; -} - -/* Common code for mdbx_dbi_stat() and mdbx_env_stat(). - * [in] env the environment to operate in. - * [in] db the MDBX_db record containing the stats to return. - * [out] arg the address of an MDBX_stat structure to receive the stats. - * Returns 0, this function always succeeds. */ -static int __cold mdbx_stat0(MDBX_env *env, MDBX_db *db, MDBX_stat *arg) { - arg->ms_psize = env->me_psize; - arg->ms_depth = db->md_depth; - arg->ms_branch_pages = db->md_branch_pages; - arg->ms_leaf_pages = db->md_leaf_pages; - arg->ms_overflow_pages = db->md_overflow_pages; - arg->ms_entries = db->md_entries; - return MDBX_SUCCESS; -} - -int __cold mdbx_env_stat(MDBX_env *env, MDBX_stat *arg, size_t bytes) { - MDBX_meta *meta; - - if (unlikely(env == NULL || arg == NULL)) - return MDBX_EINVAL; - if (unlikely(bytes != sizeof(MDBX_stat))) - return MDBX_EINVAL; - - meta = mdbx_meta_head(env); - return mdbx_stat0(env, &meta->mm_dbs[MAIN_DBI], arg); -} - -int __cold mdbx_env_info(MDBX_env *env, MDBX_envinfo *arg, size_t bytes) { - - if (unlikely(env == NULL || arg == NULL)) - return MDBX_EINVAL; - - if (bytes != sizeof(MDBX_envinfo)) - return MDBX_EINVAL; - - const MDBX_meta *const meta0 = METAPAGE(env, 0); - const MDBX_meta *const meta1 = METAPAGE(env, 1); - const MDBX_meta *const meta2 = METAPAGE(env, 2); - const MDBX_meta *meta; - do { - meta = mdbx_meta_head(env); - arg->mi_recent_txnid = mdbx_meta_txnid_fluid(env, meta); - arg->mi_meta0_txnid = mdbx_meta_txnid_fluid(env, meta0); - arg->mi_meta0_sign = meta0->mm_datasync_sign; - arg->mi_meta1_txnid = mdbx_meta_txnid_fluid(env, meta1); - arg->mi_meta1_sign = meta1->mm_datasync_sign; - arg->mi_meta2_txnid = mdbx_meta_txnid_fluid(env, meta2); - arg->mi_meta2_sign = meta2->mm_datasync_sign; - arg->mi_last_pgno = meta->mm_geo.next - 1; - arg->mi_geo.lower = pgno2bytes(env, meta->mm_geo.lower); - arg->mi_geo.upper = pgno2bytes(env, meta->mm_geo.upper); - arg->mi_geo.current = pgno2bytes(env, meta->mm_geo.now); - arg->mi_geo.shrink = pgno2bytes(env, meta->mm_geo.shrink); - arg->mi_geo.grow = pgno2bytes(env, meta->mm_geo.grow); - arg->mi_mapsize = env->me_mapsize; - mdbx_compiler_barrier(); - } while (unlikely(arg->mi_meta0_txnid != mdbx_meta_txnid_fluid(env, meta0) || - arg->mi_meta0_sign != meta0->mm_datasync_sign || - arg->mi_meta1_txnid != mdbx_meta_txnid_fluid(env, meta1) || - arg->mi_meta1_sign != meta1->mm_datasync_sign || - arg->mi_meta2_txnid != mdbx_meta_txnid_fluid(env, meta2) || - arg->mi_meta2_sign != meta2->mm_datasync_sign || - meta != mdbx_meta_head(env) || - arg->mi_recent_txnid != mdbx_meta_txnid_fluid(env, meta))); - - arg->mi_maxreaders = env->me_maxreaders; - arg->mi_numreaders = env->me_lck ? env->me_lck->mti_numreaders : INT32_MAX; - arg->mi_dxb_pagesize = env->me_psize; - arg->mi_sys_pagesize = env->me_os_psize; - - arg->mi_latter_reader_txnid = 0; - if (env->me_lck) { - MDBX_reader *r = env->me_lck->mti_readers; - arg->mi_latter_reader_txnid = arg->mi_recent_txnid; - for (unsigned i = 0; i < arg->mi_numreaders; ++i) { - if (r[i].mr_pid) { - const txnid_t txnid = r[i].mr_txnid; - if (arg->mi_latter_reader_txnid > txnid) - arg->mi_latter_reader_txnid = txnid; - } - } - } - - return MDBX_SUCCESS; -} - -static MDBX_cmp_func *mdbx_default_keycmp(unsigned flags) { - return (flags & MDBX_REVERSEKEY) ? mdbx_cmp_memnr : (flags & MDBX_INTEGERKEY) - ? mdbx_cmp_int_a2 - : mdbx_cmp_memn; -} - -static MDBX_cmp_func *mdbx_default_datacmp(unsigned flags) { - return !(flags & MDBX_DUPSORT) - ? 0 - : ((flags & MDBX_INTEGERDUP) - ? mdbx_cmp_int_ua - : ((flags & MDBX_REVERSEDUP) ? mdbx_cmp_memnr - : mdbx_cmp_memn)); -} - -static int mdbx_dbi_bind(MDBX_txn *txn, const MDBX_dbi dbi, unsigned user_flags, - MDBX_cmp_func *keycmp, MDBX_cmp_func *datacmp) { - /* LY: so, accepting only three cases for the table's flags: - * 1) user_flags and both comparators are zero - * = assume that a by-default mode/flags is requested for reading; - * 2) user_flags exactly the same - * = assume that the target mode/flags are requested properly; - * 3) user_flags differs, but table is empty and MDBX_CREATE is provided - * = assume that a properly create request with custom flags; - */ - if ((user_flags ^ txn->mt_dbs[dbi].md_flags) & PERSISTENT_FLAGS) { - /* flags ara differs, check other conditions */ - if (!user_flags && (!keycmp || keycmp == txn->mt_dbxs[dbi].md_cmp) && - (!datacmp || datacmp == txn->mt_dbxs[dbi].md_dcmp)) { - /* no comparators were provided and flags are zero, - * seems that is case #1 above */ - user_flags = txn->mt_dbs[dbi].md_flags; - } else if ((user_flags & MDBX_CREATE) && txn->mt_dbs[dbi].md_entries == 0) { - if (txn->mt_flags & MDBX_TXN_RDONLY) - return /* FIXME: return extended info */ MDBX_EACCESS; - /* make sure flags changes get committed */ - txn->mt_dbs[dbi].md_flags = user_flags & PERSISTENT_FLAGS; - txn->mt_flags |= MDBX_TXN_DIRTY; - } else { - return /* FIXME: return extended info */ MDBX_INCOMPATIBLE; - } - } - - if (!txn->mt_dbxs[dbi].md_cmp || MDBX_DEBUG) { - if (!keycmp) - keycmp = mdbx_default_keycmp(user_flags); - assert(!txn->mt_dbxs[dbi].md_cmp || txn->mt_dbxs[dbi].md_cmp == keycmp); - txn->mt_dbxs[dbi].md_cmp = keycmp; - } - - if (!txn->mt_dbxs[dbi].md_dcmp || MDBX_DEBUG) { - if (!datacmp) - datacmp = mdbx_default_datacmp(user_flags); - assert(!txn->mt_dbxs[dbi].md_dcmp || txn->mt_dbxs[dbi].md_dcmp == datacmp); - txn->mt_dbxs[dbi].md_dcmp = datacmp; - } - - return MDBX_SUCCESS; -} - -int mdbx_dbi_open_ex(MDBX_txn *txn, const char *table_name, unsigned user_flags, - MDBX_dbi *dbi, MDBX_cmp_func *keycmp, - MDBX_cmp_func *datacmp) { - if (unlikely(!txn || !dbi || (user_flags & ~VALID_FLAGS) != 0)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - /* main table? */ - if (!table_name) { - *dbi = MAIN_DBI; - return mdbx_dbi_bind(txn, MAIN_DBI, user_flags, keycmp, datacmp); - } - - if (txn->mt_dbxs[MAIN_DBI].md_cmp == NULL) { - txn->mt_dbxs[MAIN_DBI].md_cmp = - mdbx_default_keycmp(txn->mt_dbs[MAIN_DBI].md_flags); - txn->mt_dbxs[MAIN_DBI].md_dcmp = - mdbx_default_datacmp(txn->mt_dbs[MAIN_DBI].md_flags); - } - - /* Is the DB already open? */ - size_t len = strlen(table_name); - MDBX_dbi scan, slot = txn->mt_numdbs; - for (scan = txn->mt_numdbs; --scan >= CORE_DBS;) { - if (!txn->mt_dbxs[scan].md_name.iov_len) { - /* Remember this free slot */ - slot = scan; - continue; - } - if (len == txn->mt_dbxs[scan].md_name.iov_len && - !strncmp(table_name, txn->mt_dbxs[scan].md_name.iov_base, len)) { - *dbi = scan; - return mdbx_dbi_bind(txn, scan, user_flags, keycmp, datacmp); - } - } - - /* Fail, if no free slot and max hit */ - MDBX_env *env = txn->mt_env; - if (unlikely(slot >= env->me_maxdbs)) - return MDBX_DBS_FULL; - - /* Cannot mix named table with some main-table flags */ - if (unlikely(txn->mt_dbs[MAIN_DBI].md_flags & - (MDBX_DUPSORT | MDBX_INTEGERKEY))) - return (user_flags & MDBX_CREATE) ? MDBX_INCOMPATIBLE : MDBX_NOTFOUND; - - /* Find the DB info */ - int exact = 0; - MDBX_val key, data; - key.iov_len = len; - key.iov_base = (void *)table_name; - MDBX_cursor mc; - mdbx_cursor_init(&mc, txn, MAIN_DBI, NULL); - int rc = mdbx_cursor_set(&mc, &key, &data, MDBX_SET, &exact); - if (unlikely(rc != MDBX_SUCCESS)) { - if (rc != MDBX_NOTFOUND || !(user_flags & MDBX_CREATE)) - return rc; - } else { - /* make sure this is actually a table */ - MDBX_node *node = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]); - if (unlikely((node->mn_flags & (F_DUPDATA | F_SUBDATA)) != F_SUBDATA)) - return MDBX_INCOMPATIBLE; - } - - if (rc != MDBX_SUCCESS && unlikely(txn->mt_flags & MDBX_TXN_RDONLY)) - return MDBX_EACCESS; - - /* Done here so we cannot fail after creating a new DB */ - char *namedup = mdbx_strdup(table_name); - if (unlikely(!namedup)) - return MDBX_ENOMEM; - - int err = mdbx_fastmutex_acquire(&env->me_dbi_lock); - if (unlikely(err != MDBX_SUCCESS)) { - free(namedup); - return err; - } - - unsigned dbflag = DB_NEW | DB_VALID | DB_USRVALID; - if (unlikely(rc)) { - /* MDBX_NOTFOUND and MDBX_CREATE: Create new DB */ - assert(rc == MDBX_NOTFOUND); - MDBX_db db_dummy; - memset(&db_dummy, 0, sizeof(db_dummy)); - db_dummy.md_root = P_INVALID; - db_dummy.md_flags = user_flags & PERSISTENT_FLAGS; - data.iov_len = sizeof(db_dummy); - data.iov_base = &db_dummy; - WITH_CURSOR_TRACKING( - mc, - rc = mdbx_cursor_put(&mc, &key, &data, F_SUBDATA | MDBX_NOOVERWRITE)); - - if (unlikely(rc != MDBX_SUCCESS)) - goto bailout; - - dbflag |= DB_DIRTY; - } - - /* Got info, register DBI in this txn */ - txn->mt_dbxs[slot].md_name.iov_base = namedup; - txn->mt_dbxs[slot].md_name.iov_len = len; - txn->mt_dbxs[slot].md_cmp = nullptr; - txn->mt_dbxs[slot].md_dcmp = nullptr; - txn->mt_dbflags[slot] = (uint8_t)dbflag; - txn->mt_dbiseqs[slot] = (env->me_dbiseqs[slot] += 1); - - txn->mt_dbs[slot] = *(MDBX_db *)data.iov_base; - rc = mdbx_dbi_bind(txn, slot, user_flags, keycmp, datacmp); - if (unlikely(rc != MDBX_SUCCESS)) { - assert((dbflag & DB_DIRTY) == 0); - /* cleanup slot */ - txn->mt_dbxs[slot].md_name.iov_base = NULL; - txn->mt_dbxs[slot].md_name.iov_len = 0; - txn->mt_dbflags[slot] = 0; - bailout: - free(namedup); - } else { - *dbi = slot; - if (slot == txn->mt_numdbs) - txn->mt_numdbs++; - } - - mdbx_ensure(env, mdbx_fastmutex_release(&env->me_dbi_lock) == MDBX_SUCCESS); - return rc; -} - -int mdbx_dbi_open(MDBX_txn *txn, const char *table_name, unsigned table_flags, - MDBX_dbi *dbi) { - return mdbx_dbi_open_ex(txn, table_name, table_flags, dbi, nullptr, nullptr); -} - -int __cold mdbx_dbi_stat(MDBX_txn *txn, MDBX_dbi dbi, MDBX_stat *arg, - size_t bytes) { - if (unlikely(!arg || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_VALID))) - return MDBX_EINVAL; - - if (unlikely(bytes != sizeof(MDBX_stat))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - if (unlikely(txn->mt_dbflags[dbi] & DB_STALE)) { - MDBX_cursor mc; - MDBX_xcursor mx; - /* Stale, must read the DB's root. cursor_init does it for us. */ - mdbx_cursor_init(&mc, txn, dbi, &mx); - } - return mdbx_stat0(txn->mt_env, &txn->mt_dbs[dbi], arg); -} - -static int mdbx_dbi_close_locked(MDBX_env *env, MDBX_dbi dbi) { - if (unlikely(dbi < CORE_DBS || dbi >= env->me_maxdbs)) - return MDBX_EINVAL; - - char *ptr = env->me_dbxs[dbi].md_name.iov_base; - /* If there was no name, this was already closed */ - if (unlikely(!ptr)) - return MDBX_BAD_DBI; - - env->me_dbxs[dbi].md_name.iov_base = NULL; - env->me_dbxs[dbi].md_name.iov_len = 0; - env->me_dbflags[dbi] = 0; - env->me_dbiseqs[dbi]++; - free(ptr); - return MDBX_SUCCESS; -} - -int mdbx_dbi_close(MDBX_env *env, MDBX_dbi dbi) { - if (unlikely(dbi < CORE_DBS || dbi >= env->me_maxdbs)) - return MDBX_EINVAL; - - int rc = mdbx_fastmutex_acquire(&env->me_dbi_lock); - if (likely(rc == MDBX_SUCCESS)) { - rc = mdbx_dbi_close_locked(env, dbi); - mdbx_ensure(env, mdbx_fastmutex_release(&env->me_dbi_lock) == MDBX_SUCCESS); - } - return rc; -} - -int mdbx_dbi_flags_ex(MDBX_txn *txn, MDBX_dbi dbi, unsigned *flags, - unsigned *state) { - if (unlikely(!txn || !flags || !state)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_VALID))) - return MDBX_EINVAL; - - *flags = txn->mt_dbs[dbi].md_flags & PERSISTENT_FLAGS; - *state = txn->mt_dbflags[dbi] & (DB_NEW | DB_DIRTY | DB_STALE); - - return MDBX_SUCCESS; -} - -int mdbx_dbi_flags(MDBX_txn *txn, MDBX_dbi dbi, unsigned *flags) { - unsigned state; - return mdbx_dbi_flags_ex(txn, dbi, flags, &state); -} - -/* Add all the DB's pages to the free list. - * [in] mc Cursor on the DB to free. - * [in] subs non-Zero to check for sub-DBs in this DB. - * Returns 0 on success, non-zero on failure. */ -static int mdbx_drop0(MDBX_cursor *mc, int subs) { - int rc; - - rc = mdbx_page_search(mc, NULL, MDBX_PS_FIRST); - if (likely(rc == MDBX_SUCCESS)) { - MDBX_txn *txn = mc->mc_txn; - MDBX_node *ni; - MDBX_cursor mx; - unsigned i; - - /* DUPSORT sub-DBs have no ovpages/DBs. Omit scanning leaves. - * This also avoids any P_LEAF2 pages, which have no nodes. - * Also if the DB doesn't have sub-DBs and has no overflow - * pages, omit scanning leaves. */ - if ((mc->mc_flags & C_SUB) || (!subs && !mc->mc_db->md_overflow_pages)) - mdbx_cursor_pop(mc); - - mdbx_cursor_copy(mc, &mx); - while (mc->mc_snum > 0) { - MDBX_page *mp = mc->mc_pg[mc->mc_top]; - unsigned n = NUMKEYS(mp); - if (IS_LEAF(mp)) { - for (i = 0; i < n; i++) { - ni = NODEPTR(mp, i); - if (ni->mn_flags & F_BIGDATA) { - MDBX_page *omp; - pgno_t pg; - memcpy(&pg, NODEDATA(ni), sizeof(pg)); - rc = mdbx_page_get(mc, pg, &omp, NULL); - if (unlikely(rc)) - goto done; - mdbx_cassert(mc, IS_OVERFLOW(omp)); - rc = - mdbx_pnl_append_range(&txn->mt_befree_pages, pg, omp->mp_pages); - if (unlikely(rc)) - goto done; - mc->mc_db->md_overflow_pages -= omp->mp_pages; - if (!mc->mc_db->md_overflow_pages && !subs) - break; - } else if (subs && (ni->mn_flags & F_SUBDATA)) { - mdbx_xcursor_init1(mc, ni); - rc = mdbx_drop0(&mc->mc_xcursor->mx_cursor, 0); - if (unlikely(rc)) - goto done; - } - } - if (!subs && !mc->mc_db->md_overflow_pages) - goto pop; - } else { - if (unlikely((rc = mdbx_pnl_need(&txn->mt_befree_pages, n)) != 0)) - goto done; - for (i = 0; i < n; i++) { - pgno_t pg; - ni = NODEPTR(mp, i); - pg = NODEPGNO(ni); - /* free it */ - mdbx_pnl_xappend(txn->mt_befree_pages, pg); - } - } - if (!mc->mc_top) - break; - mdbx_cassert(mc, i <= UINT16_MAX); - mc->mc_ki[mc->mc_top] = (indx_t)i; - rc = mdbx_cursor_sibling(mc, 1); - if (rc) { - if (unlikely(rc != MDBX_NOTFOUND)) - goto done; - /* no more siblings, go back to beginning - * of previous level. */ - pop: - mdbx_cursor_pop(mc); - mc->mc_ki[0] = 0; - for (i = 1; i < mc->mc_snum; i++) { - mc->mc_ki[i] = 0; - mc->mc_pg[i] = mx.mc_pg[i]; - } - } - } - /* free it */ - rc = mdbx_pnl_append(&txn->mt_befree_pages, mc->mc_db->md_root); - done: - if (unlikely(rc)) - txn->mt_flags |= MDBX_TXN_ERROR; - } else if (rc == MDBX_NOTFOUND) { - rc = MDBX_SUCCESS; - } - mc->mc_flags &= ~C_INITIALIZED; - return rc; -} - -int mdbx_drop(MDBX_txn *txn, MDBX_dbi dbi, int del) { - if (unlikely(1 < (unsigned)del || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(TXN_DBI_CHANGED(txn, dbi))) - return MDBX_BAD_DBI; - - if (unlikely(F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY))) - return MDBX_EACCESS; - - MDBX_cursor *mc; - int rc = mdbx_cursor_open(txn, dbi, &mc); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - MDBX_env *env = txn->mt_env; - rc = mdbx_fastmutex_acquire(&env->me_dbi_lock); - if (unlikely(rc != MDBX_SUCCESS)) { - mdbx_cursor_close(mc); - return rc; - } - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) { - rc = MDBX_EINVAL; - goto bailout; - } - - if (unlikely(TXN_DBI_CHANGED(txn, dbi))) { - rc = MDBX_BAD_DBI; - goto bailout; - } - - rc = mdbx_drop0(mc, mc->mc_db->md_flags & MDBX_DUPSORT); - /* Invalidate the dropped DB's cursors */ - for (MDBX_cursor *m2 = txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) - m2->mc_flags &= ~(C_INITIALIZED | C_EOF); - if (unlikely(rc)) - goto bailout; - - /* Can't delete the main DB */ - if (del && dbi >= CORE_DBS) { - rc = mdbx_del0(txn, MAIN_DBI, &mc->mc_dbx->md_name, NULL, F_SUBDATA); - if (likely(!rc)) { - txn->mt_dbflags[dbi] = DB_STALE; - mdbx_dbi_close_locked(env, dbi); - } else { - txn->mt_flags |= MDBX_TXN_ERROR; - } - } else { - /* reset the DB record, mark it dirty */ - txn->mt_dbflags[dbi] |= DB_DIRTY; - txn->mt_dbs[dbi].md_depth = 0; - txn->mt_dbs[dbi].md_branch_pages = 0; - txn->mt_dbs[dbi].md_leaf_pages = 0; - txn->mt_dbs[dbi].md_overflow_pages = 0; - txn->mt_dbs[dbi].md_entries = 0; - txn->mt_dbs[dbi].md_root = P_INVALID; - txn->mt_dbs[dbi].md_seq = 0; - - txn->mt_flags |= MDBX_TXN_DIRTY; - } - -bailout: - mdbx_cursor_close(mc); - mdbx_ensure(env, mdbx_fastmutex_release(&env->me_dbi_lock) == MDBX_SUCCESS); - return rc; -} - -int mdbx_set_compare(MDBX_txn *txn, MDBX_dbi dbi, MDBX_cmp_func *cmp) { - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - txn->mt_dbxs[dbi].md_cmp = cmp; - return MDBX_SUCCESS; -} - -int mdbx_set_dupsort(MDBX_txn *txn, MDBX_dbi dbi, MDBX_cmp_func *cmp) { - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - txn->mt_dbxs[dbi].md_dcmp = cmp; - return MDBX_SUCCESS; -} - -int __cold mdbx_reader_list(MDBX_env *env, MDBX_msg_func *func, void *ctx) { - char buf[64]; - int rc = 0, first = 1; - - if (unlikely(!env || !func)) - return -MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - const MDBX_lockinfo *const lck = env->me_lck; - const unsigned snap_nreaders = lck->mti_numreaders; - for (unsigned i = 0; i < snap_nreaders; i++) { - if (lck->mti_readers[i].mr_pid) { - const txnid_t txnid = lck->mti_readers[i].mr_txnid; - if (txnid == ~(txnid_t)0) - snprintf(buf, sizeof(buf), "%10" PRIuPTR " %" PRIxPTR " -\n", - (uintptr_t)lck->mti_readers[i].mr_pid, - (uintptr_t)lck->mti_readers[i].mr_tid); - else - snprintf(buf, sizeof(buf), "%10" PRIuPTR " %" PRIxPTR " %" PRIaTXN "\n", - (uintptr_t)lck->mti_readers[i].mr_pid, - (uintptr_t)lck->mti_readers[i].mr_tid, txnid); - - if (first) { - first = 0; - rc = func(" pid thread txnid\n", ctx); - if (rc < 0) - break; - } - rc = func(buf, ctx); - if (rc < 0) - break; - } - } - if (first) - rc = func("(no active readers)\n", ctx); - - return rc; -} - -/* Insert pid into list if not already present. - * return -1 if already present. */ -static int __cold mdbx_pid_insert(mdbx_pid_t *ids, mdbx_pid_t pid) { - /* binary search of pid in list */ - unsigned base = 0; - unsigned cursor = 1; - int val = 0; - unsigned n = ids[0]; - - while (n > 0) { - unsigned pivot = n >> 1; - cursor = base + pivot + 1; - val = pid - ids[cursor]; - - if (val < 0) { - n = pivot; - } else if (val > 0) { - base = cursor; - n -= pivot + 1; - } else { - /* found, so it's a duplicate */ - return -1; - } - } - - if (val > 0) - ++cursor; - - ids[0]++; - for (n = ids[0]; n > cursor; n--) - ids[n] = ids[n - 1]; - ids[n] = pid; - return 0; -} - -int __cold mdbx_reader_check(MDBX_env *env, int *dead) { - if (unlikely(!env || env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EINVAL; - if (dead) - *dead = 0; - return mdbx_reader_check0(env, false, dead); -} - -/* Return: - * MDBX_RESULT_TRUE - done and mutex recovered - * MDBX_SUCCESS - done - * Otherwise errcode. */ -int __cold mdbx_reader_check0(MDBX_env *env, int rdt_locked, int *dead) { - assert(rdt_locked >= 0); - - if (unlikely(env->me_pid != mdbx_getpid())) { - env->me_flags |= MDBX_FATAL_ERROR; - return MDBX_PANIC; - } - - MDBX_lockinfo *const lck = env->me_lck; - const unsigned snap_nreaders = lck->mti_numreaders; - mdbx_pid_t *pids = alloca((snap_nreaders + 1) * sizeof(mdbx_pid_t)); - pids[0] = 0; - - int rc = MDBX_SUCCESS, count = 0; - for (unsigned i = 0; i < snap_nreaders; i++) { - const mdbx_pid_t pid = lck->mti_readers[i].mr_pid; - if (pid == 0) - continue /* skip empty */; - if (pid == env->me_pid) - continue /* skip self */; - if (mdbx_pid_insert(pids, pid) != 0) - continue /* such pid already processed */; - - int err = mdbx_rpid_check(env, pid); - if (err == MDBX_RESULT_TRUE) - continue /* reader is live */; - - if (err != MDBX_SUCCESS) { - rc = err; - break /* mdbx_rpid_check() failed */; - } - - /* stale reader found */ - if (!rdt_locked) { - err = mdbx_rdt_lock(env); - if (MDBX_IS_ERROR(err)) { - rc = err; - break; - } - - rdt_locked = -1; - if (err == MDBX_RESULT_TRUE) { - /* mutex recovered, the mdbx_mutex_failed() checked all readers */ - rc = MDBX_RESULT_TRUE; - break; - } - - /* a other process may have clean and reused slot, recheck */ - if (lck->mti_readers[i].mr_pid != pid) - continue; - - err = mdbx_rpid_check(env, pid); - if (MDBX_IS_ERROR(err)) { - rc = err; - break; - } - - if (err != MDBX_SUCCESS) - continue /* the race with other process, slot reused */; - } - - /* clean it */ - for (unsigned j = i; j < snap_nreaders; j++) { - if (lck->mti_readers[j].mr_pid == pid) { - mdbx_debug("clear stale reader pid %" PRIuPTR " txn %" PRIaTXN "", - (size_t)pid, lck->mti_readers[j].mr_txnid); - lck->mti_readers[j].mr_pid = 0; - lck->mti_readers_refresh_flag = true; - count++; - } - } - } - - if (rdt_locked < 0) - mdbx_rdt_unlock(env); - - if (dead) - *dead = count; - return rc; -} - -int __cold mdbx_setup_debug(int flags, MDBX_debug_func *logger) { - unsigned ret = mdbx_runtime_flags; - mdbx_runtime_flags = flags; - -#ifdef __linux__ - if (flags & MDBX_DBG_DUMP) { - int core_filter_fd = open("/proc/self/coredump_filter", O_TRUNC | O_RDWR); - if (core_filter_fd >= 0) { - char buf[32]; - const unsigned r = pread(core_filter_fd, buf, sizeof(buf), 0); - if (r > 0 && r < sizeof(buf)) { - buf[r] = 0; - unsigned long mask = strtoul(buf, NULL, 16); - if (mask != ULONG_MAX) { - mask |= 1 << 3 /* Dump file-backed shared mappings */; - mask |= 1 << 6 /* Dump shared huge pages */; - mask |= 1 << 8 /* Dump shared DAX pages */; - unsigned w = snprintf(buf, sizeof(buf), "0x%lx\n", mask); - if (w > 0 && w < sizeof(buf)) { - w = pwrite(core_filter_fd, buf, w, 0); - (void)w; - } - } - } - close(core_filter_fd); - } - } -#endif /* __linux__ */ - - mdbx_debug_logger = logger; - return ret; -} - -static txnid_t __cold mdbx_oomkick(MDBX_env *env, const txnid_t laggard) { - mdbx_debug("DB size maxed out"); - - int retry; - for (retry = 0; retry < INT_MAX; ++retry) { - txnid_t oldest = mdbx_reclaiming_detent(env); - mdbx_assert(env, oldest < env->me_txn0->mt_txnid); - mdbx_assert(env, oldest >= laggard); - mdbx_assert(env, oldest >= env->me_oldest[0]); - if (oldest == laggard) - return oldest; - - if (MDBX_IS_ERROR(mdbx_reader_check0(env, false, NULL))) - break; - - MDBX_reader *const rtbl = env->me_lck->mti_readers; - MDBX_reader *asleep = nullptr; - for (int i = env->me_lck->mti_numreaders; --i >= 0;) { - if (rtbl[i].mr_pid) { - mdbx_jitter4testing(true); - const txnid_t snap = rtbl[i].mr_txnid; - if (oldest > snap && laggard <= /* ignore pending updates */ snap) { - oldest = snap; - asleep = &rtbl[i]; - } - } - } - - if (laggard < oldest || !asleep) { - if (retry && env->me_oom_func) { - /* LY: notify end of oom-loop */ - const txnid_t gap = oldest - laggard; - env->me_oom_func(env, 0, 0, laggard, - (gap < UINT_MAX) ? (unsigned)gap : UINT_MAX, -retry); - } - mdbx_notice("oom-kick: update oldest %" PRIaTXN " -> %" PRIaTXN, - env->me_oldest[0], oldest); - mdbx_assert(env, env->me_oldest[0] <= oldest); - return env->me_oldest[0] = oldest; - } - - mdbx_tid_t tid; - mdbx_pid_t pid; - int rc; - - if (!env->me_oom_func) - break; - - pid = asleep->mr_pid; - tid = asleep->mr_tid; - if (asleep->mr_txnid != laggard || pid <= 0) - continue; - - const txnid_t gap = - mdbx_meta_txnid_stable(env, mdbx_meta_head(env)) - laggard; - rc = env->me_oom_func(env, pid, tid, laggard, - (gap < UINT_MAX) ? (unsigned)gap : UINT_MAX, retry); - if (rc < 0) - break; - - if (rc) { - asleep->mr_txnid = ~(txnid_t)0; - env->me_lck->mti_readers_refresh_flag = true; - if (rc > 1) { - asleep->mr_tid = 0; - asleep->mr_pid = 0; - mdbx_coherent_barrier(); - } - } - } - - if (retry && env->me_oom_func) { - /* LY: notify end of oom-loop */ - env->me_oom_func(env, 0, 0, laggard, 0, -retry); - } - return mdbx_find_oldest(env->me_txn); -} - -int __cold mdbx_env_set_syncbytes(MDBX_env *env, size_t bytes) { - if (unlikely(!env)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - env->me_sync_threshold = bytes; - return env->me_map ? mdbx_env_sync(env, 0) : MDBX_SUCCESS; -} - -int __cold mdbx_env_set_oomfunc(MDBX_env *env, MDBX_oom_func *oomfunc) { - if (unlikely(!env)) - return MDBX_EINVAL; - - if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) - return MDBX_EBADSIGN; - - env->me_oom_func = oomfunc; - return MDBX_SUCCESS; -} - -MDBX_oom_func *__cold mdbx_env_get_oomfunc(MDBX_env *env) { - return likely(env && env->me_signature == MDBX_ME_SIGNATURE) - ? env->me_oom_func - : NULL; -} - -#ifdef __SANITIZE_THREAD__ -/* LY: avoid tsan-trap by me_txn, mm_last_pg and mt_next_pgno */ -__attribute__((no_sanitize_thread, noinline)) -#endif -int mdbx_txn_straggler(MDBX_txn *txn, int *percent) -{ - if (unlikely(!txn)) - return -MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - MDBX_env *env = txn->mt_env; - if (unlikely((txn->mt_flags & MDBX_RDONLY) == 0)) { - if (percent) - *percent = - (int)((txn->mt_next_pgno * UINT64_C(100) + txn->mt_end_pgno / 2) / - txn->mt_end_pgno); - return -1; - } - - txnid_t recent; - MDBX_meta *meta; - do { - meta = mdbx_meta_head(env); - recent = mdbx_meta_txnid_fluid(env, meta); - if (percent) { - const pgno_t maxpg = meta->mm_geo.now; - *percent = (int)((meta->mm_geo.next * UINT64_C(100) + maxpg / 2) / maxpg); - } - } while (unlikely(recent != mdbx_meta_txnid_fluid(env, meta))); - - txnid_t lag = recent - txn->mt_ro_reader->mr_txnid; - return (lag > INT_MAX) ? INT_MAX : (int)lag; -} - -typedef struct mdbx_walk_ctx { - MDBX_txn *mw_txn; - void *mw_user; - MDBX_pgvisitor_func *mw_visitor; -} mdbx_walk_ctx_t; - -/* Depth-first tree traversal. */ -static int __cold mdbx_env_walk(mdbx_walk_ctx_t *ctx, const char *dbi, - pgno_t pg, int deep) { - MDBX_page *mp; - int rc, i, nkeys; - size_t header_size, unused_size, payload_size, align_bytes; - const char *type; - - if (pg == P_INVALID) - return MDBX_SUCCESS; /* empty db */ - - MDBX_cursor mc; - memset(&mc, 0, sizeof(mc)); - mc.mc_snum = 1; - mc.mc_txn = ctx->mw_txn; - - rc = mdbx_page_get(&mc, pg, &mp, NULL); - if (rc) - return rc; - if (pg != mp->mp_pgno) - return MDBX_CORRUPTED; - - nkeys = NUMKEYS(mp); - header_size = IS_LEAF2(mp) ? PAGEHDRSZ : PAGEHDRSZ + mp->mp_lower; - unused_size = SIZELEFT(mp); - payload_size = 0; - - /* LY: Don't use mask here, e.g bitwise - * (P_BRANCH|P_LEAF|P_LEAF2|P_META|P_OVERFLOW|P_SUBP). - * Pages should not me marked dirty/loose or otherwise. */ - switch (mp->mp_flags) { - case P_BRANCH: - type = "branch"; - if (nkeys < 1) - return MDBX_CORRUPTED; - break; - case P_LEAF: - type = "leaf"; - break; - case P_LEAF | P_SUBP: - type = "dupsort-subleaf"; - break; - case P_LEAF | P_LEAF2: - type = "dupfixed-leaf"; - break; - case P_LEAF | P_LEAF2 | P_SUBP: - type = "dupsort-dupfixed-subleaf"; - break; - case P_META: - case P_OVERFLOW: - __fallthrough; - default: - return MDBX_CORRUPTED; - } - - for (align_bytes = i = 0; i < nkeys; - align_bytes += ((payload_size + align_bytes) & 1), i++) { - MDBX_node *node; - - if (IS_LEAF2(mp)) { - /* LEAF2 pages have no mp_ptrs[] or node headers */ - payload_size += mp->mp_leaf2_ksize; - continue; - } - - node = NODEPTR(mp, i); - payload_size += NODESIZE + node->mn_ksize; - - if (IS_BRANCH(mp)) { - rc = mdbx_env_walk(ctx, dbi, NODEPGNO(node), deep); - if (rc) - return rc; - continue; - } - - assert(IS_LEAF(mp)); - if (node->mn_flags & F_BIGDATA) { - MDBX_page *omp; - pgno_t *opg; - size_t over_header, over_payload, over_unused; - - payload_size += sizeof(pgno_t); - opg = NODEDATA(node); - rc = mdbx_page_get(&mc, *opg, &omp, NULL); - if (rc) - return rc; - if (*opg != omp->mp_pgno) - return MDBX_CORRUPTED; - /* LY: Don't use mask here, e.g bitwise - * (P_BRANCH|P_LEAF|P_LEAF2|P_META|P_OVERFLOW|P_SUBP). - * Pages should not me marked dirty/loose or otherwise. */ - if (P_OVERFLOW != omp->mp_flags) - return MDBX_CORRUPTED; - - over_header = PAGEHDRSZ; - over_payload = NODEDSZ(node); - over_unused = pgno2bytes(ctx->mw_txn->mt_env, omp->mp_pages) - - over_payload - over_header; - - rc = ctx->mw_visitor(*opg, omp->mp_pages, ctx->mw_user, dbi, - "overflow-data", 1, over_payload, over_header, - over_unused); - if (rc) - return rc; - continue; - } - - payload_size += NODEDSZ(node); - if (node->mn_flags & F_SUBDATA) { - MDBX_db *db = NODEDATA(node); - char *name = NULL; - - if (!(node->mn_flags & F_DUPDATA)) { - name = NODEKEY(node); - ptrdiff_t namelen = (char *)db - name; - name = memcpy(alloca(namelen + 1), name, namelen); - name[namelen] = 0; - } - rc = mdbx_env_walk(ctx, (name && name[0]) ? name : dbi, db->md_root, - deep + 1); - if (rc) - return rc; - } - } - - return ctx->mw_visitor(mp->mp_pgno, 1, ctx->mw_user, dbi, type, nkeys, - payload_size, header_size, unused_size + align_bytes); -} - -int __cold mdbx_env_pgwalk(MDBX_txn *txn, MDBX_pgvisitor_func *visitor, - void *user) { - if (unlikely(!txn)) - return MDBX_BAD_TXN; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - mdbx_walk_ctx_t ctx; - ctx.mw_txn = txn; - ctx.mw_user = user; - ctx.mw_visitor = visitor; - - int rc = visitor(0, NUM_METAS, user, "meta", "meta", NUM_METAS, - sizeof(MDBX_meta) * NUM_METAS, PAGEHDRSZ * NUM_METAS, - (txn->mt_env->me_psize - sizeof(MDBX_meta) - PAGEHDRSZ) * - NUM_METAS); - if (!rc) - rc = mdbx_env_walk(&ctx, "free", txn->mt_dbs[FREE_DBI].md_root, 0); - if (!rc) - rc = mdbx_env_walk(&ctx, "main", txn->mt_dbs[MAIN_DBI].md_root, 0); - if (!rc) - rc = visitor(P_INVALID, 0, user, NULL, NULL, 0, 0, 0, 0); - return rc; -} - -int mdbx_canary_put(MDBX_txn *txn, const mdbx_canary *canary) { - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - if (unlikely(F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY))) - return MDBX_EACCESS; - - if (likely(canary)) { - if (txn->mt_canary.x == canary->x && txn->mt_canary.y == canary->y && - txn->mt_canary.z == canary->z) - return MDBX_SUCCESS; - txn->mt_canary.x = canary->x; - txn->mt_canary.y = canary->y; - txn->mt_canary.z = canary->z; - } - txn->mt_canary.v = txn->mt_txnid; - - if ((txn->mt_flags & MDBX_TXN_DIRTY) == 0) { - MDBX_env *env = txn->mt_env; - txn->mt_flags |= MDBX_TXN_DIRTY; - env->me_sync_pending += env->me_psize; - } - - return MDBX_SUCCESS; -} - -int mdbx_canary_get(MDBX_txn *txn, mdbx_canary *canary) { - if (unlikely(txn == NULL || canary == NULL)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - *canary = txn->mt_canary; - return MDBX_SUCCESS; -} - -int mdbx_cursor_on_first(MDBX_cursor *mc) { - if (unlikely(mc == NULL)) - return MDBX_EINVAL; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE)) - return MDBX_EBADSIGN; - - if (!(mc->mc_flags & C_INITIALIZED)) - return MDBX_RESULT_FALSE; - - for (unsigned i = 0; i < mc->mc_snum; ++i) { - if (mc->mc_ki[i]) - return MDBX_RESULT_FALSE; - } - - return MDBX_RESULT_TRUE; -} - -int mdbx_cursor_on_last(MDBX_cursor *mc) { - if (unlikely(mc == NULL)) - return MDBX_EINVAL; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE)) - return MDBX_EBADSIGN; - - if (!(mc->mc_flags & C_INITIALIZED)) - return MDBX_RESULT_FALSE; - - for (unsigned i = 0; i < mc->mc_snum; ++i) { - unsigned nkeys = NUMKEYS(mc->mc_pg[i]); - if (mc->mc_ki[i] < nkeys - 1) - return MDBX_RESULT_FALSE; - } - - return MDBX_RESULT_TRUE; -} - -int mdbx_cursor_eof(MDBX_cursor *mc) { - if (unlikely(mc == NULL)) - return MDBX_EINVAL; - - if (unlikely(mc->mc_signature != MDBX_MC_SIGNATURE)) - return MDBX_EBADSIGN; - - if ((mc->mc_flags & C_INITIALIZED) == 0) - return MDBX_RESULT_TRUE; - - if (mc->mc_snum == 0) - return MDBX_RESULT_TRUE; - - if ((mc->mc_flags & C_EOF) && - mc->mc_ki[mc->mc_top] >= NUMKEYS(mc->mc_pg[mc->mc_top])) - return MDBX_RESULT_TRUE; - - return MDBX_RESULT_FALSE; -} - -static int mdbx_is_samedata(const MDBX_val *a, const MDBX_val *b) { - return a->iov_len == b->iov_len && - memcmp(a->iov_base, b->iov_base, a->iov_len) == 0; -} - -/* Позволяет обновить или удалить существующую запись с получением - * в old_data предыдущего значения данных. При этом если new_data равен - * нулю, то выполняется удаление, иначе обновление/вставка. - * - * Текущее значение может находиться в уже измененной (грязной) странице. - * В этом случае страница будет перезаписана при обновлении, а само старое - * значение утрачено. Поэтому исходно в old_data должен быть передан - * дополнительный буфер для копирования старого значения. - * Если переданный буфер слишком мал, то функция вернет -1, установив - * old_data->iov_len в соответствующее значение. - * - * Для не-уникальных ключей также возможен второй сценарий использования, - * когда посредством old_data из записей с одинаковым ключом для - * удаления/обновления выбирается конкретная. Для выбора этого сценария - * во flags следует одновременно указать MDBX_CURRENT и MDBX_NOOVERWRITE. - * Именно эта комбинация выбрана, так как она лишена смысла, и этим позволяет - * идентифицировать запрос такого сценария. - * - * Функция может быть замещена соответствующими операциями с курсорами - * после двух доработок (TODO): - * - внешняя аллокация курсоров, в том числе на стеке (без malloc). - * - получения статуса страницы по адресу (знать о P_DIRTY). - */ -int mdbx_replace(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *new_data, - MDBX_val *old_data, unsigned flags) { - if (unlikely(!key || !old_data || !txn || old_data == new_data)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(old_data->iov_base == NULL && old_data->iov_len)) - return MDBX_EINVAL; - - if (unlikely(new_data == NULL && !(flags & MDBX_CURRENT))) - return MDBX_EINVAL; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(flags & - ~(MDBX_NOOVERWRITE | MDBX_NODUPDATA | MDBX_RESERVE | - MDBX_APPEND | MDBX_APPENDDUP | MDBX_CURRENT))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & (MDBX_TXN_RDONLY | MDBX_TXN_BLOCKED))) - return (txn->mt_flags & MDBX_TXN_RDONLY) ? MDBX_EACCESS : MDBX_BAD_TXN; - - MDBX_cursor mc; - MDBX_xcursor mx; - mdbx_cursor_init(&mc, txn, dbi, &mx); - mc.mc_next = txn->mt_cursors[dbi]; - txn->mt_cursors[dbi] = &mc; - - int rc; - MDBX_val present_key = *key; - if (F_ISSET(flags, MDBX_CURRENT | MDBX_NOOVERWRITE)) { - /* в old_data значение для выбора конкретного дубликата */ - if (unlikely(!(txn->mt_dbs[dbi].md_flags & MDBX_DUPSORT))) { - rc = MDBX_EINVAL; - goto bailout; - } - - /* убираем лишний бит, он был признаком запрошенного режима */ - flags -= MDBX_NOOVERWRITE; - - rc = mdbx_cursor_get(&mc, &present_key, old_data, MDBX_GET_BOTH); - if (rc != MDBX_SUCCESS) - goto bailout; - - if (new_data) { - /* обновление конкретного дубликата */ - if (mdbx_is_samedata(old_data, new_data)) - /* если данные совпадают, то ничего делать не надо */ - goto bailout; - } - } else { - /* в old_data буфер для сохранения предыдущего значения */ - if (unlikely(new_data && old_data->iov_base == new_data->iov_base)) - return MDBX_EINVAL; - MDBX_val present_data; - rc = mdbx_cursor_get(&mc, &present_key, &present_data, MDBX_SET_KEY); - if (unlikely(rc != MDBX_SUCCESS)) { - old_data->iov_base = NULL; - old_data->iov_len = rc; - if (rc != MDBX_NOTFOUND || (flags & MDBX_CURRENT)) - goto bailout; - } else if (flags & MDBX_NOOVERWRITE) { - rc = MDBX_KEYEXIST; - *old_data = present_data; - goto bailout; - } else { - MDBX_page *page = mc.mc_pg[mc.mc_top]; - if (txn->mt_dbs[dbi].md_flags & MDBX_DUPSORT) { - if (flags & MDBX_CURRENT) { - /* для не-уникальных ключей позволяем update/delete только если ключ - * один */ - MDBX_node *leaf = NODEPTR(page, mc.mc_ki[mc.mc_top]); - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_tassert(txn, XCURSOR_INITED(&mc) && - mc.mc_xcursor->mx_db.md_entries > 1); - if (mc.mc_xcursor->mx_db.md_entries > 1) { - rc = MDBX_EMULTIVAL; - goto bailout; - } - } - /* если данные совпадают, то ничего делать не надо */ - if (new_data && mdbx_is_samedata(&present_data, new_data)) { - *old_data = *new_data; - goto bailout; - } - /* В оригинальной LMDB фладок MDBX_CURRENT здесь приведет - * к замене данных без учета MDBX_DUPSORT сортировки, - * но здесь это в любом случае допустимо, так как мы - * проверили что для ключа есть только одно значение. */ - } else if ((flags & MDBX_NODUPDATA) && - mdbx_is_samedata(&present_data, new_data)) { - /* если данные совпадают и установлен MDBX_NODUPDATA */ - rc = MDBX_KEYEXIST; - goto bailout; - } - } else { - /* если данные совпадают, то ничего делать не надо */ - if (new_data && mdbx_is_samedata(&present_data, new_data)) { - *old_data = *new_data; - goto bailout; - } - flags |= MDBX_CURRENT; - } - - if (page->mp_flags & P_DIRTY) { - if (unlikely(old_data->iov_len < present_data.iov_len)) { - old_data->iov_base = NULL; - old_data->iov_len = present_data.iov_len; - rc = MDBX_RESULT_TRUE; - goto bailout; - } - memcpy(old_data->iov_base, present_data.iov_base, present_data.iov_len); - old_data->iov_len = present_data.iov_len; - } else { - *old_data = present_data; - } - } - } - - if (likely(new_data)) - rc = mdbx_cursor_put(&mc, key, new_data, flags); - else - rc = mdbx_cursor_del(&mc, 0); - -bailout: - txn->mt_cursors[dbi] = mc.mc_next; - return rc; -} - -int mdbx_get_ex(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data, - size_t *values_count) { - DKBUF; - mdbx_debug("===> get db %u key [%s]", dbi, DKEY(key)); - - if (unlikely(!key || !data || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - MDBX_cursor mc; - MDBX_xcursor mx; - mdbx_cursor_init(&mc, txn, dbi, &mx); - - int exact = 0; - int rc = mdbx_cursor_set(&mc, key, data, MDBX_SET_KEY, &exact); - if (unlikely(rc != MDBX_SUCCESS)) { - if (rc == MDBX_NOTFOUND && values_count) - *values_count = 0; - return rc; - } - - if (values_count) { - *values_count = 1; - if (mc.mc_xcursor != NULL) { - MDBX_node *leaf = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]); - if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { - mdbx_tassert(txn, mc.mc_xcursor == &mx && - (mx.mx_cursor.mc_flags & C_INITIALIZED)); - *values_count = (sizeof(*values_count) >= sizeof(mx.mx_db.md_entries) || - mx.mx_db.md_entries <= SIZE_MAX) - ? (size_t)mx.mx_db.md_entries - : SIZE_MAX; - } - } - } - return MDBX_SUCCESS; -} - -/* Функция сообщает находится ли указанный адрес в "грязной" странице у - * заданной пишущей транзакции. В конечном счете это позволяет избавиться от - * лишнего копирования данных из НЕ-грязных страниц. - * - * "Грязные" страницы - это те, которые уже были изменены в ходе пишущей - * транзакции. Соответственно, какие-либо дальнейшие изменения могут привести - * к перезаписи таких страниц. Поэтому все функции, выполняющие изменения, в - * качестве аргументов НЕ должны получать указатели на данные в таких - * страницах. В свою очередь "НЕ грязные" страницы перед модификацией будут - * скопированы. - * - * Другими словами, данные из "грязных" страниц должны быть либо скопированы - * перед передачей в качестве аргументов для дальнейших модификаций, либо - * отвергнуты на стадии проверки корректности аргументов. - * - * Таким образом, функция позволяет как избавится от лишнего копирования, - * так и выполнить более полную проверку аргументов. - * - * ВАЖНО: Передаваемый указатель должен указывать на начало данных. Только - * так гарантируется что актуальный заголовок страницы будет физически - * расположен в той-же странице памяти, в том числе для многостраничных - * P_OVERFLOW страниц с длинными данными. */ -int mdbx_is_dirty(const MDBX_txn *txn, const void *ptr) { - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(txn->mt_flags & MDBX_TXN_RDONLY)) - return MDBX_RESULT_FALSE; - - const MDBX_env *env = txn->mt_env; - const uintptr_t mask = ~(uintptr_t)(env->me_psize - 1); - const MDBX_page *page = (const MDBX_page *)((uintptr_t)ptr & mask); - - /* LY: Тут не всё хорошо с абсолютной достоверностью результата, - * так как флажок P_DIRTY в LMDB может означать не совсем то, - * что было исходно задумано, детали см в логике кода mdbx_page_touch(). - * - * Более того, в режиме БЕЗ WRITEMAP грязные страницы выделяются через - * malloc(), т.е. находятся вне mmap-диапазона и тогда чтобы отличить - * действительно грязную страницу от указателя на данные пользователя - * следует сканировать dirtylist, что накладно. - * - * Тем не менее, однозначно страница "не грязная" (не будет переписана - * во время транзакции) если адрес находится внутри mmap-диапазона - * и в заголовке страницы нет флажка P_DIRTY. */ - if (env->me_map < (uint8_t *)page) { - const size_t usedbytes = pgno2bytes(env, txn->mt_next_pgno); - if ((uint8_t *)page < env->me_map + usedbytes) { - /* страница внутри диапазона, смотрим на флажки */ - return (page->mp_flags & (P_DIRTY | P_LOOSE | P_KEEP)) - ? MDBX_RESULT_TRUE - : MDBX_RESULT_FALSE; - } - /* Гипотетически здесь возможна ситуация, когда указатель адресует что-то - * в пределах mmap, но за границей распределенных страниц. Это тяжелая - * ошибка, к которой не возможно прийти без каких-то больших нарушений. - * Поэтому не проверяем этот случай кроме как assert-ом, на то что - * страница вне mmap-диаппазона. */ - mdbx_tassert(txn, (uint8_t *)page >= env->me_map + env->me_mapsize); - } - - /* Страница вне используемого mmap-диапазона, т.е. либо в функцию был - * передан некорректный адрес, либо адрес в теневой странице, которая была - * выделена посредством malloc(). - * - * Для WRITE_MAP режима такая страница однозначно "не грязная", - * а для режимов без WRITE_MAP следует просматривать списки dirty - * и spilled страниц у каких-либо транзакций (в том числе дочерних). - * - * Поэтому для WRITE_MAP возвращаем false, а для остальных режимов - * всегда true. Такая логика имеет ряд преимуществ: - * - не тратим время на просмотр списков; - * - результат всегда безопасен (может быть ложно-положительным, - * но не ложно-отрицательным); - * - результат не зависит от вложенности транзакций и от относительного - * положения переданной транзакции в этой рекурсии. */ - return (env->me_flags & MDBX_WRITEMAP) ? MDBX_RESULT_FALSE : MDBX_RESULT_TRUE; -} - -int mdbx_dbi_sequence(MDBX_txn *txn, MDBX_dbi dbi, uint64_t *result, - uint64_t increment) { - if (unlikely(!txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_EBADSIGN; - - if (unlikely(txn->mt_owner != mdbx_thread_self())) - return MDBX_THREAD_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(TXN_DBI_CHANGED(txn, dbi))) - return MDBX_BAD_DBI; - - MDBX_db *dbs = &txn->mt_dbs[dbi]; - if (likely(result)) - *result = dbs->md_seq; - - if (likely(increment > 0)) { - if (unlikely(txn->mt_flags & MDBX_TXN_BLOCKED)) - return MDBX_BAD_TXN; - - if (unlikely(F_ISSET(txn->mt_flags, MDBX_TXN_RDONLY))) - return MDBX_EACCESS; - - uint64_t new = dbs->md_seq + increment; - if (unlikely(new < increment)) - return MDBX_RESULT_TRUE; - - assert(new > dbs->md_seq); - dbs->md_seq = new; - txn->mt_flags |= MDBX_TXN_DIRTY; - txn->mt_dbflags[dbi] |= DB_DIRTY; - } - - return MDBX_SUCCESS; -} - -/*----------------------------------------------------------------------------*/ -/* attribute support functions for Nexenta */ - -static __inline int mdbx_attr_peek(MDBX_val *data, mdbx_attr_t *attrptr) { - if (unlikely(data->iov_len < sizeof(mdbx_attr_t))) - return MDBX_INCOMPATIBLE; - - if (likely(attrptr != NULL)) - *attrptr = *(mdbx_attr_t *)data->iov_base; - data->iov_len -= sizeof(mdbx_attr_t); - data->iov_base = - likely(data->iov_len > 0) ? ((mdbx_attr_t *)data->iov_base) + 1 : NULL; - - return MDBX_SUCCESS; -} - -static __inline int mdbx_attr_poke(MDBX_val *reserved, MDBX_val *data, - mdbx_attr_t attr, unsigned flags) { - mdbx_attr_t *space = reserved->iov_base; - if (flags & MDBX_RESERVE) { - if (likely(data != NULL)) { - data->iov_base = data->iov_len ? space + 1 : NULL; - } - } else { - *space = attr; - if (likely(data != NULL)) { - memcpy(space + 1, data->iov_base, data->iov_len); - } - } - - return MDBX_SUCCESS; -} - -int mdbx_cursor_get_attr(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, - mdbx_attr_t *attrptr, MDBX_cursor_op op) { - int rc = mdbx_cursor_get(mc, key, data, op); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - return mdbx_attr_peek(data, attrptr); -} - -int mdbx_get_attr(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data, - uint64_t *attrptr) { - int rc = mdbx_get(txn, dbi, key, data); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - return mdbx_attr_peek(data, attrptr); -} - -int mdbx_put_attr(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data, - mdbx_attr_t attr, unsigned flags) { - MDBX_val reserve; - reserve.iov_base = NULL; - reserve.iov_len = (data ? data->iov_len : 0) + sizeof(mdbx_attr_t); - - int rc = mdbx_put(txn, dbi, key, &reserve, flags | MDBX_RESERVE); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - return mdbx_attr_poke(&reserve, data, attr, flags); -} - -int mdbx_cursor_put_attr(MDBX_cursor *cursor, MDBX_val *key, MDBX_val *data, - mdbx_attr_t attr, unsigned flags) { - MDBX_val reserve; - reserve.iov_base = NULL; - reserve.iov_len = (data ? data->iov_len : 0) + sizeof(mdbx_attr_t); - - int rc = mdbx_cursor_put(cursor, key, &reserve, flags | MDBX_RESERVE); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - return mdbx_attr_poke(&reserve, data, attr, flags); -} - -int mdbx_set_attr(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data, - mdbx_attr_t attr) { - if (unlikely(!key || !txn)) - return MDBX_EINVAL; - - if (unlikely(txn->mt_signature != MDBX_MT_SIGNATURE)) - return MDBX_VERSION_MISMATCH; - - if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) - return MDBX_EINVAL; - - if (unlikely(txn->mt_flags & (MDBX_TXN_RDONLY | MDBX_TXN_BLOCKED))) - return (txn->mt_flags & MDBX_TXN_RDONLY) ? MDBX_EACCESS : MDBX_BAD_TXN; - - MDBX_cursor mc; - MDBX_xcursor mx; - MDBX_val old_data; - mdbx_cursor_init(&mc, txn, dbi, &mx); - int rc = mdbx_cursor_set(&mc, key, &old_data, MDBX_SET, NULL); - if (unlikely(rc != MDBX_SUCCESS)) { - if (rc == MDBX_NOTFOUND && data) { - mc.mc_next = txn->mt_cursors[dbi]; - txn->mt_cursors[dbi] = &mc; - rc = mdbx_cursor_put_attr(&mc, key, data, attr, 0); - txn->mt_cursors[dbi] = mc.mc_next; - } - return rc; - } - - mdbx_attr_t old_attr = 0; - rc = mdbx_attr_peek(&old_data, &old_attr); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - - if (old_attr == attr && (!data || (data->iov_len == old_data.iov_len && - memcmp(data->iov_base, old_data.iov_base, - old_data.iov_len) == 0))) - return MDBX_SUCCESS; - - mc.mc_next = txn->mt_cursors[dbi]; - txn->mt_cursors[dbi] = &mc; - rc = mdbx_cursor_put_attr(&mc, key, data ? data : &old_data, attr, - MDBX_CURRENT); - txn->mt_cursors[dbi] = mc.mc_next; - return rc; -} - -//---------------------------------------------------------------------------- - -#ifdef __SANITIZE_ADDRESS__ -LIBMDBX_API __attribute__((weak)) const char *__asan_default_options() { - return "symbolize=1:allow_addr2line=1:" -#ifdef _DEBUG - "debug=1:" -#endif /* _DEBUG */ - "report_globals=1:" - "replace_str=1:replace_intrin=1:" - "malloc_context_size=9:" - "detect_leaks=1:" - "check_printf=1:" - "detect_deadlocks=1:" -#ifndef LTO_ENABLED - "check_initialization_order=1:" -#endif - "detect_stack_use_after_return=1:" - "intercept_tls_get_addr=1:" - "decorate_proc_maps=1:" - "abort_on_error=1"; -} -#endif /* __SANITIZE_ADDRESS__ */ diff --git a/plugins/Dbx_mdb/src/mdbx/mdbx.h b/plugins/Dbx_mdb/src/mdbx/mdbx.h deleted file mode 100644 index f7de11c0e4..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/mdbx.h +++ /dev/null @@ -1,1825 +0,0 @@ -/* LICENSE AND COPYRUSTING ***************************************************** - * - * Copyright 2015-2017 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>. - * - * --- - * - * This code is derived from "LMDB engine" written by - * Howard Chu (Symas Corporation), which itself derived from btree.c - * written by Martin Hedenfalk. - * - * --- - * - * Portions Copyright 2011-2015 Howard Chu, Symas Corp. 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>. - * - * --- - * - * Portions Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -/* ACKNOWLEDGEMENTS ************************************************************ - * - * Howard Chu (Symas Corporation) - the author of LMDB, - * from which originated the MDBX in 2015. - * - * Martin Hedenfalk <martin@bzero.se> - the author of `btree.c` code, - * which was used for begin development of LMDB. */ - -#pragma once -#ifndef LIBMDBX_H -#define LIBMDBX_H - -/* IMPENDING CHANGES WARNING *************************************************** - * - * Now MDBX is under active development and until November 2017 is expected a - * big change both of API and database format. Unfortunately those update will - * lead to loss of compatibility with previous versions. - * - * The aim of this revolution in providing a clearer robust API and adding new - * features, including the database properties. */ - -/*--------------------------------------------------------------------------*/ - -#ifdef _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable : 4548) /* expression before comma has no effect; \ - expected expression with side - effect */ -#pragma warning(disable : 4530) /* C++ exception handler used, but unwind \ - * semantics are not enabled. Specify /EHsc */ -#pragma warning(disable : 4577) /* 'noexcept' used with no exception handling \ - * mode specified; termination on exception is \ - * not guaranteed. Specify /EHsc */ -#endif /* _MSC_VER (warnings) */ - -#include <stdarg.h> -#include <stddef.h> -#include <stdint.h> - -#if defined(_WIN32) || defined(_WIN64) - -#include <windows.h> -#include <winnt.h> -#ifndef __mode_t_defined -typedef unsigned short mode_t; -#endif -typedef HANDLE mdbx_filehandle_t; -typedef DWORD mdbx_pid_t; -typedef DWORD mdbx_tid_t; -#define MDBX_ENODATA ERROR_HANDLE_EOF -#define MDBX_EINVAL ERROR_INVALID_PARAMETER -#define MDBX_EACCESS ERROR_ACCESS_DENIED -#define MDBX_ENOMEM ERROR_OUTOFMEMORY -#define MDBX_EROFS ERROR_FILE_READ_ONLY -#define MDBX_ENOSYS ERROR_NOT_SUPPORTED -#define MDBX_EIO ERROR_WRITE_FAULT -#define MDBX_EPERM ERROR_INVALID_FUNCTION -#define MDBX_EINTR ERROR_CANCELLED - -#else - -#include <errno.h> /* for error codes */ -#include <pthread.h> /* for pthread_t */ -#include <sys/types.h> /* for pid_t */ -#include <sys/uio.h> /* for truct iovec */ -#define HAVE_STRUCT_IOVEC 1 -typedef int mdbx_filehandle_t; -typedef pid_t mdbx_pid_t; -typedef pthread_t mdbx_tid_t; -#define MDBX_ENODATA ENODATA -#define MDBX_EINVAL EINVAL -#define MDBX_EACCESS EACCES -#define MDBX_ENOMEM ENOMEM -#define MDBX_EROFS EROFS -#define MDBX_ENOSYS ENOSYS -#define MDBX_EIO EIO -#define MDBX_EPERM EPERM -#define MDBX_EINTR EINTR -#endif - -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -/*--------------------------------------------------------------------------*/ - -#ifndef __has_attribute -#define __has_attribute(x) (0) -#endif - -#ifndef __dll_export -#if defined(_WIN32) || defined(__CYGWIN__) -#if defined(__GNUC__) || __has_attribute(dllexport) -#define __dll_export __attribute__((dllexport)) -#elif defined(_MSC_VER) -#define __dll_export __declspec(dllexport) -#else -#define __dll_export -#endif -#elif defined(__GNUC__) || __has_attribute(visibility) -#define __dll_export __attribute__((visibility("default"))) -#else -#define __dll_export -#endif -#endif /* __dll_export */ - -#ifndef __dll_import -#if defined(_WIN32) || defined(__CYGWIN__) -#if defined(__GNUC__) || __has_attribute(dllimport) -#define __dll_import __attribute__((dllimport)) -#elif defined(_MSC_VER) -#define __dll_import __declspec(dllimport) -#else -#define __dll_import -#endif -#else -#define __dll_import -#endif -#endif /* __dll_import */ - -/*--------------------------------------------------------------------------*/ - -#define MDBX_VERSION_MAJOR 0 -#define MDBX_VERSION_MINOR 0 - -#if defined(LIBMDBX_EXPORTS) -#define LIBMDBX_API __dll_export -#elif defined(LIBMDBX_IMPORTS) -#define LIBMDBX_API __dll_import -#else -#define LIBMDBX_API -#endif /* LIBMDBX_API */ - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct mdbx_version_info { - uint8_t major; - uint8_t minor; - uint16_t release; - uint32_t revision; - struct { - const char *datetime; - const char *tree; - const char *commit; - const char *describe; - } git; -} mdbx_version_info; - -typedef struct mdbx_build_info { - const char *datetime; - const char *target; - const char *options; - const char *compiler; - const char *flags; -} mdbx_build_info; - -extern LIBMDBX_API const mdbx_version_info mdbx_version; -extern LIBMDBX_API const mdbx_build_info mdbx_build; - -/* The name of the lock file in the DB environment */ -#define MDBX_LOCKNAME "/mdbx.lck" -/* The name of the data file in the DB environment */ -#define MDBX_DATANAME "/mdbx.dat" -/* The suffix of the lock file when no subdir is used */ -#define MDBX_LOCK_SUFFIX "-lck" - -/* Opaque structure for a database environment. - * - * A DB environment supports multiple databases, all residing in the same - * shared-memory map. */ -typedef struct MDBX_env MDBX_env; - -/* Opaque structure for a transaction handle. - * - * All database operations require a transaction handle. Transactions may be - * read-only or read-write. */ -typedef struct MDBX_txn MDBX_txn; - -/* A handle for an individual database in the DB environment. */ -typedef uint32_t MDBX_dbi; - -/* Opaque structure for navigating through a database */ -typedef struct MDBX_cursor MDBX_cursor; - -/* Generic structure used for passing keys and data in and out - * of the database. - * - * Values returned from the database are valid only until a subsequent - * update operation, or the end of the transaction. Do not modify or - * free them, they commonly point into the database itself. - * - * Key sizes must be between 1 and mdbx_env_get_maxkeysize() inclusive. - * The same applies to data sizes in databases with the MDBX_DUPSORT flag. - * Other data items can in theory be from 0 to 0xffffffff bytes long. */ -#ifndef HAVE_STRUCT_IOVEC -struct iovec { - void *iov_base; - size_t iov_len; -}; -#define HAVE_STRUCT_IOVEC -#endif /* HAVE_STRUCT_IOVEC */ - -typedef struct iovec MDBX_val; - -/* The maximum size of a data item. - * MDBX only store a 32 bit value for node sizes. */ -#define MDBX_MAXDATASIZE INT32_MAX - -/* A callback function used to compare two keys in a database */ -typedef int(MDBX_cmp_func)(const MDBX_val *a, const MDBX_val *b); - -/* Environment Flags */ -/* no environment directory */ -#define MDBX_NOSUBDIR 0x4000u -/* don't fsync after commit */ -#define MDBX_NOSYNC 0x10000u -/* read only */ -#define MDBX_RDONLY 0x20000u -/* don't fsync metapage after commit */ -#define MDBX_NOMETASYNC 0x40000u -/* use writable mmap */ -#define MDBX_WRITEMAP 0x80000u -/* use asynchronous msync when MDBX_WRITEMAP is used */ -#define MDBX_MAPASYNC 0x100000u -/* tie reader locktable slots to MDBX_txn objects instead of to threads */ -#define MDBX_NOTLS 0x200000u -/* don't do any locking, caller must manage their own locks - * WARNING: libmdbx don't support this mode. */ -#define MDBX_NOLOCK__UNSUPPORTED 0x400000u -/* don't do readahead */ -#define MDBX_NORDAHEAD 0x800000u -/* don't initialize malloc'd memory before writing to datafile */ -#define MDBX_NOMEMINIT 0x1000000u -/* aim to coalesce FreeDB records */ -#define MDBX_COALESCE 0x2000000u -/* LIFO policy for reclaiming FreeDB records */ -#define MDBX_LIFORECLAIM 0x4000000u -/* make a steady-sync only on close and explicit env-sync */ -#define MDBX_UTTERLY_NOSYNC (MDBX_NOSYNC | MDBX_MAPASYNC) -/* debuging option, fill/perturb released pages */ -#define MDBX_PAGEPERTURB 0x8000000u - -/* Database Flags */ -/* use reverse string keys */ -#define MDBX_REVERSEKEY 0x02u -/* use sorted duplicates */ -#define MDBX_DUPSORT 0x04u -/* numeric keys in native byte order, either uint32_t or uint64_t. - * The keys must all be of the same size. */ -#define MDBX_INTEGERKEY 0x08u -/* with MDBX_DUPSORT, sorted dup items have fixed size */ -#define MDBX_DUPFIXED 0x10u -/* with MDBX_DUPSORT, dups are MDBX_INTEGERKEY-style integers */ -#define MDBX_INTEGERDUP 0x20u -/* with MDBX_DUPSORT, use reverse string dups */ -#define MDBX_REVERSEDUP 0x40u -/* create DB if not already existing */ -#define MDBX_CREATE 0x40000u - -/* Write Flags */ -/* For put: Don't write if the key already exists. */ -#define MDBX_NOOVERWRITE 0x10u -/* Only for MDBX_DUPSORT - * For put: don't write if the key and data pair already exist. - * For mdbx_cursor_del: remove all duplicate data items. */ -#define MDBX_NODUPDATA 0x20u -/* For mdbx_cursor_put: overwrite the current key/data pair - * MDBX allows this flag for mdbx_put() for explicit overwrite/update without - * insertion. */ -#define MDBX_CURRENT 0x40u -/* For put: Just reserve space for data, don't copy it. Return a - * pointer to the reserved space. */ -#define MDBX_RESERVE 0x10000u -/* Data is being appended, don't split full pages. */ -#define MDBX_APPEND 0x20000u -/* Duplicate data is being appended, don't split full pages. */ -#define MDBX_APPENDDUP 0x40000u -/* Store multiple data items in one call. Only for MDBX_DUPFIXED. */ -#define MDBX_MULTIPLE 0x80000u - -/* Transaction Flags */ -/* Do not block when starting a write transaction */ -#define MDBX_TRYTXN 0x10000000u - -/* Copy Flags */ -/* Compacting copy: Omit free space from copy, and renumber all - * pages sequentially. */ -#define MDBX_CP_COMPACT 1u - -/* Cursor Get operations. - * - * This is the set of all operations for retrieving data - * using a cursor. */ -typedef enum MDBX_cursor_op { - MDBX_FIRST, /* Position at first key/data item */ - MDBX_FIRST_DUP, /* MDBX_DUPSORT-only: Position at first data item - * of current key. */ - MDBX_GET_BOTH, /* MDBX_DUPSORT-only: Position at key/data pair. */ - MDBX_GET_BOTH_RANGE, /* MDBX_DUPSORT-only: position at key, nearest data. */ - MDBX_GET_CURRENT, /* Return key/data at current cursor position */ - MDBX_GET_MULTIPLE, /* MDBX_DUPFIXED-only: Return key and up to a page of - * duplicate data items from current cursor position. - * Move cursor to prepare for MDBX_NEXT_MULTIPLE.*/ - MDBX_LAST, /* Position at last key/data item */ - MDBX_LAST_DUP, /* MDBX_DUPSORT-only: Position at last data item - * of current key. */ - MDBX_NEXT, /* Position at next data item */ - MDBX_NEXT_DUP, /* MDBX_DUPSORT-only: Position at next data item - * of current key. */ - MDBX_NEXT_MULTIPLE, /* MDBX_DUPFIXED-only: Return key and up to a page of - * duplicate data items from next cursor position. - * Move cursor to prepare for MDBX_NEXT_MULTIPLE. */ - MDBX_NEXT_NODUP, /* Position at first data item of next key */ - MDBX_PREV, /* Position at previous data item */ - MDBX_PREV_DUP, /* MDBX_DUPSORT-only: Position at previous data item - * of current key. */ - MDBX_PREV_NODUP, /* Position at last data item of previous key */ - MDBX_SET, /* Position at specified key */ - MDBX_SET_KEY, /* Position at specified key, return both key and data */ - MDBX_SET_RANGE, /* Position at first key greater than or equal to - * specified key. */ - MDBX_PREV_MULTIPLE /* MDBX_DUPFIXED-only: Position at previous page and - * return key and up to a page of duplicate data items. */ -} MDBX_cursor_op; - -/* Return Codes - * BerkeleyDB uses -30800 to -30999, we'll go under them */ - -/* Successful result */ -#define MDBX_SUCCESS 0 -#define MDBX_RESULT_FALSE MDBX_SUCCESS -#define MDBX_RESULT_TRUE (-1) - -/* key/data pair already exists */ -#define MDBX_KEYEXIST (-30799) -/* key/data pair not found (EOF) */ -#define MDBX_NOTFOUND (-30798) -/* Requested page not found - this usually indicates corruption */ -#define MDBX_PAGE_NOTFOUND (-30797) -/* Located page was wrong type */ -#define MDBX_CORRUPTED (-30796) -/* Update of meta page failed or environment had fatal error */ -#define MDBX_PANIC (-30795) -/* DB file version mismatch with libmdbx */ -#define MDBX_VERSION_MISMATCH (-30794) -/* File is not a valid MDBX file */ -#define MDBX_INVALID (-30793) -/* Environment mapsize reached */ -#define MDBX_MAP_FULL (-30792) -/* Environment maxdbs reached */ -#define MDBX_DBS_FULL (-30791) -/* Environment maxreaders reached */ -#define MDBX_READERS_FULL (-30790) -/* Txn has too many dirty pages */ -#define MDBX_TXN_FULL (-30788) -/* Cursor stack too deep - internal error */ -#define MDBX_CURSOR_FULL (-30787) -/* Page has not enough space - internal error */ -#define MDBX_PAGE_FULL (-30786) -/* Database contents grew beyond environment mapsize */ -#define MDBX_MAP_RESIZED (-30785) -/* Operation and DB incompatible, or DB type changed. This can mean: - * - The operation expects an MDBX_DUPSORT / MDBX_DUPFIXED database. - * - Opening a named DB when the unnamed DB has MDBX_DUPSORT/MDBX_INTEGERKEY. - * - Accessing a data record as a database, or vice versa. - * - The database was dropped and recreated with different flags. */ -#define MDBX_INCOMPATIBLE (-30784) -/* Invalid reuse of reader locktable slot */ -#define MDBX_BAD_RSLOT (-30783) -/* Transaction must abort, has a child, or is invalid */ -#define MDBX_BAD_TXN (-30782) -/* Unsupported size of key/DB name/data, or wrong DUPFIXED size */ -#define MDBX_BAD_VALSIZE (-30781) -/* The specified DBI was changed unexpectedly */ -#define MDBX_BAD_DBI (-30780) -/* Unexpected problem - txn should abort */ -#define MDBX_PROBLEM (-30779) -/* Unexpected problem - txn should abort */ -#define MDBX_BUSY (-30778) -/* The last defined error code */ -#define MDBX_LAST_ERRCODE MDBX_BUSY - -/* The mdbx_put() or mdbx_replace() was called for key, - that has more that one associated value. */ -#define MDBX_EMULTIVAL (-30421) - -/* Bad signature of a runtime object(s), this can mean: - * - memory corruption or double-free; - * - ABI version mismatch (rare case); */ -#define MDBX_EBADSIGN (-30420) - -/* Database should be recovered, but this could NOT be done automatically - * right now (e.g. in readonly mode and so forth). */ -#define MDBX_WANNA_RECOVERY (-30419) - -/* The given key value is mismatched to the current cursor position, - * when mdbx_cursor_put() called with MDBX_CURRENT option. */ -#define MDBX_EKEYMISMATCH (-30418) - -/* Database is too large for current system, - * e.g. could NOT be mapped into RAM. */ -#define MDBX_TOO_LARGE (-30417) - -/* A thread has attempted to use a not owned object, - * e.g. a transaction that started by another thread. */ -#define MDBX_THREAD_MISMATCH (-30416) - -/* Statistics for a database in the environment */ -typedef struct MDBX_stat { - uint32_t ms_psize; /* Size of a database page. - * This is currently the same for all databases. */ - uint32_t ms_depth; /* Depth (height) of the B-tree */ - uint64_t ms_branch_pages; /* Number of internal (non-leaf) pages */ - uint64_t ms_leaf_pages; /* Number of leaf pages */ - uint64_t ms_overflow_pages; /* Number of overflow pages */ - uint64_t ms_entries; /* Number of data items */ -} MDBX_stat; - -/* Information about the environment */ -typedef struct MDBX_envinfo { - struct { - uint64_t lower; /* lower limit for datafile size */ - uint64_t upper; /* upper limit for datafile size */ - uint64_t current; /* current datafile size */ - uint64_t shrink; /* shrink theshold for datafile */ - uint64_t grow; /* growth step for datafile */ - } mi_geo; - uint64_t mi_mapsize; /* Size of the data memory map */ - uint64_t mi_last_pgno; /* ID of the last used page */ - uint64_t mi_recent_txnid; /* ID of the last committed transaction */ - uint64_t mi_latter_reader_txnid; /* ID of the last reader transaction */ - uint64_t mi_meta0_txnid, mi_meta0_sign; - uint64_t mi_meta1_txnid, mi_meta1_sign; - uint64_t mi_meta2_txnid, mi_meta2_sign; - uint32_t mi_maxreaders; /* max reader slots in the environment */ - uint32_t mi_numreaders; /* max reader slots used in the environment */ - uint32_t mi_dxb_pagesize; /* database pagesize */ - uint32_t mi_sys_pagesize; /* system pagesize */ -} MDBX_envinfo; - -/* Return a string describing a given error code. - * - * This function is a superset of the ANSI C X3.159-1989 (ANSI C) strerror(3) - * function. If the error code is greater than or equal to 0, then the string - * returned by the system function strerror(3) is returned. If the error code - * is less than 0, an error string corresponding to the MDBX library error is - * returned. See errors for a list of MDBX-specific error codes. - * - * [in] err The error code - * - * Returns "error message" The description of the error */ -LIBMDBX_API const char *mdbx_strerror(int errnum); -LIBMDBX_API const char *mdbx_strerror_r(int errnum, char *buf, size_t buflen); - -/* Create an MDBX environment handle. - * - * This function allocates memory for a MDBX_env structure. To release - * the allocated memory and discard the handle, call mdbx_env_close(). - * Before the handle may be used, it must be opened using mdbx_env_open(). - * Various other options may also need to be set before opening the handle, - * e.g. mdbx_env_set_mapsize(), mdbx_env_set_maxreaders(), - * mdbx_env_set_maxdbs(), depending on usage requirements. - * - * [out] env The address where the new handle will be stored - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_env_create(MDBX_env **penv); - -/* Open an environment handle. - * - * If this function fails, mdbx_env_close() must be called to discard - * the MDBX_env handle. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] path The directory in which the database files reside. - * This directory must already exist and be writable. - * [in] flags Special options for this environment. This parameter - * must be set to 0 or by bitwise OR'ing together one - * or more of the values described here. - * - * Flags set by mdbx_env_set_flags() are also used: - * - MDBX_NOSUBDIR - * By default, MDBX creates its environment in a directory whose - * pathname is given in path, and creates its data and lock files - * under that directory. With this option, path is used as-is for - * the database main data file. The database lock file is the path - * with "-lock" appended. - * - * - MDBX_RDONLY - * Open the environment in read-only mode. No write operations will - * be allowed. MDBX will still modify the lock file - except on - * read-only filesystems, where MDBX does not use locks. - * - * - MDBX_WRITEMAP - * Use a writeable memory map unless MDBX_RDONLY is set. This uses fewer - * mallocs but loses protection from application bugs like wild pointer - * writes and other bad updates into the database. - * This may be slightly faster for DBs that fit entirely in RAM, - * but is slower for DBs larger than RAM. - * Incompatible with nested transactions. - * Do not mix processes with and without MDBX_WRITEMAP on the same - * environment. This can defeat durability (mdbx_env_sync etc). - * - * - MDBX_NOMETASYNC - * Flush system buffers to disk only once per transaction, omit the - * metadata flush. Defer that until the system flushes files to disk, - * or next non-MDBX_RDONLY commit or mdbx_env_sync(). This optimization - * maintains database integrity, but a system crash may undo the last - * committed transaction. I.e. it preserves the ACI (atomicity, - * consistency, isolation) but not D (durability) database property. - * This flag may be changed at any time using mdbx_env_set_flags(). - * - * - MDBX_NOSYNC - * Don't flush system buffers to disk when committing a transaction. - * This optimization means a system crash can corrupt the database or - * lose the last transactions if buffers are not yet flushed to disk. - * The risk is governed by how often the system flushes dirty buffers - * to disk and how often mdbx_env_sync() is called. However, if the - * filesystem preserves write order and the MDBX_WRITEMAP and/or - * MDBX_LIFORECLAIM flags are not used, transactions exhibit ACI - * (atomicity, consistency, isolation) properties and only lose D - * (durability). I.e. database integrity is maintained, but a system - * crash may undo the final transactions. - * - * Note that (MDBX_NOSYNC | MDBX_WRITEMAP) leaves the system with no - * hint for when to write transactions to disk. - * Therefore the (MDBX_MAPASYNC | MDBX_WRITEMAP) may be preferable. - * This flag may be changed at any time using mdbx_env_set_flags(). - * - * - MDBX_UTTERLY_NOSYNC (internally MDBX_NOSYNC | MDBX_MAPASYNC) - * FIXME: TODO - * - * - MDBX_MAPASYNC - * When using MDBX_WRITEMAP, use asynchronous flushes to disk. As with - * MDBX_NOSYNC, a system crash can then corrupt the database or lose - * the last transactions. Calling mdbx_env_sync() ensures on-disk - * database integrity until next commit. This flag may be changed at - * any time using mdbx_env_set_flags(). - * - * - MDBX_NOTLS - * Don't use Thread-Local Storage. Tie reader locktable slots to - * MDBX_txn objects instead of to threads. I.e. mdbx_txn_reset() keeps - * the slot reseved for the MDBX_txn object. A thread may use parallel - * read-only transactions. A read-only transaction may span threads if - * the user synchronizes its use. Applications that multiplex many - * user threads over individual OS threads need this option. Such an - * application must also serialize the write transactions in an OS - * thread, since MDBX's write locking is unaware of the user threads. - * - * - MDBX_NOLOCK (don't supported by MDBX) - * Don't do any locking. If concurrent access is anticipated, the - * caller must manage all concurrency itself. For proper operation - * the caller must enforce single-writer semantics, and must ensure - * that no readers are using old transactions while a writer is - * active. The simplest approach is to use an exclusive lock so that - * no readers may be active at all when a writer begins. - * - * - MDBX_NORDAHEAD - * Turn off readahead. Most operating systems perform readahead on - * read requests by default. This option turns it off if the OS - * supports it. Turning it off may help random read performance - * when the DB is larger than RAM and system RAM is full. - * - * - MDBX_NOMEMINIT - * Don't initialize malloc'd memory before writing to unused spaces - * in the data file. By default, memory for pages written to the data - * file is obtained using malloc. While these pages may be reused in - * subsequent transactions, freshly malloc'd pages will be initialized - * to zeroes before use. This avoids persisting leftover data from other - * code (that used the heap and subsequently freed the memory) into the - * data file. Note that many other system libraries may allocate and free - * memory from the heap for arbitrary uses. E.g., stdio may use the heap - * for file I/O buffers. This initialization step has a modest performance - * cost so some applications may want to disable it using this flag. This - * option can be a problem for applications which handle sensitive data - * like passwords, and it makes memory checkers like Valgrind noisy. This - * flag is not needed with MDBX_WRITEMAP, which writes directly to the - * mmap instead of using malloc for pages. The initialization is also - * skipped if MDBX_RESERVE is used; the caller is expected to overwrite - * all of the memory that was reserved in that case. This flag may be - * changed at any time using mdbx_env_set_flags(). - * - * - MDBX_COALESCE - * Aim to coalesce records while reclaiming FreeDB. This flag may be - * changed at any time using mdbx_env_set_flags(). - * FIXME: TODO - * - * - MDBX_LIFORECLAIM - * LIFO policy for reclaiming FreeDB records. This significantly reduce - * write IPOs in case MDBX_NOSYNC with periodically checkpoints. - * FIXME: TODO - * - * [in] mode The UNIX permissions to set on created files. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_VERSION_MISMATCH - the version of the MDBX library doesn't match the - * version that created the database environment. - * - MDBX_INVALID - the environment file headers are corrupted. - * - MDBX_ENOENT - the directory specified by the path parameter - * doesn't exist. - * - MDBX_EACCES - the user didn't have permission to access - * the environment files. - * - MDBX_EAGAIN - the environment was locked by another process. */ -LIBMDBX_API int mdbx_env_open(MDBX_env *env, const char *path, unsigned flags, - mode_t mode); -LIBMDBX_API int mdbx_env_open_ex(MDBX_env *env, const char *path, - unsigned flags, mode_t mode, int *exclusive); - -/* Copy an MDBX environment to the specified path, with options. - * - * This function may be used to make a backup of an existing environment. - * No lockfile is created, since it gets recreated at need. - * NOTE: This call can trigger significant file size growth if run in - * parallel with write transactions, because it employs a read-only - * transaction. See long-lived transactions under "Caveats" section. - * - * [in] env An environment handle returned by mdbx_env_create(). It must - * have already been opened successfully. - * [in] path The directory in which the copy will reside. This directory - * must already exist and be writable but must otherwise be empty. - * [in] flags Special options for this operation. This parameter must be set - * to 0 or by bitwise OR'ing together one or more of the values - * described here: - * - * - MDBX_CP_COMPACT - * Perform compaction while copying: omit free pages and sequentially - * renumber all pages in output. This option consumes little bit more - * CPU for processing, but may running quickly than the default, on - * account skipping free pages. - * - * NOTE: Currently it fails if the environment has suffered a page leak. - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_env_copy(MDBX_env *env, const char *path, unsigned flags); - -/* Copy an MDBX environment to the specified file descriptor, - * with options. - * - * This function may be used to make a backup of an existing environment. - * No lockfile is created, since it gets recreated at need. See - * mdbx_env_copy() for further details. - * - * NOTE: This call can trigger significant file size growth if run in - * parallel with write transactions, because it employs a read-only - * transaction. See long-lived transactions under "Caveats" section. - * - * [in] env An environment handle returned by mdbx_env_create(). It must - * have already been opened successfully. - * [in] fd The filedescriptor to write the copy to. It must have already - * been opened for Write access. - * [in] flags Special options for this operation. See mdbx_env_copy() for - * options. - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_env_copy2fd(MDBX_env *env, mdbx_filehandle_t fd, - unsigned flags); - -/* Return statistics about the MDBX environment. - * - * [in] env An environment handle returned by mdbx_env_create() - * [out] stat The address of an MDBX_stat structure where the statistics - * will be copied */ -LIBMDBX_API int mdbx_env_stat(MDBX_env *env, MDBX_stat *stat, size_t bytes); - -/* Return information about the MDBX environment. - * - * [in] env An environment handle returned by mdbx_env_create() - * [out] stat The address of an MDBX_envinfo structure - * where the information will be copied */ -LIBMDBX_API int mdbx_env_info(MDBX_env *env, MDBX_envinfo *info, size_t bytes); - -/* Flush the data buffers to disk. - * - * Data is always written to disk when mdbx_txn_commit() is called, - * but the operating system may keep it buffered. MDBX always flushes - * the OS buffers upon commit as well, unless the environment was - * opened with MDBX_NOSYNC or in part MDBX_NOMETASYNC. This call is - * not valid if the environment was opened with MDBX_RDONLY. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] force If non-zero, force a synchronous flush. Otherwise if the - * environment has the MDBX_NOSYNC flag set the flushes will be - * omitted, and with MDBX_MAPASYNC they will be asynchronous. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EACCES - the environment is read-only. - * - MDBX_EINVAL - an invalid parameter was specified. - * - MDBX_EIO - an error occurred during synchronization. */ -LIBMDBX_API int mdbx_env_sync(MDBX_env *env, int force); - -/* Close the environment and release the memory map. - * - * Only a single thread may call this function. All transactions, databases, - * and cursors must already be closed before calling this function. Attempts - * to use any such handles after calling this function will cause a SIGSEGV. - * The environment handle will be freed and must not be used again after this - * call. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] dont_sync A dont'sync flag, if non-zero the last checkpoint (meta-page - * update) will be kept "as is" and may be still "weak" in the - * NOSYNC/MAPASYNC modes. Such "weak" checkpoint will be - * ignored on opening next time, and transactions since the - * last non-weak checkpoint (meta-page update) will rolledback - * for consistency guarantee. */ -LIBMDBX_API void mdbx_env_close(MDBX_env *env); - -/* Set environment flags. - * - * This may be used to set some flags in addition to those from - * mdbx_env_open(), or to unset these flags. If several threads - * change the flags at the same time, the result is undefined. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] flags The flags to change, bitwise OR'ed together - * [in] onoff A non-zero value sets the flags, zero clears them. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_env_set_flags(MDBX_env *env, unsigned flags, int onoff); - -/* Get environment flags. - * - * [in] env An environment handle returned by mdbx_env_create() - * [out] flags The address of an integer to store the flags - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_env_get_flags(MDBX_env *env, unsigned *flags); - -/* Return the path that was used in mdbx_env_open(). - * - * [in] env An environment handle returned by mdbx_env_create() - * [out] path Address of a string pointer to contain the path. - * This is the actual string in the environment, not a copy. - * It should not be altered in any way. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_env_get_path(MDBX_env *env, const char **path); - -/* Return the file descriptor for the given environment. - * - * NOTE: All MDBX file descriptors have FD_CLOEXEC and - * could't be used after exec() and or fork(). - * - * [in] env An environment handle returned by mdbx_env_create() - * [out] fd Address of a int to contain the descriptor. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_env_get_fd(MDBX_env *env, mdbx_filehandle_t *fd); - -/* Set the size of the memory map to use for this environment. - * - * The size should be a multiple of the OS page size. The default is - * 10485760 bytes. The size of the memory map is also the maximum size - * of the database. The value should be chosen as large as possible, - * to accommodate future growth of the database. - * This function should be called after mdbx_env_create() and before - * mdbx_env_open(). It may be called at later times if no transactions - * are active in this process. Note that the library does not check for - * this condition, the caller must ensure it explicitly. - * - * The new size takes effect immediately for the current process but - * will not be persisted to any others until a write transaction has been - * committed by the current process. Also, only mapsize increases are - * persisted into the environment. - * - * If the mapsize is increased by another process, and data has grown - * beyond the range of the current mapsize, mdbx_txn_begin() will - * return MDBX_MAP_RESIZED. This function may be called with a size - * of zero to adopt the new size. - * - * Any attempt to set a size smaller than the space already consumed by the - * environment will be silently changed to the current size of the used space. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] size The size in bytes - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified, - * or the environment has an active write transaction. */ -LIBMDBX_API int mdbx_env_set_mapsize(MDBX_env *env, size_t size); -LIBMDBX_API int mdbx_env_set_geometry(MDBX_env *env, intptr_t size_lower, - intptr_t size_now, intptr_t size_upper, - intptr_t growth_step, - intptr_t shrink_threshold, - intptr_t pagesize); - -/* Set the maximum number of threads/reader slots for the environment. - * - * This defines the number of slots in the lock table that is used to track - * readers in the the environment. The default is 61. - * Starting a read-only transaction normally ties a lock table slot to the - * current thread until the environment closes or the thread exits. If - * MDBX_NOTLS is in use, mdbx_txn_begin() instead ties the slot to the - * MDBX_txn object until it or the MDBX_env object is destroyed. - * This function may only be called after mdbx_env_create() and before - * mdbx_env_open(). - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] readers The maximum number of reader lock table slots - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified, - * or the environment is already open. */ -LIBMDBX_API int mdbx_env_set_maxreaders(MDBX_env *env, unsigned readers); - -/* Get the maximum number of threads/reader slots for the environment. - * - * [in] env An environment handle returned by mdbx_env_create() - * [out] readers Address of an integer to store the number of readers - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_env_get_maxreaders(MDBX_env *env, unsigned *readers); - -/* Set the maximum number of named databases for the environment. - * - * This function is only needed if multiple databases will be used in the - * environment. Simpler applications that use the environment as a single - * unnamed database can ignore this option. - * This function may only be called after mdbx_env_create() and before - * mdbx_env_open(). - * - * Currently a moderate number of slots are cheap but a huge number gets - * expensive: 7-120 words per transaction, and every mdbx_dbi_open() - * does a linear search of the opened slots. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] dbs The maximum number of databases - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified, - * or the environment is already open. */ -LIBMDBX_API int mdbx_env_set_maxdbs(MDBX_env *env, MDBX_dbi dbs); - -/* Get the maximum size of keys and MDBX_DUPSORT data we can write. - * - * [in] env An environment handle returned by mdbx_env_create() - * - * Returns The maximum size of a key we can write. */ -LIBMDBX_API int mdbx_env_get_maxkeysize(MDBX_env *env); -LIBMDBX_API int mdbx_get_maxkeysize(size_t pagesize); - -/* Set application information associated with the MDBX_env. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] ctx An arbitrary pointer for whatever the application needs. - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_env_set_userctx(MDBX_env *env, void *ctx); - -/* Get the application information associated with the MDBX_env. - * - * [in] env An environment handle returned by mdbx_env_create() - * Returns The pointer set by mdbx_env_set_userctx(). */ -LIBMDBX_API void *mdbx_env_get_userctx(MDBX_env *env); - -/* A callback function for most MDBX assert() failures, - * called before printing the message and aborting. - * - * [in] env An environment handle returned by mdbx_env_create(). - * [in] msg The assertion message, not including newline. */ -typedef void MDBX_assert_func(const MDBX_env *env, const char *msg, - const char *function, unsigned line); - -/* Set or reset the assert() callback of the environment. - * - * Disabled if libmdbx is buillt with MDBX_DEBUG=0. - * NOTE: This hack should become obsolete as mdbx's error handling matures. - * - * [in] env An environment handle returned by mdbx_env_create(). - * [in] func An MDBX_assert_func function, or 0. - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_env_set_assert(MDBX_env *env, MDBX_assert_func *func); - -/* Create a transaction for use with the environment. - * - * The transaction handle may be discarded using mdbx_txn_abort() - * or mdbx_txn_commit(). - * NOTE: A transaction and its cursors must only be used by a single - * thread, and a thread may only have a single transaction at a time. - * If MDBX_NOTLS is in use, this does not apply to read-only transactions. - * NOTE: Cursors may not span transactions. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] parent If this parameter is non-NULL, the new transaction will be - * a nested transaction, with the transaction indicated by parent - * as its parent. Transactions may be nested to any level. - * A parent transaction and its cursors may not issue any other - * operations than mdbx_txn_commit and mdbx_txn_abort while it - * has active child transactions. - * [in] flags Special options for this transaction. This parameter - * must be set to 0 or by bitwise OR'ing together one or more - * of the values described here. - * - * - MDBX_RDONLY - * This transaction will not perform any write operations. - * - * - MDBX_TRYTXN - * Do not block when starting a write transaction - * - * [out] txn Address where the new MDBX_txn handle will be stored - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_PANIC - a fatal error occurred earlier and the environment - * must be shut down. - * - MDBX_MAP_RESIZED - another process wrote data beyond this MDBX_env's - * mapsize and this environment's map must be resized - * as well. See mdbx_env_set_mapsize(). - * - MDBX_READERS_FULL - a read-only transaction was requested and the reader - * lock table is full. See mdbx_env_set_maxreaders(). - * - MDBX_ENOMEM - out of memory. - * - MDBX_BUSY - a write transaction is already started. */ -LIBMDBX_API int mdbx_txn_begin(MDBX_env *env, MDBX_txn *parent, unsigned flags, - MDBX_txn **txn); - -/* Returns the transaction's MDBX_env - * - * [in] txn A transaction handle returned by mdbx_txn_begin() */ -LIBMDBX_API MDBX_env *mdbx_txn_env(MDBX_txn *txn); - -/* Return the transaction's ID. - * - * This returns the identifier associated with this transaction. For a - * read-only transaction, this corresponds to the snapshot being read; - * concurrent readers will frequently have the same transaction ID. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * - * Returns A transaction ID, valid if input is an active transaction. */ -LIBMDBX_API uint64_t mdbx_txn_id(MDBX_txn *txn); - -/* Commit all the operations of a transaction into the database. - * - * The transaction handle is freed. It and its cursors must not be used - * again after this call, except with mdbx_cursor_renew(). - * - * A cursor must be closed explicitly always, before - * or after its transaction ends. It can be reused with - * mdbx_cursor_renew() before finally closing it. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. - * - MDBX_ENOSPC - no more disk space. - * - MDBX_EIO - a low-level I/O error occurred while writing. - * - MDBX_ENOMEM - out of memory. */ -LIBMDBX_API int mdbx_txn_commit(MDBX_txn *txn); - -/* Abandon all the operations of the transaction instead of saving them. - * - * The transaction handle is freed. It and its cursors must not be used - * again after this call, except with mdbx_cursor_renew(). - * - * A cursor must be closed explicitly always, before or after its transaction - * ends. It can be reused with mdbx_cursor_renew() before finally closing it. - * - * [in] txn A transaction handle returned by mdbx_txn_begin(). */ -LIBMDBX_API int mdbx_txn_abort(MDBX_txn *txn); - -/* Reset a read-only transaction. - * - * Abort the transaction like mdbx_txn_abort(), but keep the transaction - * handle. Therefore mdbx_txn_renew() may reuse the handle. This saves - * allocation overhead if the process will start a new read-only transaction - * soon, and also locking overhead if MDBX_NOTLS is in use. The reader table - * lock is released, but the table slot stays tied to its thread or - * MDBX_txn. Use mdbx_txn_abort() to discard a reset handle, and to free - * its lock table slot if MDBX_NOTLS is in use. - * - * Cursors opened within the transaction must not be used - * again after this call, except with mdbx_cursor_renew(). - * - * Reader locks generally don't interfere with writers, but they keep old - * versions of database pages allocated. Thus they prevent the old pages - * from being reused when writers commit new data, and so under heavy load - * the database size may grow much more rapidly than otherwise. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() */ -LIBMDBX_API int mdbx_txn_reset(MDBX_txn *txn); - -/* Renew a read-only transaction. - * - * This acquires a new reader lock for a transaction handle that had been - * released by mdbx_txn_reset(). It must be called before a reset transaction - * may be used again. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_PANIC - a fatal error occurred earlier and the environment - * must be shut down. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_txn_renew(MDBX_txn *txn); - -/* Open a table in the environment. - * - * A table handle denotes the name and parameters of a table, independently - * of whether such a table exists. The table handle may be discarded by - * calling mdbx_dbi_close(). The old table handle is returned if the table - * was already open. The handle may only be closed once. - * - * The table handle will be private to the current transaction until - * the transaction is successfully committed. If the transaction is - * aborted the handle will be closed automatically. - * After a successful commit the handle will reside in the shared - * environment, and may be used by other transactions. - * - * This function must not be called from multiple concurrent - * transactions in the same process. A transaction that uses - * this function must finish (either commit or abort) before - * any other transaction in the process may use this function. - * - * To use named table (with name != NULL), mdbx_env_set_maxdbs() - * must be called before opening the environment. Table names are - * keys in the internal unnamed table, and may be read but not written. - * - * [in] txn transaction handle returned by mdbx_txn_begin() - * [in] name The name of the table to open. If only a single - * table is needed in the environment, this value may be NULL. - * [in] flags Special options for this table. This parameter must be set - * to 0 or by bitwise OR'ing together one or more of the values - * described here: - * - MDBX_REVERSEKEY - * Keys are strings to be compared in reverse order, from the end - * of the strings to the beginning. By default, Keys are treated as - * strings and compared from beginning to end. - * - MDBX_DUPSORT - * Duplicate keys may be used in the table. Or, from another point of - * view, keys may have multiple data items, stored in sorted order. By - * default keys must be unique and may have only a single data item. - * - MDBX_INTEGERKEY - * Keys are binary integers in native byte order, either uin32_t or - * uint64_t, and will be sorted as such. The keys must all be of the - * same size. - * - MDBX_DUPFIXED - * This flag may only be used in combination with MDBX_DUPSORT. This - * option tells the library that the data items for this database are - * all the same size, which allows further optimizations in storage and - * retrieval. When all data items are the same size, the MDBX_GET_MULTIPLE, - * MDBX_NEXT_MULTIPLE and MDBX_PREV_MULTIPLE cursor operations may be used - * to retrieve multiple items at once. - * - MDBX_INTEGERDUP - * This option specifies that duplicate data items are binary integers, - * similar to MDBX_INTEGERKEY keys. - * - MDBX_REVERSEDUP - * This option specifies that duplicate data items should be compared as - * strings in reverse order (the comparison is performed in the direction - * from the last byte to the first). - * - MDBX_CREATE - * Create the named database if it doesn't exist. This option is not - * allowed in a read-only transaction or a read-only environment. - * - * [out] dbi Address where the new MDBX_dbi handle will be stored - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_NOTFOUND - the specified database doesn't exist in the - * environment and MDBX_CREATE was not specified. - * - MDBX_DBS_FULL - too many databases have been opened. - * See mdbx_env_set_maxdbs(). */ -LIBMDBX_API int mdbx_dbi_open_ex(MDBX_txn *txn, const char *name, - unsigned flags, MDBX_dbi *dbi, - MDBX_cmp_func *keycmp, MDBX_cmp_func *datacmp); -LIBMDBX_API int mdbx_dbi_open(MDBX_txn *txn, const char *name, unsigned flags, - MDBX_dbi *dbi); - -/* Retrieve statistics for a database. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [out] stat The address of an MDBX_stat structure where the statistics - * will be copied - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_dbi_stat(MDBX_txn *txn, MDBX_dbi dbi, MDBX_stat *stat, - size_t bytes); - -/* Retrieve the DB flags for a database handle. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [out] flags Address where the flags will be returned. - * [out] state Address where the state will be returned. - * - * Returns A non-zero error value on failure and 0 on success. */ -#define MDBX_TBL_DIRTY 0x01 /* DB was written in this txn */ -#define MDBX_TBL_STALE 0x02 /* Named-DB record is older than txnID */ -#define MDBX_TBL_NEW 0x04 /* Named-DB handle opened in this txn */ -LIBMDBX_API int mdbx_dbi_flags_ex(MDBX_txn *txn, MDBX_dbi dbi, unsigned *flags, - unsigned *state); -LIBMDBX_API int mdbx_dbi_flags(MDBX_txn *txn, MDBX_dbi dbi, unsigned *flags); - -/* Close a database handle. Normally unnecessary. - * - * Use with care: - * FIXME: This call is not mutex protected. Handles should only be closed by - * a single thread, and only if no other threads are going to reference - * the database handle or one of its cursors any further. Do not close - * a handle if an existing transaction has modified its database. - * Doing so can cause misbehavior from database corruption to errors - * like MDBX_BAD_VALSIZE (since the DB name is gone). - * - * Closing a database handle is not necessary, but lets mdbx_dbi_open() - * reuse the handle value. Usually it's better to set a bigger - * mdbx_env_set_maxdbs(), unless that value would be large. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] dbi A database handle returned by mdbx_dbi_open() - */ -LIBMDBX_API int mdbx_dbi_close(MDBX_env *env, MDBX_dbi dbi); - -/* Empty or delete+close a database. - * - * See mdbx_dbi_close() for restrictions about closing the DB handle. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [in] del 0 to empty the DB, 1 to delete it from the environment - * and close the DB handle. - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_drop(MDBX_txn *txn, MDBX_dbi dbi, int del); - -/* Get items from a database. - * - * This function retrieves key/data pairs from the database. The address - * and length of the data associated with the specified key are returned - * in the structure to which data refers. - * If the database supports duplicate keys (MDBX_DUPSORT) then the - * first data item for the key will be returned. Retrieval of other - * items requires the use of mdbx_cursor_get(). - * - * NOTE: The memory pointed to by the returned values is owned by the - * database. The caller need not dispose of the memory, and may not - * modify it in any way. For values returned in a read-only transaction - * any modification attempts will cause a SIGSEGV. - * - * NOTE: Values returned from the database are valid only until a - * subsequent update operation, or the end of the transaction. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [in] key The key to search for in the database - * [in,out] data The data corresponding to the key - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_NOTFOUND - the key was not in the database. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_get(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *data); - -/* Store items into a database. - * - * This function stores key/data pairs in the database. The default behavior - * is to enter the new key/data pair, replacing any previously existing key - * if duplicates are disallowed, or adding a duplicate data item if - * duplicates are allowed (MDBX_DUPSORT). - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [in] key The key to store in the database - * [in,out] data The data to store - * [in] flags Special options for this operation. This parameter must be - * set to 0 or by bitwise OR'ing together one or more of the - * values described here. - * - * - MDBX_NODUPDATA - * Enter the new key/data pair only if it does not already appear - * in the database. This flag may only be specified if the database - * was opened with MDBX_DUPSORT. The function will return MDBX_KEYEXIST - * if the key/data pair already appears in the database. - * - * - MDBX_NOOVERWRITE - * Enter the new key/data pair only if the key does not already appear - * in the database. The function will return MDBX_KEYEXIST if the key - * already appears in the database, even if the database supports - * duplicates (MDBX_DUPSORT). The data parameter will be set to point - * to the existing item. - * - * - MDBX_CURRENT - * Update an single existing entry, but not add new ones. The function - * will return MDBX_NOTFOUND if the given key not exist in the database. - * Or the MDBX_EMULTIVAL in case duplicates for the given key. - * - * - MDBX_RESERVE - * Reserve space for data of the given size, but don't copy the given - * data. Instead, return a pointer to the reserved space, which the - * caller can fill in later - before the next update operation or the - * transaction ends. This saves an extra memcpy if the data is being - * generated later. MDBX does nothing else with this memory, the caller - * is expected to modify all of the space requested. This flag must not - * be specified if the database was opened with MDBX_DUPSORT. - * - * - MDBX_APPEND - * Append the given key/data pair to the end of the database. This option - * allows fast bulk loading when keys are already known to be in the - * correct order. Loading unsorted keys with this flag will cause - * a MDBX_EKEYMISMATCH error. - * - * - MDBX_APPENDDUP - * As above, but for sorted dup data. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_KEYEXIST - * - MDBX_MAP_FULL - the database is full, see mdbx_env_set_mapsize(). - * - MDBX_TXN_FULL - the transaction has too many dirty pages. - * - MDBX_EACCES - an attempt was made to write in a read-only transaction. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_put(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *data, unsigned flags); - -/* Delete items from a database. - * - * This function removes key/data pairs from the database. - * - * The data parameter is NOT ignored regardless the database does - * support sorted duplicate data items or not. If the data parameter - * is non-NULL only the matching data item will be deleted. - * - * This function will return MDBX_NOTFOUND if the specified key/data - * pair is not in the database. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [in] key The key to delete from the database - * [in] data The data to delete - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EACCES - an attempt was made to write in a read-only transaction. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_del(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *data); - -/* Create a cursor handle. - * - * A cursor is associated with a specific transaction and database. - * A cursor cannot be used when its database handle is closed. Nor - * when its transaction has ended, except with mdbx_cursor_renew(). - * It can be discarded with mdbx_cursor_close(). - * - * A cursor must be closed explicitly always, before - * or after its transaction ends. It can be reused with - * mdbx_cursor_renew() before finally closing it. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [out] cursor Address where the new MDBX_cursor handle will be stored - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_cursor_open(MDBX_txn *txn, MDBX_dbi dbi, - MDBX_cursor **cursor); - -/* Close a cursor handle. - * - * The cursor handle will be freed and must not be used again after this call. - * Its transaction must still be live if it is a write-transaction. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() */ -LIBMDBX_API void mdbx_cursor_close(MDBX_cursor *cursor); - -/* Renew a cursor handle. - * - * A cursor is associated with a specific transaction and database. - * Cursors that are only used in read-only transactions may be re-used, - * to avoid unnecessary malloc/free overhead. The cursor may be associated - * with a new read-only transaction, and referencing the same database handle - * as it was created with. - * - * This may be done whether the previous transaction is live or dead. - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] cursor A cursor handle returned by mdbx_cursor_open() - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_cursor_renew(MDBX_txn *txn, MDBX_cursor *cursor); - -/* Return the cursor's transaction handle. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() */ -LIBMDBX_API MDBX_txn *mdbx_cursor_txn(MDBX_cursor *cursor); - -/* Return the cursor's database handle. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() */ -LIBMDBX_API MDBX_dbi mdbx_cursor_dbi(MDBX_cursor *cursor); - -/* Retrieve by cursor. - * - * This function retrieves key/data pairs from the database. The address and - * length of the key are returned in the object to which key refers (except - * for the case of the MDBX_SET option, in which the key object is unchanged), - * and the address and length of the data are returned in the object to which - * data refers. See mdbx_get() for restrictions on using the output values. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() - * [in,out] key The key for a retrieved item - * [in,out] data The data of a retrieved item - * [in] op A cursor operation MDBX_cursor_op - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_NOTFOUND - no matching key found. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_cursor_get(MDBX_cursor *cursor, MDBX_val *key, - MDBX_val *data, MDBX_cursor_op op); - -/* Store by cursor. - * - * This function stores key/data pairs into the database. The cursor is - * positioned at the new item, or on failure usually near it. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() - * [in] key The key operated on. - * [in] data The data operated on. - * [in] flags Options for this operation. This parameter - * must be set to 0 or one of the values described here: - * - * - MDBX_CURRENT - * Replace the item at the current cursor position. The key parameter - * must still be provided, and must match it, otherwise the function - * return MDBX_EKEYMISMATCH. - * - * NOTE: MDBX unlike LMDB allows you to change the size of the data and - * automatically handles reordering for sorted duplicates (MDBX_DUPSORT). - * - * - MDBX_NODUPDATA - * Enter the new key/data pair only if it does not already appear in the - * database. This flag may only be specified if the database was opened - * with MDBX_DUPSORT. The function will return MDBX_KEYEXIST if the - * key/data pair already appears in the database. - * - * - MDBX_NOOVERWRITE - * Enter the new key/data pair only if the key does not already appear - * in the database. The function will return MDBX_KEYEXIST if the key - * already appears in the database, even if the database supports - * duplicates (MDBX_DUPSORT). - * - * - MDBX_RESERVE - * Reserve space for data of the given size, but don't copy the given - * data. Instead, return a pointer to the reserved space, which the - * caller can fill in later - before the next update operation or the - * transaction ends. This saves an extra memcpy if the data is being - * generated later. This flag must not be specified if the database - * was opened with MDBX_DUPSORT. - * - * - MDBX_APPEND - * Append the given key/data pair to the end of the database. No key - * comparisons are performed. This option allows fast bulk loading when - * keys are already known to be in the correct order. Loading unsorted - * keys with this flag will cause a MDBX_KEYEXIST error. - * - * - MDBX_APPENDDUP - * As above, but for sorted dup data. - * - * - MDBX_MULTIPLE - * Store multiple contiguous data elements in a single request. This flag - * may only be specified if the database was opened with MDBX_DUPFIXED. - * The data argument must be an array of two MDBX_vals. The iov_len of the - * first MDBX_val must be the size of a single data element. The iov_base - * of the first MDBX_val must point to the beginning of the array of - * contiguous data elements. The iov_len of the second MDBX_val must be - * the count of the number of data elements to store. On return this - * field will be set to the count of the number of elements actually - * written. The iov_base of the second MDBX_val is unused. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EKEYMISMATCH - * - MDBX_MAP_FULL - the database is full, see mdbx_env_set_mapsize(). - * - MDBX_TXN_FULL - the transaction has too many dirty pages. - * - MDBX_EACCES - an attempt was made to write in a read-only transaction. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_cursor_put(MDBX_cursor *cursor, MDBX_val *key, - MDBX_val *data, unsigned flags); - -/* Delete current key/data pair - * - * This function deletes the key/data pair to which the cursor refers. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() - * [in] flags Options for this operation. This parameter must be set to 0 - * or one of the values described here. - * - * - MDBX_NODUPDATA - * Delete all of the data items for the current key. This flag may only - * be specified if the database was opened with MDBX_DUPSORT. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EACCES - an attempt was made to write in a read-only transaction. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_cursor_del(MDBX_cursor *cursor, unsigned flags); - -/* Return count of duplicates for current key. - * - * This call is only valid on databases that support sorted duplicate data - * items MDBX_DUPSORT. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() - * [out] countp Address where the count will be stored - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EINVAL - cursor is not initialized, or an invalid parameter - * was specified. */ -LIBMDBX_API int mdbx_cursor_count(MDBX_cursor *cursor, size_t *countp); - -/* Compare two data items according to a particular database. - * - * This returns a comparison as if the two data items were keys in the - * specified database. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [in] a The first item to compare - * [in] b The second item to compare - * - * Returns < 0 if a < b, 0 if a == b, > 0 if a > b */ -LIBMDBX_API int mdbx_cmp(MDBX_txn *txn, MDBX_dbi dbi, const MDBX_val *a, - const MDBX_val *b); - -/* Compare two data items according to a particular database. - * - * This returns a comparison as if the two items were data items of - * the specified database. The database must have the MDBX_DUPSORT flag. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [in] a The first item to compare - * [in] b The second item to compare - * - * Returns < 0 if a < b, 0 if a == b, > 0 if a > b */ -LIBMDBX_API int mdbx_dcmp(MDBX_txn *txn, MDBX_dbi dbi, const MDBX_val *a, - const MDBX_val *b); - -/* A callback function used to print a message from the library. - * - * [in] msg The string to be printed. - * [in] ctx An arbitrary context pointer for the callback. - * - * Returns < 0 on failure, >= 0 on success. */ -typedef int(MDBX_msg_func)(const char *msg, void *ctx); - -/* Dump the entries in the reader lock table. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] func A MDBX_msg_func function - * [in] ctx Anything the message function needs - * - * Returns < 0 on failure, >= 0 on success. */ -LIBMDBX_API int mdbx_reader_list(MDBX_env *env, MDBX_msg_func *func, void *ctx); - -/* Check for stale entries in the reader lock table. - * - * [in] env An environment handle returned by mdbx_env_create() - * [out] dead Number of stale slots that were cleared - * - * Returns 0 on success, non-zero on failure. */ -LIBMDBX_API int mdbx_reader_check(MDBX_env *env, int *dead); - -LIBMDBX_API char *mdbx_dkey(const MDBX_val *key, char *const buf, - const size_t bufsize); - -LIBMDBX_API int mdbx_env_close_ex(MDBX_env *env, int dont_sync); - -/* Set threshold to force flush the data buffers to disk, - * even of MDBX_NOSYNC, MDBX_NOMETASYNC and MDBX_MAPASYNC flags - * in the environment. - * - * Data is always written to disk when mdbx_txn_commit() is called, - * but the operating system may keep it buffered. MDBX always flushes - * the OS buffers upon commit as well, unless the environment was - * opened with MDBX_NOSYNC or in part MDBX_NOMETASYNC. - * - * The default is 0, than mean no any threshold checked, and no additional - * flush will be made. - * - * [in] env An environment handle returned by mdbx_env_create() - * [in] bytes The size in bytes of summary changes when a synchronous - * flush would be made. - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_env_set_syncbytes(MDBX_env *env, size_t bytes); - -/* Returns a lag of the reading for the given transaction. - * - * Returns an information for estimate how much given read-only - * transaction is lagging relative the to actual head. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [out] percent Percentage of page allocation in the database. - * - * Returns Number of transactions committed after the given was started for - * read, or -1 on failure. */ -LIBMDBX_API int mdbx_txn_straggler(MDBX_txn *txn, int *percent); - -/* A callback function for killing a laggard readers, - * but also could waiting ones. Called in case of MDBX_MAP_FULL error. - * - * [in] env An environment handle returned by mdbx_env_create(). - * [in] pid pid of the reader process. - * [in] tid thread_id of the reader thread. - * [in] txn Transaction number on which stalled. - * [in] gap A lag from the last commited txn. - * [in] retry A retry number, less that zero for notify end of OOM-loop. - * - * Returns -1 on failure (reader is not killed), - * 0 should wait or retry, - * 1 drop reader txn-lock (reading-txn was aborted), - * >1 drop reader registration (reader process was killed). */ -typedef int(MDBX_oom_func)(MDBX_env *env, int pid, mdbx_tid_t tid, uint64_t txn, - unsigned gap, int retry); - -/* Set the OOM callback. - * - * Callback will be called only on out-of-pages case for killing - * a laggard readers to allowing reclaiming of freeDB. - * - * [in] env An environment handle returned by mdbx_env_create(). - * [in] oomfunc A MDBX_oom_func function or NULL to disable. - * - * Returns A non-zero error value on failure and 0 on success. */ -LIBMDBX_API int mdbx_env_set_oomfunc(MDBX_env *env, MDBX_oom_func *oom_func); - -/* Get the current oom_func callback. - * - * Callback will be called only on out-of-pages case for killing - * a laggard readers to allowing reclaiming of freeDB. - * - * [in] env An environment handle returned by mdbx_env_create(). - * - * Returns A MDBX_oom_func function or NULL if disabled. */ -LIBMDBX_API MDBX_oom_func *mdbx_env_get_oomfunc(MDBX_env *env); - -#define MDBX_DBG_ASSERT 1 -#define MDBX_DBG_PRINT 2 -#define MDBX_DBG_TRACE 4 -#define MDBX_DBG_EXTRA 8 -#define MDBX_DBG_AUDIT 16 -#define MDBX_DBG_JITTER 32 -#define MDBX_DBG_DUMP 64 - -typedef void MDBX_debug_func(int type, const char *function, int line, - const char *msg, va_list args); - -LIBMDBX_API int mdbx_setup_debug(int flags, MDBX_debug_func *logger); - -typedef int MDBX_pgvisitor_func(uint64_t pgno, unsigned pgnumber, void *ctx, - const char *dbi, const char *type, - size_t nentries, size_t payload_bytes, - size_t header_bytes, size_t unused_bytes); -LIBMDBX_API int mdbx_env_pgwalk(MDBX_txn *txn, MDBX_pgvisitor_func *visitor, - void *ctx); - -typedef struct mdbx_canary { uint64_t x, y, z, v; } mdbx_canary; - -LIBMDBX_API int mdbx_canary_put(MDBX_txn *txn, const mdbx_canary *canary); -LIBMDBX_API int mdbx_canary_get(MDBX_txn *txn, mdbx_canary *canary); - -/* Returns: - * - MDBX_RESULT_TRUE - * when no more data available or cursor not positioned; - * - MDBX_RESULT_FALSE - * when data available; - * - Otherwise the error code. */ -LIBMDBX_API int mdbx_cursor_eof(MDBX_cursor *mc); - -/* Returns: MDBX_RESULT_TRUE, MDBX_RESULT_FALSE or Error code. */ -LIBMDBX_API int mdbx_cursor_on_first(MDBX_cursor *mc); - -/* Returns: MDBX_RESULT_TRUE, MDBX_RESULT_FALSE or Error code. */ -LIBMDBX_API int mdbx_cursor_on_last(MDBX_cursor *mc); - -LIBMDBX_API int mdbx_replace(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *new_data, MDBX_val *old_data, - unsigned flags); -/* Same as mdbx_get(), but: - * 1) if values_count is not NULL, then returns the count - * of multi-values/duplicates for a given key. - * 2) updates the key for pointing to the actual key's data inside DB. */ -LIBMDBX_API int mdbx_get_ex(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *data, size_t *values_count); - -LIBMDBX_API int mdbx_is_dirty(const MDBX_txn *txn, const void *ptr); - -LIBMDBX_API int mdbx_dbi_sequence(MDBX_txn *txn, MDBX_dbi dbi, uint64_t *result, - uint64_t increment); - -/*----------------------------------------------------------------------------*/ -/* attribute support functions for Nexenta */ -typedef uint_fast64_t mdbx_attr_t; - -/* Store by cursor with attribute. - * - * This function stores key/data pairs into the database. The cursor is - * positioned at the new item, or on failure usually near it. - * - * NOTE: Internally based on MDBX_RESERVE feature, - * therefore doesn't support MDBX_DUPSORT. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() - * [in] key The key operated on. - * [in] data The data operated on. - * [in] attr The attribute. - * [in] flags Options for this operation. This parameter must be set to 0 - * or one of the values described here: - * - * - MDBX_CURRENT - * Replace the item at the current cursor position. The key parameter - * must still be provided, and must match it, otherwise the function - * return MDBX_EKEYMISMATCH. - * - * - MDBX_APPEND - * Append the given key/data pair to the end of the database. No key - * comparisons are performed. This option allows fast bulk loading when - * keys are already known to be in the correct order. Loading unsorted - * keys with this flag will cause a MDBX_KEYEXIST error. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_EKEYMISMATCH - * - MDBX_MAP_FULL - the database is full, see mdbx_env_set_mapsize(). - * - MDBX_TXN_FULL - the transaction has too many dirty pages. - * - MDBX_EACCES - an attempt was made to write in a read-only transaction. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_cursor_put_attr(MDBX_cursor *cursor, MDBX_val *key, - MDBX_val *data, mdbx_attr_t attr, - unsigned flags); - -/* Store items and attributes into a database. - * - * This function stores key/data pairs in the database. The default behavior - * is to enter the new key/data pair, replacing any previously existing key - * if duplicates are disallowed. - * - * NOTE: Internally based on MDBX_RESERVE feature, - * therefore doesn't support MDBX_DUPSORT. - * - * [in] txn A transaction handle returned by mdbx_txn_begin(). - * [in] dbi A database handle returned by mdbx_dbi_open(). - * [in] key The key to store in the database. - * [in] attr The attribute to store in the database. - * [in,out] data The data to store. - * [in] flags Special options for this operation. This parameter must be - * set to 0 or by bitwise OR'ing together one or more of the - * values described here: - * - * - MDBX_NOOVERWRITE - * Enter the new key/data pair only if the key does not already appear - * in the database. The function will return MDBX_KEYEXIST if the key - * already appears in the database. The data parameter will be set to - * point to the existing item. - * - * - MDBX_CURRENT - * Update an single existing entry, but not add new ones. The function - * will return MDBX_NOTFOUND if the given key not exist in the database. - * Or the MDBX_EMULTIVAL in case duplicates for the given key. - * - * - MDBX_APPEND - * Append the given key/data pair to the end of the database. This option - * allows fast bulk loading when keys are already known to be in the - * correct order. Loading unsorted keys with this flag will cause - * a MDBX_EKEYMISMATCH error. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_KEYEXIST - * - MDBX_MAP_FULL - the database is full, see mdbx_env_set_mapsize(). - * - MDBX_TXN_FULL - the transaction has too many dirty pages. - * - MDBX_EACCES - an attempt was made to write in a read-only transaction. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_put_attr(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *data, mdbx_attr_t attr, unsigned flags); - -/* Set items attribute from a database. - * - * This function stores key/data pairs attribute to the database. - * - * NOTE: Internally based on MDBX_RESERVE feature, - * therefore doesn't support MDBX_DUPSORT. - * - * [in] txn A transaction handle returned by mdbx_txn_begin(). - * [in] dbi A database handle returned by mdbx_dbi_open(). - * [in] key The key to search for in the database. - * [in] data The data to be stored or NULL to save previous value. - * [in] attr The attribute to be stored. - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_NOTFOUND - the key-value pair was not in the database. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_set_attr(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *data, mdbx_attr_t attr); - -/* Get items attribute from a database cursor. - * - * This function retrieves key/data pairs from the database. The address and - * length of the key are returned in the object to which key refers (except - * for the case of the MDBX_SET option, in which the key object is unchanged), - * and the address and length of the data are returned in the object to which - * data refers. See mdbx_get() for restrictions on using the output values. - * - * [in] cursor A cursor handle returned by mdbx_cursor_open() - * [in,out] key The key for a retrieved item - * [in,out] data The data of a retrieved item - * [in] op A cursor operation MDBX_cursor_op - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_NOTFOUND - no matching key found. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_cursor_get_attr(MDBX_cursor *mc, MDBX_val *key, - MDBX_val *data, mdbx_attr_t *attrptr, - MDBX_cursor_op op); - -/* Get items attribute from a database. - * - * This function retrieves key/data pairs from the database. The address - * and length of the data associated with the specified key are returned - * in the structure to which data refers. - * If the database supports duplicate keys (MDBX_DUPSORT) then the - * first data item for the key will be returned. Retrieval of other - * items requires the use of mdbx_cursor_get(). - * - * NOTE: The memory pointed to by the returned values is owned by the - * database. The caller need not dispose of the memory, and may not - * modify it in any way. For values returned in a read-only transaction - * any modification attempts will cause a SIGSEGV. - * - * NOTE: Values returned from the database are valid only until a - * subsequent update operation, or the end of the transaction. - * - * [in] txn A transaction handle returned by mdbx_txn_begin() - * [in] dbi A database handle returned by mdbx_dbi_open() - * [in] key The key to search for in the database - * [in,out] data The data corresponding to the key - * - * Returns A non-zero error value on failure and 0 on success, some - * possible errors are: - * - MDBX_NOTFOUND - the key was not in the database. - * - MDBX_EINVAL - an invalid parameter was specified. */ -LIBMDBX_API int mdbx_get_attr(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, - MDBX_val *data, mdbx_attr_t *attrptr); - -#ifdef __cplusplus -} -#endif - -#endif /* LIBMDBX_H */ diff --git a/plugins/Dbx_mdb/src/mdbx/osal.c b/plugins/Dbx_mdb/src/mdbx/osal.c deleted file mode 100644 index 5a8ec58002..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/osal.c +++ /dev/null @@ -1,1002 +0,0 @@ -/* https://en.wikipedia.org/wiki/Operating_system_abstraction_layer */ - -/* - * Copyright 2015-2017 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 "./bits.h" - -#if defined(_WIN32) || defined(_WIN64) -#include <winternl.h> - -static int waitstatus2errcode(DWORD result) { - switch (result) { - case WAIT_OBJECT_0: - return MDBX_SUCCESS; - case WAIT_FAILED: - return GetLastError(); - case WAIT_ABANDONED: - return ERROR_ABANDONED_WAIT_0; - case WAIT_IO_COMPLETION: - return ERROR_USER_APC; - case WAIT_TIMEOUT: - return ERROR_TIMEOUT; - default: - return ERROR_UNHANDLED_ERROR; - } -} - -/* Map a result from an NTAPI call to WIN32 error code. */ -static int ntstatus2errcode(NTSTATUS status) { - DWORD dummy; - OVERLAPPED ov; - memset(&ov, 0, sizeof(ov)); - ov.Internal = status; - return GetOverlappedResult(NULL, &ov, &dummy, FALSE) ? MDBX_SUCCESS - : GetLastError(); -} - -/* We use native NT APIs to setup the memory map, so that we can - * let the DB file grow incrementally instead of always preallocating - * the full size. These APIs are defined in <wdm.h> and <ntifs.h> - * but those headers are meant for driver-level development and - * conflict with the regular user-level headers, so we explicitly - * declare them here. Using these APIs also means we must link to - * ntdll.dll, which is not linked by default in user code. */ -#pragma comment(lib, "ntdll.lib") - -extern NTSTATUS NTAPI NtCreateSection( - OUT PHANDLE SectionHandle, IN ACCESS_MASK DesiredAccess, - IN OPTIONAL POBJECT_ATTRIBUTES ObjectAttributes, - IN OPTIONAL PLARGE_INTEGER MaximumSize, IN ULONG SectionPageProtection, - IN ULONG AllocationAttributes, IN OPTIONAL HANDLE FileHandle); - -extern NTSTATUS NTAPI NtExtendSection(IN HANDLE SectionHandle, - IN PLARGE_INTEGER NewSectionSize); - -typedef enum _SECTION_INHERIT { ViewShare = 1, ViewUnmap = 2 } SECTION_INHERIT; - -extern NTSTATUS NTAPI NtMapViewOfSection( - IN HANDLE SectionHandle, IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG_PTR ZeroBits, IN SIZE_T CommitSize, - IN OUT OPTIONAL PLARGE_INTEGER SectionOffset, IN OUT PSIZE_T ViewSize, - IN SECTION_INHERIT InheritDisposition, IN ULONG AllocationType, - IN ULONG Win32Protect); - -extern NTSTATUS NTAPI NtUnmapViewOfSection(IN HANDLE ProcessHandle, - IN OPTIONAL PVOID BaseAddress); - -extern NTSTATUS NTAPI NtClose(HANDLE Handle); - -extern NTSTATUS NTAPI NtAllocateVirtualMemory( - IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, IN ULONG ZeroBits, - IN OUT PULONG RegionSize, IN ULONG AllocationType, IN ULONG Protect); - -extern NTSTATUS NTAPI NtFreeVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID *BaseAddress, - IN OUT PULONG RegionSize, - IN ULONG FreeType); - -#ifndef FILE_PROVIDER_CURRENT_VERSION -typedef struct _FILE_PROVIDER_EXTERNAL_INFO_V1 { - ULONG Version; - ULONG Algorithm; - ULONG Flags; -} FILE_PROVIDER_EXTERNAL_INFO_V1, *PFILE_PROVIDER_EXTERNAL_INFO_V1; -#endif - -#ifndef STATUS_OBJECT_NOT_EXTERNALLY_BACKED -#define STATUS_OBJECT_NOT_EXTERNALLY_BACKED ((NTSTATUS)0xC000046DL) -#endif -#ifndef STATUS_INVALID_DEVICE_REQUEST -#define STATUS_INVALID_DEVICE_REQUEST ((NTSTATUS)0xC0000010L) -#endif - -extern NTSTATUS -NtFsControlFile(IN HANDLE FileHandle, IN OUT HANDLE Event, - IN OUT PVOID /* PIO_APC_ROUTINE */ ApcRoutine, - IN OUT PVOID ApcContext, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG FsControlCode, IN OUT PVOID InputBuffer, - IN ULONG InputBufferLength, OUT OPTIONAL PVOID OutputBuffer, - IN ULONG OutputBufferLength); - -#endif /* _WIN32 || _WIN64 */ - -/*----------------------------------------------------------------------------*/ - -#ifndef _MSC_VER -/* Prototype should match libc runtime. ISO POSIX (2003) & LSB 3.1 */ -__nothrow __noreturn void __assert_fail(const char *assertion, const char *file, - unsigned line, const char *function); -#else -__extern_C __declspec(dllimport) void __cdecl _assert(char const *message, - char const *filename, - unsigned line); -#endif /* _MSC_VER */ - -#ifndef mdbx_assert_fail -void __cold mdbx_assert_fail(const MDBX_env *env, const char *msg, - const char *func, int line) { -#if MDBX_DEBUG - if (env && env->me_assert_func) { - env->me_assert_func(env, msg, func, line); - return; - } -#else - (void)env; -#endif /* MDBX_DEBUG */ - - if (mdbx_debug_logger) - mdbx_debug_log(MDBX_DBG_ASSERT, func, line, "assert: %s\n", msg); -#ifndef _MSC_VER - __assert_fail(msg, "mdbx", line, func); -#else - _assert(msg, func, line); -#endif /* _MSC_VER */ -} -#endif /* mdbx_assert_fail */ - -__cold void mdbx_panic(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); -#ifdef _MSC_VER - if (IsDebuggerPresent()) { - OutputDebugString("\r\n" FIXME "\r\n"); - FatalExit(ERROR_UNHANDLED_ERROR); - } -#elif _XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L || \ - (__GLIBC_PREREQ(1, 0) && !__GLIBC_PREREQ(2, 10) && defined(_GNU_SOURCE)) - vdprintf(STDERR_FILENO, fmt, ap); -#else -#error FIXME -#endif - va_end(ap); - abort(); -} - -/*----------------------------------------------------------------------------*/ - -#ifndef mdbx_asprintf -int mdbx_asprintf(char **strp, const char *fmt, ...) { - va_list ap, ones; - - va_start(ap, fmt); - va_copy(ones, ap); -#ifdef _MSC_VER - int needed = _vscprintf(fmt, ap); -#elif defined(vsnprintf) || defined(_BSD_SOURCE) || _XOPEN_SOURCE >= 500 || \ - defined(_ISOC99_SOURCE) || _POSIX_C_SOURCE >= 200112L - int needed = vsnprintf(nullptr, 0, fmt, ap); -#else -#error FIXME -#endif - va_end(ap); - - if (unlikely(needed < 0 || needed >= INT_MAX)) { - *strp = nullptr; - va_end(ones); - return needed; - } - - *strp = malloc(needed + 1); - if (unlikely(*strp == nullptr)) { - va_end(ones); - SetLastError(MDBX_ENOMEM); - return -1; - } - -#if defined(vsnprintf) || defined(_BSD_SOURCE) || _XOPEN_SOURCE >= 500 || \ - defined(_ISOC99_SOURCE) || _POSIX_C_SOURCE >= 200112L - int actual = vsnprintf(*strp, needed + 1, fmt, ones); -#else -#error FIXME -#endif - va_end(ones); - - assert(actual == needed); - if (unlikely(actual < 0)) { - free(*strp); - *strp = nullptr; - } - return actual; -} -#endif /* mdbx_asprintf */ - -#ifndef mdbx_memalign_alloc -int mdbx_memalign_alloc(size_t alignment, size_t bytes, void **result) { -#if _MSC_VER - *result = _aligned_malloc(bytes, alignment); - return *result ? MDBX_SUCCESS : MDBX_ENOMEM /* ERROR_OUTOFMEMORY */; -#elif __GLIBC_PREREQ(2, 16) || __STDC_VERSION__ >= 201112L - *result = memalign(alignment, bytes); - return *result ? MDBX_SUCCESS : errno; -#elif _POSIX_VERSION >= 200112L - *result = nullptr; - return posix_memalign(result, alignment, bytes); -#else -#error FIXME -#endif -} -#endif /* mdbx_memalign_alloc */ - -#ifndef mdbx_memalign_free -void mdbx_memalign_free(void *ptr) { -#if _MSC_VER - _aligned_free(ptr); -#else - free(ptr); -#endif -} -#endif /* mdbx_memalign_free */ - -/*----------------------------------------------------------------------------*/ - -int mdbx_condmutex_init(mdbx_condmutex_t *condmutex) { -#if defined(_WIN32) || defined(_WIN64) - int rc = MDBX_SUCCESS; - condmutex->event = NULL; - condmutex->mutex = CreateMutex(NULL, FALSE, NULL); - if (!condmutex->mutex) - return GetLastError(); - - condmutex->event = CreateEvent(NULL, FALSE, FALSE, NULL); - if (!condmutex->event) { - rc = GetLastError(); - (void)CloseHandle(condmutex->mutex); - condmutex->mutex = NULL; - } - return rc; -#else - memset(condmutex, 0, sizeof(mdbx_condmutex_t)); - int rc = pthread_mutex_init(&condmutex->mutex, NULL); - if (rc == 0) { - rc = pthread_cond_init(&condmutex->cond, NULL); - if (rc != 0) - (void)pthread_mutex_destroy(&condmutex->mutex); - } - return rc; -#endif -} - -static bool is_allzeros(const void *ptr, size_t bytes) { - const uint8_t *u8 = ptr; - for (size_t i = 0; i < bytes; ++i) - if (u8[i] != 0) - return false; - return true; -} - -int mdbx_condmutex_destroy(mdbx_condmutex_t *condmutex) { - int rc = MDBX_EINVAL; -#if defined(_WIN32) || defined(_WIN64) - if (condmutex->event) { - rc = CloseHandle(condmutex->event) ? MDBX_SUCCESS : GetLastError(); - if (rc == MDBX_SUCCESS) - condmutex->event = NULL; - } - if (condmutex->mutex) { - rc = CloseHandle(condmutex->mutex) ? MDBX_SUCCESS : GetLastError(); - if (rc == MDBX_SUCCESS) - condmutex->mutex = NULL; - } -#else - if (!is_allzeros(&condmutex->cond, sizeof(condmutex->cond))) { - rc = pthread_cond_destroy(&condmutex->cond); - if (rc == 0) - memset(&condmutex->cond, 0, sizeof(condmutex->cond)); - } - if (!is_allzeros(&condmutex->mutex, sizeof(condmutex->mutex))) { - rc = pthread_mutex_destroy(&condmutex->mutex); - if (rc == 0) - memset(&condmutex->mutex, 0, sizeof(condmutex->mutex)); - } -#endif - return rc; -} - -int mdbx_condmutex_lock(mdbx_condmutex_t *condmutex) { -#if defined(_WIN32) || defined(_WIN64) - DWORD code = WaitForSingleObject(condmutex->mutex, INFINITE); - return waitstatus2errcode(code); -#else - return pthread_mutex_lock(&condmutex->mutex); -#endif -} - -int mdbx_condmutex_unlock(mdbx_condmutex_t *condmutex) { -#if defined(_WIN32) || defined(_WIN64) - return ReleaseMutex(condmutex->mutex) ? MDBX_SUCCESS : GetLastError(); -#else - return pthread_mutex_unlock(&condmutex->mutex); -#endif -} - -int mdbx_condmutex_signal(mdbx_condmutex_t *condmutex) { -#if defined(_WIN32) || defined(_WIN64) - return SetEvent(condmutex->event) ? MDBX_SUCCESS : GetLastError(); -#else - return pthread_cond_signal(&condmutex->cond); -#endif -} - -int mdbx_condmutex_wait(mdbx_condmutex_t *condmutex) { -#if defined(_WIN32) || defined(_WIN64) - DWORD code = - SignalObjectAndWait(condmutex->mutex, condmutex->event, INFINITE, FALSE); - if (code == WAIT_OBJECT_0) - code = WaitForSingleObject(condmutex->mutex, INFINITE); - return waitstatus2errcode(code); -#else - return pthread_cond_wait(&condmutex->cond, &condmutex->mutex); -#endif -} - -/*----------------------------------------------------------------------------*/ - -int mdbx_fastmutex_init(mdbx_fastmutex_t *fastmutex) { -#if defined(_WIN32) || defined(_WIN64) - InitializeCriticalSection(fastmutex); - return MDBX_SUCCESS; -#else - return pthread_mutex_init(fastmutex, NULL); -#endif -} - -int mdbx_fastmutex_destroy(mdbx_fastmutex_t *fastmutex) { -#if defined(_WIN32) || defined(_WIN64) - DeleteCriticalSection(fastmutex); - return MDBX_SUCCESS; -#else - return pthread_mutex_destroy(fastmutex); -#endif -} - -int mdbx_fastmutex_acquire(mdbx_fastmutex_t *fastmutex) { -#if defined(_WIN32) || defined(_WIN64) - EnterCriticalSection(fastmutex); - return MDBX_SUCCESS; -#else - return pthread_mutex_lock(fastmutex); -#endif -} - -int mdbx_fastmutex_release(mdbx_fastmutex_t *fastmutex) { -#if defined(_WIN32) || defined(_WIN64) - LeaveCriticalSection(fastmutex); - return MDBX_SUCCESS; -#else - return pthread_mutex_unlock(fastmutex); -#endif -} - -/*----------------------------------------------------------------------------*/ - -int mdbx_openfile(const char *pathname, int flags, mode_t mode, - mdbx_filehandle_t *fd) { - *fd = INVALID_HANDLE_VALUE; -#if defined(_WIN32) || defined(_WIN64) - (void)mode; - - DWORD DesiredAccess; - DWORD ShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; - DWORD FlagsAndAttributes = FILE_ATTRIBUTE_NORMAL; - switch (flags & (O_RDONLY | O_WRONLY | O_RDWR)) { - default: - return ERROR_INVALID_PARAMETER; - case O_RDONLY: - DesiredAccess = GENERIC_READ; - break; - case O_WRONLY: /* assume for MDBX_env_copy() and friends output */ - DesiredAccess = GENERIC_WRITE; - ShareMode = 0; - FlagsAndAttributes |= FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH; - break; - case O_RDWR: - DesiredAccess = GENERIC_READ | GENERIC_WRITE; - break; - } - - DWORD CreationDisposition; - switch (flags & (O_EXCL | O_CREAT)) { - default: - return ERROR_INVALID_PARAMETER; - case 0: - CreationDisposition = OPEN_EXISTING; - break; - case O_EXCL | O_CREAT: - CreationDisposition = CREATE_NEW; - FlagsAndAttributes |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; - break; - case O_CREAT: - CreationDisposition = OPEN_ALWAYS; - FlagsAndAttributes |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; - break; - } - - *fd = CreateFileA(pathname, DesiredAccess, ShareMode, NULL, - CreationDisposition, FlagsAndAttributes, NULL); - - if (*fd == INVALID_HANDLE_VALUE) - return GetLastError(); - if ((flags & O_CREAT) && GetLastError() != ERROR_ALREADY_EXISTS) { - /* set FILE_ATTRIBUTE_NOT_CONTENT_INDEXED for new file */ - DWORD FileAttributes = GetFileAttributesA(pathname); - if (FileAttributes == INVALID_FILE_ATTRIBUTES || - !SetFileAttributesA(pathname, FileAttributes | - FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)) { - int rc = GetLastError(); - CloseHandle(*fd); - *fd = INVALID_HANDLE_VALUE; - return rc; - } - } -#else - -#ifdef O_CLOEXEC - flags |= O_CLOEXEC; -#endif - *fd = open(pathname, flags, mode); - if (*fd < 0) - return errno; -#if defined(FD_CLOEXEC) && defined(F_GETFD) - flags = fcntl(*fd, F_GETFD); - if (flags >= 0) - (void)fcntl(*fd, F_SETFD, flags | FD_CLOEXEC); -#endif -#endif - return MDBX_SUCCESS; -} - -int mdbx_closefile(mdbx_filehandle_t fd) { -#if defined(_WIN32) || defined(_WIN64) - return CloseHandle(fd) ? MDBX_SUCCESS : GetLastError(); -#else - return (close(fd) == 0) ? MDBX_SUCCESS : errno; -#endif -} - -int mdbx_pread(mdbx_filehandle_t fd, void *buf, size_t bytes, uint64_t offset) { - if (bytes > MAX_WRITE) - return MDBX_EINVAL; -#if defined(_WIN32) || defined(_WIN64) - - OVERLAPPED ov; - ov.hEvent = 0; - ov.Offset = (DWORD)offset; - ov.OffsetHigh = HIGH_DWORD(offset); - - DWORD read = 0; - if (unlikely(!ReadFile(fd, buf, (DWORD)bytes, &read, &ov))) { - int rc = GetLastError(); - return (rc == MDBX_SUCCESS) ? /* paranoia */ ERROR_READ_FAULT : rc; - } -#else - STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t), - "libmdbx requires 64-bit file I/O on 64-bit systems"); - intptr_t read = pread(fd, buf, bytes, offset); - if (read < 0) { - int rc = errno; - return (rc == MDBX_SUCCESS) ? /* paranoia */ MDBX_EIO : rc; - } -#endif - return (bytes == (size_t)read) ? MDBX_SUCCESS : MDBX_ENODATA; -} - -int mdbx_pwrite(mdbx_filehandle_t fd, const void *buf, size_t bytes, - uint64_t offset) { -#if defined(_WIN32) || defined(_WIN64) - if (bytes > MAX_WRITE) - return ERROR_INVALID_PARAMETER; - - OVERLAPPED ov; - ov.hEvent = 0; - ov.Offset = (DWORD)offset; - ov.OffsetHigh = HIGH_DWORD(offset); - - DWORD written; - if (likely(WriteFile(fd, buf, (DWORD)bytes, &written, &ov))) - return (bytes == written) ? MDBX_SUCCESS : MDBX_EIO /* ERROR_WRITE_FAULT */; - return GetLastError(); -#else - int rc; - intptr_t written; - do { - STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t), - "libmdbx requires 64-bit file I/O on 64-bit systems"); - written = pwrite(fd, buf, bytes, offset); - if (likely(bytes == (size_t)written)) - return MDBX_SUCCESS; - rc = errno; - } while (rc == EINTR); - return (written < 0) ? rc : MDBX_EIO /* Use which error code (ENOSPC)? */; -#endif -} - -int mdbx_pwritev(mdbx_filehandle_t fd, struct iovec *iov, int iovcnt, - uint64_t offset, size_t expected_written) { -#if defined(_WIN32) || defined(_WIN64) - size_t written = 0; - for (int i = 0; i < iovcnt; ++i) { - int rc = mdbx_pwrite(fd, iov[i].iov_base, iov[i].iov_len, offset); - if (unlikely(rc != MDBX_SUCCESS)) - return rc; - written += iov[i].iov_len; - offset += iov[i].iov_len; - } - return (expected_written == written) ? MDBX_SUCCESS - : MDBX_EIO /* ERROR_WRITE_FAULT */; -#else - int rc; - intptr_t written; - do { - STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t), - "libmdbx requires 64-bit file I/O on 64-bit systems"); - written = pwritev(fd, iov, iovcnt, offset); - if (likely(expected_written == (size_t)written)) - return MDBX_SUCCESS; - rc = errno; - } while (rc == EINTR); - return (written < 0) ? rc : MDBX_EIO /* Use which error code? */; -#endif -} - -int mdbx_write(mdbx_filehandle_t fd, const void *buf, size_t bytes) { -#ifdef SIGPIPE - sigset_t set, old; - sigemptyset(&set); - sigaddset(&set, SIGPIPE); - int rc = pthread_sigmask(SIG_BLOCK, &set, &old); - if (rc != 0) - return rc; -#endif - - const char *ptr = buf; - for (;;) { - size_t chunk = (MAX_WRITE < bytes) ? MAX_WRITE : bytes; -#if defined(_WIN32) || defined(_WIN64) - DWORD written; - if (unlikely(!WriteFile(fd, ptr, (DWORD)chunk, &written, NULL))) - return GetLastError(); -#else - intptr_t written = write(fd, ptr, chunk); - if (written < 0) { - int rc = errno; -#ifdef SIGPIPE - if (rc == EPIPE) { - /* Collect the pending SIGPIPE, otherwise at least OS X - * gives it to the process on thread-exit (ITS#8504). */ - int tmp; - sigwait(&set, &tmp); - written = 0; - continue; - } - pthread_sigmask(SIG_SETMASK, &old, NULL); -#endif - return rc; - } -#endif - if (likely(bytes == (size_t)written)) { -#ifdef SIGPIPE - pthread_sigmask(SIG_SETMASK, &old, NULL); -#endif - return MDBX_SUCCESS; - } - ptr += written; - bytes -= written; - } -} - -int mdbx_filesync(mdbx_filehandle_t fd, bool filesize_changed) { -#if defined(_WIN32) || defined(_WIN64) - (void)filesize_changed; - return FlushFileBuffers(fd) ? MDBX_SUCCESS : GetLastError(); -#elif __GLIBC_PREREQ(2, 16) || _BSD_SOURCE || _XOPEN_SOURCE || \ - (__GLIBC_PREREQ(2, 8) && _POSIX_C_SOURCE >= 200112L) - for (;;) { -/* LY: It is no reason to use fdatasync() here, even in case - * no such bug in a kernel. Because "no-bug" mean that a kernel - * internally do nearly the same, e.g. fdatasync() == fsync() - * when no-kernel-bug and file size was changed. - * - * So, this code is always safe and without appreciable - * performance degradation. - * - * For more info about of a corresponding fdatasync() bug - * see http://www.spinics.net/lists/linux-ext4/msg33714.html */ -#if _POSIX_C_SOURCE >= 199309L || _XOPEN_SOURCE >= 500 || \ - defined(_POSIX_SYNCHRONIZED_IO) - if (!filesize_changed && fdatasync(fd) == 0) - return MDBX_SUCCESS; -#else - (void)filesize_changed; -#endif - if (fsync(fd) == 0) - return MDBX_SUCCESS; - int rc = errno; - if (rc != EINTR) - return rc; - } -#else -#error FIXME -#endif -} - -int mdbx_filesize_sync(mdbx_filehandle_t fd) { -#if defined(_WIN32) || defined(_WIN64) - (void)fd; - /* Nothing on Windows (i.e. newer 100% steady) */ - return MDBX_SUCCESS; -#else - for (;;) { - if (fsync(fd) == 0) - return MDBX_SUCCESS; - int rc = errno; - if (rc != EINTR) - return rc; - } -#endif -} - -int mdbx_filesize(mdbx_filehandle_t fd, uint64_t *length) { -#if defined(_WIN32) || defined(_WIN64) - BY_HANDLE_FILE_INFORMATION info; - if (!GetFileInformationByHandle(fd, &info)) - return GetLastError(); - *length = 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(fd, &st)) - return errno; - - *length = st.st_size; -#endif - return MDBX_SUCCESS; -} - -int mdbx_ftruncate(mdbx_filehandle_t fd, uint64_t length) { -#if defined(_WIN32) || defined(_WIN64) - LARGE_INTEGER li; - li.QuadPart = length; - return (SetFilePointerEx(fd, li, NULL, FILE_BEGIN) && SetEndOfFile(fd)) - ? MDBX_SUCCESS - : GetLastError(); -#else - STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t), - "libmdbx requires 64-bit file I/O on 64-bit systems"); - return ftruncate(fd, length) == 0 ? MDBX_SUCCESS : errno; -#endif -} - -/*----------------------------------------------------------------------------*/ - -int mdbx_thread_key_create(mdbx_thread_key_t *key) { -#if defined(_WIN32) || defined(_WIN64) - *key = TlsAlloc(); - return (*key != TLS_OUT_OF_INDEXES) ? MDBX_SUCCESS : GetLastError(); -#else - return pthread_key_create(key, mdbx_rthc_dtor); -#endif -} - -void mdbx_thread_key_delete(mdbx_thread_key_t key) { -#if defined(_WIN32) || defined(_WIN64) - mdbx_ensure(NULL, TlsFree(key)); -#else - mdbx_ensure(NULL, pthread_key_delete(key) == 0); -#endif -} - -void *mdbx_thread_rthc_get(mdbx_thread_key_t key) { -#if defined(_WIN32) || defined(_WIN64) - return TlsGetValue(key); -#else - return pthread_getspecific(key); -#endif -} - -void mdbx_thread_rthc_set(mdbx_thread_key_t key, const void *value) { -#if defined(_WIN32) || defined(_WIN64) - mdbx_ensure(NULL, TlsSetValue(key, (void *)value)); -#else - mdbx_ensure(NULL, pthread_setspecific(key, value) == 0); -#endif -} - -int mdbx_thread_create(mdbx_thread_t *thread, - THREAD_RESULT(THREAD_CALL *start_routine)(void *), - void *arg) { -#if defined(_WIN32) || defined(_WIN64) - *thread = CreateThread(NULL, 0, start_routine, arg, 0, NULL); - return *thread ? MDBX_SUCCESS : GetLastError(); -#else - return pthread_create(thread, NULL, start_routine, arg); -#endif -} - -int mdbx_thread_join(mdbx_thread_t thread) { -#if defined(_WIN32) || defined(_WIN64) - DWORD code = WaitForSingleObject(thread, INFINITE); - return waitstatus2errcode(code); -#else - void *unused_retval = &unused_retval; - return pthread_join(thread, &unused_retval); -#endif -} - -/*----------------------------------------------------------------------------*/ - -int mdbx_msync(mdbx_mmap_t *map, size_t offset, size_t length, int async) { - uint8_t *ptr = (uint8_t *)map->address + offset; -#if defined(_WIN32) || defined(_WIN64) - if (FlushViewOfFile(ptr, length) && (async || FlushFileBuffers(map->fd))) - return MDBX_SUCCESS; - return GetLastError(); -#else - const int mode = async ? MS_ASYNC : MS_SYNC; - return (msync(ptr, length, mode) == 0) ? MDBX_SUCCESS : errno; -#endif -} - -int mdbx_mmap(int flags, mdbx_mmap_t *map, size_t must, size_t limit) { - assert(must <= limit); -#if defined(_WIN32) || defined(_WIN64) - map->length = 0; - map->current = 0; - map->section = NULL; - map->address = nullptr; - - if (GetFileType(map->fd) != FILE_TYPE_DISK) - return ERROR_FILE_OFFLINE; - - FILE_REMOTE_PROTOCOL_INFO RemoteProtocolInfo; - if (GetFileInformationByHandleEx(map->fd, FileRemoteProtocolInfo, - &RemoteProtocolInfo, - sizeof(RemoteProtocolInfo))) { - if ((RemoteProtocolInfo.Flags & (REMOTE_PROTOCOL_INFO_FLAG_LOOPBACK | - REMOTE_PROTOCOL_INFO_FLAG_OFFLINE)) != - REMOTE_PROTOCOL_INFO_FLAG_LOOPBACK) - return ERROR_FILE_OFFLINE; - } - - NTSTATUS rc; -#if defined(_WIN64) && defined(WOF_CURRENT_VERSION) - struct { - WOF_EXTERNAL_INFO wof_info; - union { - WIM_PROVIDER_EXTERNAL_INFO wim_info; - FILE_PROVIDER_EXTERNAL_INFO_V1 file_info; - }; - size_t reserved_for_microsoft_madness[42]; - } GetExternalBacking_OutputBuffer; - IO_STATUS_BLOCK StatusBlock; - rc = NtFsControlFile(map->fd, NULL, NULL, NULL, &StatusBlock, - FSCTL_GET_EXTERNAL_BACKING, NULL, 0, - &GetExternalBacking_OutputBuffer, - sizeof(GetExternalBacking_OutputBuffer)); - if (rc != STATUS_OBJECT_NOT_EXTERNALLY_BACKED && - rc != STATUS_INVALID_DEVICE_REQUEST) - return NT_SUCCESS(rc) ? ERROR_FILE_OFFLINE : ntstatus2errcode(rc); -#endif - - WCHAR PathBuffer[INT16_MAX]; - DWORD VolumeSerialNumber, FileSystemFlags; - if (!GetVolumeInformationByHandleW(map->fd, PathBuffer, INT16_MAX, - &VolumeSerialNumber, NULL, - &FileSystemFlags, NULL, 0)) - return GetLastError(); - - if ((flags & MDBX_RDONLY) == 0) { - if (FileSystemFlags & (FILE_SEQUENTIAL_WRITE_ONCE | FILE_READ_ONLY_VOLUME | - FILE_VOLUME_IS_COMPRESSED)) - return ERROR_FILE_OFFLINE; - } - - if (!GetFinalPathNameByHandleW(map->fd, PathBuffer, INT16_MAX, - FILE_NAME_NORMALIZED | VOLUME_NAME_NT)) - return GetLastError(); - - if (_wcsnicmp(PathBuffer, L"\\Device\\Mup\\", 12) == 0) - return ERROR_FILE_OFFLINE; - - if (GetFinalPathNameByHandleW(map->fd, PathBuffer, INT16_MAX, - FILE_NAME_NORMALIZED | VOLUME_NAME_DOS)) { - UINT DriveType = GetDriveTypeW(PathBuffer); - if (DriveType == DRIVE_NO_ROOT_DIR && - wcsncmp(PathBuffer, L"\\\\?\\", 4) == 0 && - wcsncmp(PathBuffer + 5, L":\\", 2) == 0) { - PathBuffer[7] = 0; - DriveType = GetDriveTypeW(PathBuffer + 4); - } - switch (DriveType) { - case DRIVE_CDROM: - if (flags & MDBX_RDONLY) - break; - // fall through - case DRIVE_UNKNOWN: - case DRIVE_NO_ROOT_DIR: - case DRIVE_REMOTE: - default: - return ERROR_FILE_OFFLINE; - case DRIVE_REMOVABLE: - case DRIVE_FIXED: - case DRIVE_RAMDISK: - break; - } - } - - rc = NtCreateSection( - &map->section, - /* DesiredAccess */ SECTION_MAP_READ | SECTION_EXTEND_SIZE | - ((flags & MDBX_WRITEMAP) ? SECTION_MAP_WRITE : 0), - /* ObjectAttributes */ NULL, /* MaximumSize */ NULL, - /* SectionPageProtection */ (flags & MDBX_RDONLY) ? PAGE_READONLY - : PAGE_READWRITE, - /* AllocationAttributes */ SEC_RESERVE, map->fd); - - if (!NT_SUCCESS(rc)) - return ntstatus2errcode(rc); - - map->address = nullptr; - SIZE_T ViewSize = (flags & MDBX_RDONLY) ? must : limit; - rc = NtMapViewOfSection( - map->section, GetCurrentProcess(), &map->address, - /* ZeroBits */ 0, - /* CommitSize */ must, - /* SectionOffset */ NULL, &ViewSize, - /* InheritDisposition */ ViewUnmap, - /* AllocationType */ (flags & MDBX_RDONLY) ? 0 : MEM_RESERVE, - /* Win32Protect */ (flags & MDBX_WRITEMAP) ? PAGE_READWRITE - : PAGE_READONLY); - - if (!NT_SUCCESS(rc)) { - NtClose(map->section); - map->section = 0; - map->address = nullptr; - return ntstatus2errcode(rc); - } - assert(map->address != MAP_FAILED); - - uint64_t filesize; - rc = mdbx_filesize(map->fd, &filesize); - if (rc != MDBX_SUCCESS) { - NtClose(map->section); - NtUnmapViewOfSection(GetCurrentProcess(), map->address); - map->section = 0; - map->address = nullptr; - return rc; - } - - map->current = (must < filesize) ? must : (size_t)filesize; - map->length = ViewSize; - return MDBX_SUCCESS; -#else - (void)must; - map->address = mmap( - NULL, limit, (flags & MDBX_WRITEMAP) ? PROT_READ | PROT_WRITE : PROT_READ, - MAP_SHARED, map->fd, 0); - if (likely(map->address != MAP_FAILED)) { - map->length = limit; - return MDBX_SUCCESS; - } - map->length = 0; - map->address = nullptr; - return errno; -#endif -} - -int mdbx_munmap(mdbx_mmap_t *map) { -#if defined(_WIN32) || defined(_WIN64) - if (map->section) - NtClose(map->section); - NTSTATUS rc = NtUnmapViewOfSection(GetCurrentProcess(), map->address); - if (!NT_SUCCESS(rc)) - ntstatus2errcode(rc); - map->length = 0; - map->current = 0; - map->address = nullptr; -#else - if (unlikely(munmap(map->address, map->length))) - return errno; - map->length = 0; - map->address = nullptr; -#endif - return MDBX_SUCCESS; -} - -int mdbx_mresize(int flags, mdbx_mmap_t *map, size_t atleast, size_t limit) { - assert(atleast <= limit); -#if defined(_WIN32) || defined(_WIN64) - if (limit < map->length) { - /* Windows is unable shrinking a mapped section */ - return ERROR_USER_MAPPED_FILE; - } - if (limit > map->length) { - /* extend */ - LARGE_INTEGER new_size; - new_size.QuadPart = limit; - NTSTATUS rc = NtExtendSection(map->section, &new_size); - if (!NT_SUCCESS(rc)) - return ntstatus2errcode(rc); - map->length = limit; - } - if (atleast < map->current) { - /* Windows is unable shrinking a mapped file */ - uint8_t *ptr = (uint8_t *)map->address + atleast; - if (!VirtualFree(ptr, map->current - atleast, MEM_DECOMMIT)) - return MDBX_RESULT_TRUE; - - map->current = atleast; - int rc = mdbx_ftruncate(map->fd, atleast); - return (rc != MDBX_SUCCESS) ? MDBX_RESULT_TRUE : rc; - } - if (atleast > map->current) { - /* growth */ - uint8_t *ptr = (uint8_t *)map->address + map->current; - if (ptr != - VirtualAlloc(ptr, atleast - map->current, MEM_COMMIT, - (flags & MDBX_WRITEMAP) ? PAGE_READWRITE : PAGE_READONLY)) - return GetLastError(); - map->current = atleast; - } - - uint64_t filesize; - int rc = mdbx_filesize(map->fd, &filesize); - if (rc != MDBX_SUCCESS) - return rc; - if (filesize < atleast) { - rc = mdbx_ftruncate(map->fd, atleast); - if (rc != MDBX_SUCCESS) - return rc; - } - return MDBX_SUCCESS; -#else - (void)flags; - if (limit != map->length) { - void *ptr = mremap(map->address, map->length, limit, MREMAP_MAYMOVE); - if (ptr == MAP_FAILED) - return errno; - map->address = ptr; - map->length = limit; - } - return mdbx_ftruncate(map->fd, atleast); -#endif -} - -/*----------------------------------------------------------------------------*/ - -__cold void mdbx_osal_jitter(bool tiny) { - for (;;) { -#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || \ - defined(__x86_64__) - const unsigned salt = 277u * (unsigned)__rdtsc(); -#else - const unsigned salt = rand(); -#endif - - const unsigned coin = salt % (tiny ? 29u : 43u); - if (coin < 43 / 3) - break; -#if defined(_WIN32) || defined(_WIN64) - SwitchToThread(); - if (coin > 43 * 2 / 3) - Sleep(1); -#else - sched_yield(); - if (coin > 43 * 2 / 3) - usleep(coin); -#endif - } -} diff --git a/plugins/Dbx_mdb/src/mdbx/osal.h b/plugins/Dbx_mdb/src/mdbx/osal.h deleted file mode 100644 index e3a503ba1a..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/osal.h +++ /dev/null @@ -1,645 +0,0 @@ -/* https://en.wikipedia.org/wiki/Operating_system_abstraction_layer */ - -/* - * Copyright 2015-2017 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>. - */ - -#pragma once - -/*----------------------------------------------------------------------------*/ -/* Microsoft compiler generates a lot of warning for self includes... */ - -#ifdef _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable : 4548) /* expression before comma has no effect; \ - expected expression with side - effect */ -#pragma warning(disable : 4530) /* C++ exception handler used, but unwind \ - * semantics are not enabled. Specify /EHsc */ -#pragma warning(disable : 4577) /* 'noexcept' used with no exception handling \ - * mode specified; termination on exception is \ - * not guaranteed. Specify /EHsc */ -#if !defined(_CRT_SECURE_NO_WARNINGS) -#define _CRT_SECURE_NO_WARNINGS -#endif -#endif /* _MSC_VER (warnings) */ - -/*----------------------------------------------------------------------------*/ -/* C99 includes */ - -#include <inttypes.h> -#include <stddef.h> -#include <stdint.h> -#include <stdlib.h> - -#include <assert.h> -#include <fcntl.h> -#include <limits.h> -#include <malloc.h> -#include <stdio.h> -#include <string.h> -#include <time.h> - -#ifndef _POSIX_C_SOURCE -#ifdef _POSIX_SOURCE -#define _POSIX_C_SOURCE 1 -#else -#define _POSIX_C_SOURCE 0 -#endif -#endif - -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 0 -#endif - -/*----------------------------------------------------------------------------*/ -/* Systems includes */ - -#if defined(_WIN32) || defined(_WIN64) -#include <windows.h> -#include <winnt.h> -#define HAVE_SYS_STAT_H -#define HAVE_SYS_TYPES_H -typedef HANDLE mdbx_thread_t; -typedef unsigned mdbx_thread_key_t; -#define MDBX_OSAL_SECTION HANDLE -#define MAP_FAILED NULL -#define HIGH_DWORD(v) ((DWORD)((sizeof(v) > 4) ? ((uint64_t)(v) >> 32) : 0)) -#define THREAD_CALL WINAPI -#define THREAD_RESULT DWORD -typedef struct { - HANDLE mutex; - HANDLE event; -} mdbx_condmutex_t; -typedef CRITICAL_SECTION mdbx_fastmutex_t; -#else -#include <pthread.h> -#include <signal.h> -#include <sys/file.h> -#include <sys/mman.h> -#include <sys/param.h> -#include <sys/stat.h> -#include <sys/uio.h> -#include <unistd.h> -typedef pthread_t mdbx_thread_t; -typedef pthread_key_t mdbx_thread_key_t; -#define INVALID_HANDLE_VALUE (-1) -#define THREAD_CALL -#define THREAD_RESULT void * -typedef struct { - pthread_mutex_t mutex; - pthread_cond_t cond; -} mdbx_condmutex_t; -typedef pthread_mutex_t mdbx_fastmutex_t; -#endif /* Platform */ - -#ifndef SSIZE_MAX -#define SSIZE_MAX INTPTR_MAX -#endif - -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_FILE_H -#include <sys/file.h> -#endif - -#if !defined(UNALIGNED_OK) -#if defined(__i386) || defined(__x86_64__) || defined(_M_IX86) || \ - defined(_M_X64) || defined(i386) || defined(_X86_) || defined(__i386__) || \ - defined(_X86_64_) -#define UNALIGNED_OK 1 -#else -#define UNALIGNED_OK 0 -#endif -#endif /* UNALIGNED_OK */ - -#if (-6 & 5) || CHAR_BIT != 8 || UINT_MAX < 0xffffffff || ULONG_MAX % 0xFFFF -#error \ - "Sanity checking failed: Two's complement, reasonably sized integer types" -#endif - -/*----------------------------------------------------------------------------*/ -/* Compiler's includes for builtins/intrinsics */ - -#ifdef _MSC_VER - -#if _MSC_FULL_VER < 190024215 -#if _MSC_FULL_VER < 180040629 && defined(_M_IX86) -#error Please use Visual Studio 2015 (MSC 19.0) or newer for 32-bit target. -#else -#pragma message( \ - "It is recommended to use Visual Studio 2015 (MSC 19.0) or newer.") -#endif -#endif - -#include <intrin.h> - -#elif __GNUC_PREREQ(4, 4) || defined(__clang__) -#if defined(__i386__) || defined(__x86_64__) -#include <cpuid.h> -#include <x86intrin.h> -#endif -#elif defined(__INTEL_COMPILER) -#include <intrin.h> -#elif defined(__SUNPRO_C) || defined(__sun) || defined(sun) -#include <mbarrier.h> -#elif (defined(_HPUX_SOURCE) || defined(__hpux) || defined(__HP_aCC)) && \ - (defined(HP_IA64) || defined(__ia64)) -#include <machine/sys/inline.h> -#elif defined(__IBMC__) && defined(__powerpc) -#include <atomic.h> -#elif defined(_AIX) -#include <builtins.h> -#include <sys/atomic_op.h> -#elif (defined(__osf__) && defined(__DECC)) || defined(__alpha) -#include <c_asm.h> -#include <machine/builtins.h> -#elif defined(__MWERKS__) -/* CodeWarrior - troubles ? */ -#pragma gcc_extensions -#elif defined(__SNC__) -/* Sony PS3 - troubles ? */ -#else -#error Unknown C compiler, please use GNU C 5.x or newer -#endif /* Compiler */ - -/*----------------------------------------------------------------------------*/ -/* Byteorder */ - -#if !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) || \ - !defined(__ORDER_BIG_ENDIAN__) - -#if defined(HAVE_ENDIAN_H) -#include <endian.h> -#elif defined(HAVE_SYS_PARAM_H) -#include <sys/param.h> /* for endianness */ -#elif defined(HAVE_NETINET_IN_H) && defined(HAVE_RESOLV_H) -#include <netinet/in.h> -#include <resolv.h> /* defines BYTE_ORDER on HPUX and Solaris */ -#endif - -#if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN) -#define __ORDER_LITTLE_ENDIAN__ __LITTLE_ENDIAN -#define __ORDER_BIG_ENDIAN__ __BIG_ENDIAN -#define __BYTE_ORDER__ __BYTE_ORDER -#else -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __ORDER_BIG_ENDIAN__ 4321 -#if defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN) || \ - defined(__ARMEL__) || defined(__THUMBEL__) || defined(__AARCH64EL__) || \ - defined(__MIPSEL__) || defined(_MIPSEL) || defined(__MIPSEL) || \ - defined(__i386) || defined(__x86_64__) || defined(_M_IX86) || \ - defined(_M_X64) || defined(i386) || defined(_X86_) || defined(__i386__) || \ - defined(_X86_64_) || defined(_M_ARM) || defined(_M_ARM64) || \ - defined(__e2k__) -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#elif defined(__BIG_ENDIAN__) || defined(_BIG_ENDIAN) || defined(__ARMEB__) || \ - defined(__THUMBEB__) || defined(__AARCH64EB__) || defined(__MIPSEB__) || \ - defined(_MIPSEB) || defined(__MIPSEB) || defined(_M_IA64) -#define __BYTE_ORDER__ __ORDER_BIG_ENDIAN__ -#else -#error __BYTE_ORDER__ should be defined. -#endif -#endif -#endif /* __BYTE_ORDER__ || __ORDER_LITTLE_ENDIAN__ || __ORDER_BIG_ENDIAN__ */ - -#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ && \ - __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__ -#error Unsupported byte order. -#endif - -/*----------------------------------------------------------------------------*/ -/* Memory/Compiler barriers, cache coherence */ - -static __inline void mdbx_compiler_barrier(void) { -#if defined(__clang__) || defined(__GNUC__) - __asm__ __volatile__("" ::: "memory"); -#elif defined(_MSC_VER) - _ReadWriteBarrier(); -#elif defined(__INTEL_COMPILER) /* LY: Intel Compiler may mimic GCC and MSC */ - __memory_barrier(); - if (type > MDBX_BARRIER_COMPILER) -#if defined(__ia64__) || defined(__ia64) || defined(_M_IA64) - __mf(); -#elif defined(__i386__) || defined(__x86_64__) - _mm_mfence(); -#else -#error "Unknown target for Intel Compiler, please report to us." -#endif -#elif defined(__SUNPRO_C) || defined(__sun) || defined(sun) - __compiler_barrier(); -#elif (defined(_HPUX_SOURCE) || defined(__hpux) || defined(__HP_aCC)) && \ - (defined(HP_IA64) || defined(__ia64)) - _Asm_sched_fence(/* LY: no-arg meaning 'all expect ALU', e.g. 0x3D3D */); -#elif defined(_AIX) || defined(__ppc__) || defined(__powerpc__) || \ - defined(__ppc64__) || defined(__powerpc64__) - __fence(); -#else -#error "Could not guess the kind of compiler, please report to us." -#endif -} - -static __inline void mdbx_memory_barrier(void) { -#if __has_extension(c_atomic) || __has_extension(cxx_atomic) - __c11_atomic_thread_fence(__ATOMIC_SEQ_CST); -#elif defined(__ATOMIC_SEQ_CST) - __atomic_thread_fence(__ATOMIC_SEQ_CST); -#elif defined(__clang__) || defined(__GNUC__) - __sync_synchronize(); -#elif defined(_MSC_VER) - MemoryBarrier(); -#elif defined(__INTEL_COMPILER) /* LY: Intel Compiler may mimic GCC and MSC */ -#if defined(__ia64__) || defined(__ia64) || defined(_M_IA64) - __mf(); -#elif defined(__i386__) || defined(__x86_64__) - _mm_mfence(); -#else -#error "Unknown target for Intel Compiler, please report to us." -#endif -#elif defined(__SUNPRO_C) || defined(__sun) || defined(sun) - __machine_rw_barrier(); -#elif (defined(_HPUX_SOURCE) || defined(__hpux) || defined(__HP_aCC)) && \ - (defined(HP_IA64) || defined(__ia64)) - _Asm_mf(); -#elif defined(_AIX) || defined(__ppc__) || defined(__powerpc__) || \ - defined(__ppc64__) || defined(__powerpc64__) - __lwsync(); -#else -#error "Could not guess the kind of compiler, please report to us." -#endif -} - -/*----------------------------------------------------------------------------*/ -/* Cache coherence and invalidation */ - -#if defined(__i386__) || defined(__x86_64__) || defined(_M_AMD64) || \ - defined(_M_IX86) || defined(__i386) || defined(__amd64) || \ - defined(i386) || defined(__x86_64) || defined(_AMD64_) || defined(_M_X64) -#define MDBX_CACHE_IS_COHERENT 1 -#elif defined(__hppa) || defined(__hppa__) -#define MDBX_CACHE_IS_COHERENT 1 -#endif - -#ifndef MDBX_CACHE_IS_COHERENT -#define MDBX_CACHE_IS_COHERENT 0 -#endif - -#ifndef MDBX_CACHELINE_SIZE -#if defined(SYSTEM_CACHE_ALIGNMENT_SIZE) -#define MDBX_CACHELINE_SIZE SYSTEM_CACHE_ALIGNMENT_SIZE -#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64) -#define MDBX_CACHELINE_SIZE 128 -#else -#define MDBX_CACHELINE_SIZE 64 -#endif -#endif /* MDBX_CACHELINE_SIZE */ - -#ifndef __cache_aligned -#define __cache_aligned __aligned(MDBX_CACHELINE_SIZE) -#endif - -#if MDBX_CACHE_IS_COHERENT -#define mdbx_coherent_barrier() mdbx_compiler_barrier() -#else -#define mdbx_coherent_barrier() mdbx_memory_barrier() -#endif - -#if defined(__mips) && defined(__linux) -/* Only MIPS has explicit cache control */ -#include <asm/cachectl.h> -#endif - -static __inline void mdbx_invalidate_cache(void *addr, size_t nbytes) { - mdbx_coherent_barrier(); -#if defined(__mips) && defined(__linux) - /* MIPS has cache coherency issues. - * Note: for any nbytes >= on-chip cache size, entire is flushed. */ - cacheflush(addr, nbytes, DCACHE); -#elif defined(_M_MRX000) || defined(_MIPS_) -#error "Sorry, cacheflush() for MIPS not implemented" -#else - /* LY: assume no relevant mmap/dcache issues. */ - (void)addr; - (void)nbytes; -#endif -} - -/*----------------------------------------------------------------------------*/ -/* libc compatibility stuff */ - -#ifndef mdbx_assert_fail -void mdbx_assert_fail(const MDBX_env *env, const char *msg, const char *func, - int line); -#endif /* mdbx_assert_fail */ - -#if __GLIBC_PREREQ(2, 1) -#define mdbx_asprintf asprintf -#else -int mdbx_asprintf(char **strp, const char *fmt, ...); -#endif - -#ifdef _MSC_VER - -#ifndef snprintf -#define snprintf(buffer, buffer_size, format, ...) \ - _snprintf_s(buffer, buffer_size, _TRUNCATE, format, __VA_ARGS__) -#endif /* snprintf */ - -#ifndef vsnprintf -#define vsnprintf(buffer, buffer_size, format, args) \ - _vsnprintf_s(buffer, buffer_size, _TRUNCATE, format, args) -#endif /* vsnprintf */ - -#ifdef _ASSERTE -#undef assert -#define assert _ASSERTE -#endif - -#endif /* _MSC_VER */ - -/*----------------------------------------------------------------------------*/ -/* OS abstraction layer stuff */ - -/* max bytes to write in one call */ -#define MAX_WRITE UINT32_C(0x3fff0000) - -/* Get the size of a memory page for the system. - * This is the basic size that the platform's memory manager uses, and is - * fundamental to the use of memory-mapped files. */ -static __inline size_t mdbx_syspagesize(void) { -#if defined(_WIN32) || defined(_WIN64) - SYSTEM_INFO si; - GetSystemInfo(&si); - return si.dwPageSize; -#else - return sysconf(_SC_PAGE_SIZE); -#endif -} - -static __inline char *mdbx_strdup(const char *str) { -#ifdef _MSC_VER - return _strdup(str); -#else - return strdup(str); -#endif -} - -static __inline int mdbx_get_errno(void) { -#if defined(_WIN32) || defined(_WIN64) - DWORD rc = GetLastError(); -#else - int rc = errno; -#endif - return rc; -} - -int mdbx_memalign_alloc(size_t alignment, size_t bytes, void **result); -void mdbx_memalign_free(void *ptr); - -int mdbx_condmutex_init(mdbx_condmutex_t *condmutex); -int mdbx_condmutex_lock(mdbx_condmutex_t *condmutex); -int mdbx_condmutex_unlock(mdbx_condmutex_t *condmutex); -int mdbx_condmutex_signal(mdbx_condmutex_t *condmutex); -int mdbx_condmutex_wait(mdbx_condmutex_t *condmutex); -int mdbx_condmutex_destroy(mdbx_condmutex_t *condmutex); - -int mdbx_fastmutex_init(mdbx_fastmutex_t *fastmutex); -int mdbx_fastmutex_acquire(mdbx_fastmutex_t *fastmutex); -int mdbx_fastmutex_release(mdbx_fastmutex_t *fastmutex); -int mdbx_fastmutex_destroy(mdbx_fastmutex_t *fastmutex); - -int mdbx_pwritev(mdbx_filehandle_t fd, struct iovec *iov, int iovcnt, - uint64_t offset, size_t expected_written); -int mdbx_pread(mdbx_filehandle_t fd, void *buf, size_t count, uint64_t offset); -int mdbx_pwrite(mdbx_filehandle_t fd, const void *buf, size_t count, - uint64_t offset); -int mdbx_write(mdbx_filehandle_t fd, const void *buf, size_t count); - -int mdbx_thread_create(mdbx_thread_t *thread, - THREAD_RESULT(THREAD_CALL *start_routine)(void *), - void *arg); -int mdbx_thread_join(mdbx_thread_t thread); -int mdbx_thread_key_create(mdbx_thread_key_t *key); -void mdbx_thread_key_delete(mdbx_thread_key_t key); -void *mdbx_thread_rthc_get(mdbx_thread_key_t key); -void mdbx_thread_rthc_set(mdbx_thread_key_t key, const void *value); - -int mdbx_filesync(mdbx_filehandle_t fd, bool fullsync); -int mdbx_filesize_sync(mdbx_filehandle_t fd); -int mdbx_ftruncate(mdbx_filehandle_t fd, uint64_t length); -int mdbx_filesize(mdbx_filehandle_t fd, uint64_t *length); -int mdbx_openfile(const char *pathname, int flags, mode_t mode, - mdbx_filehandle_t *fd); -int mdbx_closefile(mdbx_filehandle_t fd); - -typedef struct mdbx_mmap_param { - union { - void *address; - uint8_t *dxb; - struct MDBX_lockinfo *lck; - }; - mdbx_filehandle_t fd; - size_t length; /* mapping length, but NOT a size of file or DB */ -#if defined(_WIN32) || defined(_WIN64) - size_t current; /* mapped region size, e.g. file and DB */ -#endif -#ifdef MDBX_OSAL_SECTION - MDBX_OSAL_SECTION section; -#endif -} mdbx_mmap_t; - -int mdbx_mmap(int flags, mdbx_mmap_t *map, size_t must, size_t limit); -int mdbx_munmap(mdbx_mmap_t *map); -int mdbx_mresize(int flags, mdbx_mmap_t *map, size_t current, size_t wanna); -int mdbx_msync(mdbx_mmap_t *map, size_t offset, size_t length, int async); - -static __inline mdbx_pid_t mdbx_getpid(void) { -#if defined(_WIN32) || defined(_WIN64) - return GetCurrentProcessId(); -#else - return getpid(); -#endif -} - -static __inline mdbx_tid_t mdbx_thread_self(void) { -#if defined(_WIN32) || defined(_WIN64) - return GetCurrentThreadId(); -#else - return pthread_self(); -#endif -} - -void mdbx_osal_jitter(bool tiny); - -/*----------------------------------------------------------------------------*/ -/* lck stuff */ - -#if defined(_WIN32) || defined(_WIN64) -#undef MDBX_OSAL_LOCK -#define MDBX_OSAL_LOCK_SIGN UINT32_C(0xF10C) -#else -#define MDBX_OSAL_LOCK pthread_mutex_t -#define MDBX_OSAL_LOCK_SIGN UINT32_C(0x8017) -#endif - -int mdbx_lck_init(MDBX_env *env); - -int mdbx_lck_seize(MDBX_env *env); -int mdbx_lck_downgrade(MDBX_env *env, bool complete); -int mdbx_lck_upgrade(MDBX_env *env); -void mdbx_lck_destroy(MDBX_env *env); - -int mdbx_rdt_lock(MDBX_env *env); -void mdbx_rdt_unlock(MDBX_env *env); - -int mdbx_txn_lock(MDBX_env *env, bool dontwait); -void mdbx_txn_unlock(MDBX_env *env); - -int mdbx_rpid_set(MDBX_env *env); -int mdbx_rpid_clear(MDBX_env *env); - -/* Checks reader by pid. - * - * Returns: - * MDBX_RESULT_TRUE, if pid is live (unable to acquire lock) - * MDBX_RESULT_FALSE, if pid is dead (lock acquired) - * or otherwise the errcode. */ -int mdbx_rpid_check(MDBX_env *env, mdbx_pid_t pid); - -/*----------------------------------------------------------------------------*/ -/* Atomics */ - -#if !defined(__cplusplus) && (__STDC_VERSION__ >= 201112L) && \ - !defined(__STDC_NO_ATOMICS__) && \ - (__GNUC_PREREQ(4, 9) || __CLANG_PREREQ(3, 8) || \ - !(defined(__GNUC__) || defined(__clang__))) -#include <stdatomic.h> -#elif defined(__GNUC__) || defined(__clang__) -/* LY: nothing required */ -#elif defined(_MSC_VER) -#pragma warning(disable : 4163) /* 'xyz': not available as an intrinsic */ -#pragma warning(disable : 4133) /* 'function': incompatible types - from \ - 'size_t' to 'LONGLONG' */ -#pragma warning(disable : 4244) /* 'return': conversion from 'LONGLONG' to \ - 'std::size_t', possible loss of data */ -#pragma warning(disable : 4267) /* 'function': conversion from 'size_t' to \ - 'long', possible loss of data */ -#pragma intrinsic(_InterlockedExchangeAdd, _InterlockedCompareExchange) -#pragma intrinsic(_InterlockedExchangeAdd64, _InterlockedCompareExchange64) -#elif defined(__APPLE__) -#include <libkern/OSAtomic.h> -#else -#error FIXME atomic-ops -#endif - -static __inline uint32_t mdbx_atomic_add32(volatile uint32_t *p, uint32_t v) { -#if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT) - assert(atomic_is_lock_free(p)); - return atomic_fetch_add((_Atomic uint32_t *)p, v); -#elif defined(__GNUC__) || defined(__clang__) - return __sync_fetch_and_add(p, v); -#else -#ifdef _MSC_VER - return _InterlockedExchangeAdd(p, v); -#endif -#ifdef __APPLE__ - return OSAtomicAdd32(v, (volatile int32_t *)p); -#endif -#endif -} - -static __inline uint64_t mdbx_atomic_add64(volatile uint64_t *p, uint64_t v) { -#if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT) - assert(atomic_is_lock_free(p)); - return atomic_fetch_add((_Atomic uint64_t *)p, v); -#elif defined(__GNUC__) || defined(__clang__) - return __sync_fetch_and_add(p, v); -#else -#ifdef _MSC_VER - return _InterlockedExchangeAdd64((volatile int64_t *)p, v); -#endif -#ifdef __APPLE__ - return OSAtomicAdd64(v, (volatile int64_t *)p); -#endif -#endif -} - -#define mdbx_atomic_sub32(p, v) mdbx_atomic_add32(p, 0 - (v)) -#define mdbx_atomic_sub64(p, v) mdbx_atomic_add64(p, 0 - (v)) - -static __inline bool mdbx_atomic_compare_and_swap32(volatile uint32_t *p, - uint32_t c, uint32_t v) { -#if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT) - assert(atomic_is_lock_free(p)); - return atomic_compare_exchange_strong((_Atomic uint32_t *)p, &c, v); -#elif defined(__GNUC__) || defined(__clang__) - return __sync_bool_compare_and_swap(p, c, v); -#else -#ifdef _MSC_VER - return c == _InterlockedCompareExchange(p, v, c); -#endif -#ifdef __APPLE__ - return c == OSAtomicCompareAndSwap32Barrier(c, v, (volatile int32_t *)p); -#endif -#endif -} - -static __inline bool mdbx_atomic_compare_and_swap64(volatile uint64_t *p, - uint64_t c, uint64_t v) { -#if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT) - assert(atomic_is_lock_free(p)); - return atomic_compare_exchange_strong((_Atomic uint64_t *)p, &c, v); -#elif defined(__GNUC__) || defined(__clang__) - return __sync_bool_compare_and_swap(p, c, v); -#else -#ifdef _MSC_VER - return c == _InterlockedCompareExchange64((volatile int64_t *)p, v, c); -#endif -#ifdef __APPLE__ - return c == OSAtomicCompareAndSwap64Barrier(c, v, (volatile uint64_t *)p); -#endif -#endif -} - -/*----------------------------------------------------------------------------*/ - -#if defined(_MSC_VER) && _MSC_VER >= 1900 && _MSC_VER < 1920 -/* LY: MSVC 2015/2017 has buggy/inconsistent PRIuPTR/PRIxPTR macros - * for internal format-args checker. */ -#undef PRIuPTR -#undef PRIiPTR -#undef PRIdPTR -#undef PRIxPTR -#define PRIuPTR "Iu" -#define PRIiPTR "Ii" -#define PRIdPTR "Id" -#define PRIxPTR "Ix" -#define PRIuSIZE "zu" -#define PRIiSIZE "zi" -#define PRIdSIZE "zd" -#define PRIxSIZE "zx" -#endif /* fix PRI*PTR for _MSC_VER */ - -#ifndef PRIuSIZE -#define PRIuSIZE PRIuPTR -#define PRIiSIZE PRIiPTR -#define PRIdSIZE PRIdPTR -#define PRIxSIZE PRIxPTR -#endif /* PRI*SIZE macros for MSVC */ - -#ifdef _MSC_VER -#pragma warning(pop) -#endif diff --git a/plugins/Dbx_mdb/src/mdbx/version.c b/plugins/Dbx_mdb/src/mdbx/version.c deleted file mode 100644 index ef4f99088d..0000000000 --- a/plugins/Dbx_mdb/src/mdbx/version.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2015-2017 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 "./bits.h" - -#if MDBX_VERSION_MAJOR != 0 || MDBX_VERSION_MINOR != 0 -#error "API version mismatch!" -#endif - -#define MDBX_VERSION_RELEASE 0 -#define MDBX_VERSION_REVISION 0 - -/*LIBMDBX_EXPORTS*/ const mdbx_version_info mdbx_version = { - MDBX_VERSION_MAJOR, - MDBX_VERSION_MINOR, - MDBX_VERSION_RELEASE, - MDBX_VERSION_REVISION, - {"@MDBX_GIT_TIMESTAMP@", "@MDBX_GIT_TREE@", "@MDBX_GIT_COMMIT@", - "@MDBX_GIT_DESCRIBE@"}}; - -/*LIBMDBX_EXPORTS*/ const mdbx_build_info mdbx_build = { - "@MDBX_BUILD_TIMESTAMP@", "@MDBX_BUILD_TAGRET@", "@MDBX_BUILD_OPTIONS@", - "@MDBX_BUILD_COMPILER@", "@MDBX_BUILD_FLAGS@"}; diff --git a/plugins/Dbx_mdb/src/stdafx.h b/plugins/Dbx_mdb/src/stdafx.h index 93865631ea..ffbcdb8037 100644 --- a/plugins/Dbx_mdb/src/stdafx.h +++ b/plugins/Dbx_mdb/src/stdafx.h @@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_netlib.h>
#include <m_gui.h>
-#include "mdbx/mdbx.h"
+#include "libmdbx/mdbx.h"
#ifndef thread_local
# define thread_local __declspec(thread)
diff --git a/plugins/Dbx_mdb/src/version.h b/plugins/Dbx_mdb/src/version.h index 49ab4f5196..503addec53 100644 --- a/plugins/Dbx_mdb/src/version.h +++ b/plugins/Dbx_mdb/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Dbx_mdb.dll"
#define __DESCRIPTION "Provides Miranda database support: global settings, contacts, history, settings per contact."
#define __AUTHOR "Miranda-NG project"
-#define __AUTHOREMAIL "ghazan@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/Dbx_mdb/"
#define __COPYRIGHT "© 2015-17 Miranda NG project"
diff --git a/plugins/Exchange/src/exchange.cpp b/plugins/Exchange/src/exchange.cpp index 57ac5f3fe0..0a0ef5f291 100644 --- a/plugins/Exchange/src/exchange.cpp +++ b/plugins/Exchange/src/exchange.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo = { __VERSION_DWORD,
__DESC,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Exchange/src/version.h b/plugins/Exchange/src/version.h index 036b0e6996..f57f11dcec 100644 --- a/plugins/Exchange/src/version.h +++ b/plugins/Exchange/src/version.h @@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __DESC "Notifies you if you have unread email on an exchange server."
#define __AUTHOR "Cristian Libotean, Attila Vajda, MaKaR (NG)"
-#define __AUTHOREMAIL "makar@poczta.of.pl"
#define __COPYRIGHT "© 2006-2013 Cristian Libotean and Attila Vajda"
#define __AUTHORWEB "https://miranda-ng.org/p/Exchange/"
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index bc4d4dc996..0d81de53f0 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -43,7 +43,6 @@ static PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/FTPFileYM/src/version.h b/plugins/FTPFileYM/src/version.h index ea36fb539f..c551742f77 100644 --- a/plugins/FTPFileYM/src/version.h +++ b/plugins/FTPFileYM/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "FTPFile.dll"
#define __DESCRIPTION "FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS."
#define __AUTHOR "yaho"
-#define __AUTHOREMAIL "yaho@miranda-easy.net"
#define __AUTHORWEB "https://miranda-ng.org/p/FTPFile/"
#define __COPYRIGHT "© 2007-2010 Jan Holub"
diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 04d429a82b..149a9527ad 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/FavContacts/src/version.h b/plugins/FavContacts/src/version.h index 057d4f6502..56b78919f1 100644 --- a/plugins/FavContacts/src/version.h +++ b/plugins/FavContacts/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "FavContacts.dll" #define __DESCRIPTION "Favorite contacts menu." #define __AUTHOR "Victor Pavlychko" -#define __AUTHOREMAIL "nullbie@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/FavContacts/" #define __COPYRIGHT "© 2007-2009 Victor Pavlychko" diff --git a/plugins/FileAsMessage/fileecho.vcxproj b/plugins/FileAsMessage/fileecho.vcxproj new file mode 100644 index 0000000000..f06261bfeb --- /dev/null +++ b/plugins/FileAsMessage/fileecho.vcxproj @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <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 Label="Globals"> + <ProjectGuid>{D7A3B8D0-425A-2286-8E2F-2C0BF1EE5C2E}</ProjectGuid> + <ProjectName>FileAsMessage</ProjectName> + </PropertyGroup> + <ImportGroup Label="PropertySheets"> + <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> + </ImportGroup> + <ItemDefinitionGroup> + <ClCompile> + <ExceptionHandling>Sync</ExceptionHandling> + </ClCompile> + </ItemDefinitionGroup> +</Project>
\ No newline at end of file diff --git a/plugins/FileAsMessage/fileecho.vcxproj.filters b/plugins/FileAsMessage/fileecho.vcxproj.filters new file mode 100644 index 0000000000..fcae13a9d8 --- /dev/null +++ b/plugins/FileAsMessage/fileecho.vcxproj.filters @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> +</Project>
\ No newline at end of file diff --git a/plugins/FileAsMessage/fileecho_15.vcxproj b/plugins/FileAsMessage/fileecho_15.vcxproj deleted file mode 100644 index ad58b889c1..0000000000 --- a/plugins/FileAsMessage/fileecho_15.vcxproj +++ /dev/null @@ -1,213 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <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 Label="Globals"> - <ProjectName>FileAsMessage</ProjectName> - <ProjectGuid>{D7A3B8D0-425A-2286-8E2F-2C0BF1EE5C2E}</ProjectGuid> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v141_xp</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v141_xp</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v141_xp</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v141_xp</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir> - <IgnoreImportLibrary>true</IgnoreImportLibrary> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> - <StringPooling>true</StringPooling> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level4</WarningLevel> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <ExceptionHandling>false</ExceptionHandling> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>main.h</PrecompiledHeaderFile> - <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - </ClCompile> - <Link> - <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\libs\win$(PlatformArchitecture)</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <StringPooling>true</StringPooling> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level4</WarningLevel> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <ExceptionHandling>false</ExceptionHandling> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>main.h</PrecompiledHeaderFile> - <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - </ClCompile> - <Link> - <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\libs\win$(PlatformArchitecture)</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <ExceptionHandling>false</ExceptionHandling> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>main.h</PrecompiledHeaderFile> - <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - </ClCompile> - <Link> - <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\libs\win$(PlatformArchitecture)</AdditionalLibraryDirectories> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <ExceptionHandling>false</ExceptionHandling> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>main.h</PrecompiledHeaderFile> - <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> - </ClCompile> - <Link> - <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> - <SubSystem>Windows</SubSystem> - <RandomizedBaseAddress>false</RandomizedBaseAddress> - <AdditionalLibraryDirectories>$(ProfileDir)..\..\libs\win$(PlatformArchitecture)</AdditionalLibraryDirectories> - </Link> - <ResourceCompile> - <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories> - </ResourceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="src\crc32.cpp" /> - <ClCompile Include="src\dialog.cpp" /> - <ClCompile Include="src\main.cpp" /> - <ClCompile Include="src\optionsdlg.cpp" /> - <ClCompile Include="src\stdafx.cpp"> - <PrecompiledHeader>Create</PrecompiledHeader> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="src\dialog.h" /> - <ClInclude Include="src\main.h" /> - <ClInclude Include="src\resource.h" /> - <ClInclude Include="src\Version.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="res\resources.rc" /> - <ResourceCompile Include="res\Version.rc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/plugins/FileAsMessage/fileecho_15.vcxproj.filters b/plugins/FileAsMessage/fileecho_15.vcxproj.filters deleted file mode 100644 index 3a89d474af..0000000000 --- a/plugins/FileAsMessage/fileecho_15.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{91cea954-c950-4791-8ce9-443edfb3dabe}</UniqueIdentifier> - <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{ea4654ae-48b4-4664-bc0e-c880a231e1f9}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{03c6b185-748a-4512-8aeb-8f6b2e4b8024}</UniqueIdentifier> - <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="src\dialog.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\main.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\optionsdlg.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\crc32.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\stdafx.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="src\dialog.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="src\main.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="src\resource.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="src\Version.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="res\Version.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - <ResourceCompile Include="res\resources.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/plugins/FileAsMessage/src/crc32.cpp b/plugins/FileAsMessage/src/crc32.cpp index dc40c1a6fb..9bf7a63d2d 100644 --- a/plugins/FileAsMessage/src/crc32.cpp +++ b/plugins/FileAsMessage/src/crc32.cpp @@ -1,4 +1,4 @@ -#include "main.h"
+#include "stdafx.h"
const ulong CRCPoly = 0xEDB88320;
ulong CRC32Table[256];
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 36fbd38780..e935b2204e 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -1,4 +1,4 @@ -#include"main.h"
+#include "stdafx.h"
char *szFEMode[] =
{
@@ -9,18 +9,15 @@ char *szFEMode[] = char* ltoax(char* s, DWORD value)
{
if (value == 0)
- {
*s++ = '0';
- }
+
uchar data;
int indx = 8;
- while (indx && !(data = (uchar)(value >> 28) & 0x0F))
- {
+ while (indx && !(data = (uchar)(value >> 28) & 0x0F)) {
value <<= 4;
indx--;
}
- while (indx)
- {
+ while (indx) {
data = (uchar)(value >> 28) & 0x0F;
if (data > 9) data += 'A' - 10;
else data += '0';
@@ -30,15 +27,14 @@ char* ltoax(char* s, DWORD value) }
return s;
}
+
uint atolx(char* &value)
{
uint result = 0;
uchar ch;
- while (*value && (ch = *value - '0') >= 0)
- {
- if (ch > 9)
- {
+ while (*value && (ch = *value - '0') >= 0) {
+ if (ch > 9) {
ch -= 'A' - '0';
if (ch > 5) break;
ch += 10;
@@ -69,19 +65,18 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA switch (message) {
case WM_COMMAND:
- {
- PUDeletePopup(hWnd);
- pcli->pfnRemoveEvent(hContact, 0);
-
- if (IsWindow(hDlg))
{
- ShowWindow(hDlg, SW_SHOWNORMAL);
- SetForegroundWindow(hDlg);
- SetFocus(hDlg);
- }
+ PUDeletePopup(hWnd);
+ pcli->pfnRemoveEvent(hContact, 0);
- break;
- }
+ if (IsWindow(hDlg)) {
+ ShowWindow(hDlg, SW_SHOWNORMAL);
+ SetForegroundWindow(hDlg);
+ SetFocus(hDlg);
+ }
+
+ break;
+ }
case WM_CONTEXTMENU:
PUDeletePopup(hWnd);
break;
@@ -92,58 +87,56 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA }
return DefWindowProc(hWnd, message, wParam, lParam);
}
-//
+
+/////////////////////////////////////////////////////////////////////////////////////////
// Just create simple Popup for specified contact
-//
-void MakePopupMsg(HWND hDlg, MCONTACT hContact, char *msg)
+
+void MakePopupMsg(HWND hDlg, MCONTACT hContact, wchar_t *msg)
{
HWND hFocused = GetForegroundWindow();
if (hDlg == hFocused || hDlg == GetParent(hFocused)) return;
- //
- //The text for the second line. You could even make something like: char lpzText[128]; mir_wstrcpy(lpzText, "Hello world!"); It's your choice.
- //
- POPUPDATA ppd = { 0 };
+ POPUPDATAW ppd = { 0 };
ppd.lchContact = hContact;
ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SMALLICON));
- mir_strcpy(ppd.lpzContactName, _T2A(pcli->pfnGetContactDisplayName(hContact, 0)));
- mir_strcpy(ppd.lpzText, msg);
+ mir_wstrcpy(ppd.lpwzContactName, pcli->pfnGetContactDisplayName(hContact, 0));
+ mir_wstrcpy(ppd.lpwzText, msg);
ppd.colorBack = GetSysColor(COLOR_INFOBK);
ppd.colorText = GetSysColor(COLOR_INFOTEXT);
ppd.PluginWindowProc = PopupDlgProc;
ppd.PluginData = (void*)hDlg;
ppd.iSeconds = -1;
- PUAddPopup(&ppd);
+ PUAddPopupW(&ppd);
}
-//
+
+/////////////////////////////////////////////////////////////////////////////////////////
// Get ID of string message
-//
+
int getMsgId(char *msg)
{
for (int indx = 0; indx < CMD_COUNT; indx++)
- {
- if (*msg == cCmdList[indx]) return indx;
- }
+ if (*msg == cCmdList[indx])
+ return indx;
+
return -1;
};
-int RetrieveFileSize(char *filename)
+int RetrieveFileSize(wchar_t *filename)
{
- int handle = open(filename, O_RDONLY | O_BINARY, 0);
- if (handle != -1)
- {
- int size = filelength(handle);
- close(handle);
+ FILE *hFile = _wfopen(filename, L"rb");
+ if (hFile != NULL) {
+ fseek(hFile, 0, SEEK_END);
+ int size = ftell(hFile);
+ fclose(hFile);
return size;
}
- return handle;
+ return 0;
}
FILEECHO::FILEECHO(MCONTACT Contact)
{
hContact = Contact;
dwSendInterval = db_get_dw(NULL, SERVICE_NAME, "SendDelay", 6000);
- //dwChunkSize = db_get_dw(NULL, SERVICE_NAME, "ChunkSize", 5000);
chunkMaxLen = db_get_dw(NULL, SERVICE_NAME, "ChunkSize", 5000);
chunkCount = 0;
@@ -162,26 +155,10 @@ uint controlEnabled[][2] = STATE_OPERATE | STATE_PAUSED | STATE_PRERECV | STATE_ACKREQ | STATE_IDLE,
IDC_STOP,
STATE_OPERATE | STATE_PAUSED | STATE_PRERECV | STATE_REQSENT | STATE_ACKREQ,
- // IDC_FILENAME,
- // STATE_IDLE|STATE_PRERECV|STATE_FINISHED|STATE_CANCELLED,
- // IDC_BROWSE,
- // STATE_IDLE|STATE_PRERECV|STATE_FINISHED|STATE_CANCELLED,
-};
-/*
-char *stateMsg[][2] =
-{
-(char*)STATE_IDLE,"Idle",
-(char*)STATE_REQSENT,"ReqSent",
-(char*)STATE_PRERECV,"PreRecv",
-(char*)STATE_OPERATE,"Operate",
-(char*)STATE_ACKREQ,"AckReq",
-(char*)STATE_CANCELLED,"Canceled",
-(char*)STATE_FINISHED,"Finished",
-(char*)STATE_PAUSED,"Paused"
};
-*/
-char *hint_controls[4] = {
+char *hint_controls[4] =
+{
"Perform",
"Pause",
"Revive a transfer",
@@ -191,21 +168,16 @@ char *hint_controls[4] = { void FILEECHO::setState(DWORD state)
{
iState = state;
- int indx;
- for (indx = 0; indx < _countof(controlEnabled); indx++)
- {
+ for (int indx = 0; indx < _countof(controlEnabled); indx++)
EnableWindow(GetDlgItem(hDlg, controlEnabled[indx][0]), (iState & controlEnabled[indx][1]) != 0);
- }
- if (!inSend) // recv
- {
+ if (!inSend) {
+ // recv
int kind;
SendDlgItemMessage(hDlg, IDC_FILENAME, EM_SETREADONLY, (state != STATE_PRERECV), 0);
EnableWindow(GetDlgItem(hDlg, IDC_BROWSE), (iState & (STATE_PRERECV | STATE_FINISHED)));
- //SendDlgItemMessage(hDlg, IDC_FILENAME, EM_SETREADONLY, (iState & STATE_PRERECV) == 0, 0);
- //EnableWindow(GetDlgItem(hDlg, IDC_FILENAME), (iState == STATE_PRERECV));
- //EnableWindow(GetDlgItem(hDlg, IDC_FILENAME), (iState & STATE_IDLE|STATE_PRERECV|STATE_FINISHED|STATE_CANCELLED) != 0);
+
if (state & (STATE_IDLE | STATE_FINISHED | STATE_CANCELLED | STATE_PRERECV))
kind = ICON_PLAY;
else
@@ -213,13 +185,11 @@ void FILEECHO::setState(DWORD state) SendDlgItemMessage(hDlg, IDC_PLAY, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcons[kind]);
SendDlgItemMessage(hDlg, IDC_PLAY, BUTTONADDTOOLTIP, (WPARAM)Translate(hint_controls[kind]), 0);
}
- else
- {
+ else {
SendDlgItemMessage(hDlg, IDC_FILENAME, EM_SETREADONLY, (iState & (STATE_IDLE | STATE_FINISHED | STATE_CANCELLED)) == 0, 0);
EnableWindow(GetDlgItem(hDlg, IDC_BROWSE), (iState & (STATE_IDLE | STATE_FINISHED | STATE_CANCELLED)) != 0);
- //EnableWindow(GetDlgItem(hDlg, IDC_FILENAME), (iState & STATE_IDLE|STATE_PRERECV|STATE_FINISHED|STATE_CANCELLED) != 0);
- switch (state)
- {
+
+ switch (state) {
case STATE_FINISHED:
case STATE_CANCELLED:
case STATE_IDLE:
@@ -246,7 +216,7 @@ void FILEECHO::updateTitle() mir_snprintf(newtitle, "%d%% - %s: %s", chunkSent * 100 / chunkCount, Translate(szFEMode[inSend]), contactName);
else
mir_snprintf(newtitle, "%s: %s", Translate(szFEMode[inSend]), contactName);
- SetWindowText(hDlg, newtitle);
+ SetWindowTextA(hDlg, newtitle);
}
void BuildFreqTable(uchar *data, uint len, uint *freqTable)
@@ -267,58 +237,49 @@ int FILEECHO::createTransfer() #endif
BYTE bAuto = db_get_b(NULL, "SRFile", "AutoAccept", 0);
- hFile = CreateFile(filename, inSend ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE), inSend ? FILE_SHARE_READ : 0, nullptr, inSend ? OPEN_EXISTING : (bAuto ? CREATE_ALWAYS : CREATE_NEW), FILE_ATTRIBUTE_NORMAL, nullptr);
- if (hFile == INVALID_HANDLE_VALUE && !inSend && GetLastError() == ERROR_FILE_EXISTS)
- {
- if (MessageBox(hDlg, Translate("File already exists. Overwrite?"),
- Translate(SERVICE_TITLE),
+ hFile = CreateFileA(filename, inSend ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE), inSend ? FILE_SHARE_READ : 0, nullptr, inSend ? OPEN_EXISTING : (bAuto ? CREATE_ALWAYS : CREATE_NEW), FILE_ATTRIBUTE_NORMAL, nullptr);
+ if (hFile == INVALID_HANDLE_VALUE && !inSend && GetLastError() == ERROR_FILE_EXISTS) {
+ if (MessageBox(hDlg, TranslateT("File already exists. Overwrite?"),
+ TranslateT(SERVICE_TITLE),
MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) != IDYES) return 0;
- hFile = CreateFile(filename, GENERIC_READ | GENERIC_WRITE, 0,
+ hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0,
nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
}
- if (hFile == INVALID_HANDLE_VALUE) goto createTransfer_FAILED;
- if (!inSend)
- {
+ if (hFile == INVALID_HANDLE_VALUE)
+ goto createTransfer_FAILED;
+
+ if (!inSend) {
SetFilePointer(hFile, fileSize, nullptr, FILE_BEGIN);
SetEndOfFile(hFile);
}
- else
- fileSize = GetFileSize(hFile, nullptr);
- hMapping = CreateFileMapping(hFile, nullptr, inSend ? PAGE_READONLY : PAGE_READWRITE,
- 0, fileSize, nullptr);
+ else fileSize = GetFileSize(hFile, nullptr);
+
+ hMapping = CreateFileMapping(hFile, nullptr, inSend ? PAGE_READONLY : PAGE_READWRITE, 0, fileSize, nullptr);
LastError = GetLastError();
- if (hMapping == nullptr) goto createTransfer_FAILED;
+ if (hMapping == nullptr)
+ goto createTransfer_FAILED;
+
lpData = (uchar*)MapViewOfFile(hMapping, inSend ? FILE_MAP_READ : FILE_MAP_WRITE, 0, 0, 0);
LastError = GetLastError();
- if (lpData == nullptr) goto createTransfer_FAILED;
+ if (lpData == nullptr)
+ goto createTransfer_FAILED;
- if (inSend)
- //
- // frequency analysis of source file
- // and building the table of offsets
- //
- {
- if (asBinary)
- {
+ if (inSend) {
+ // frequency analysis of source file and building the table of offsets
+ if (asBinary) {
uint freq_table[256] = { 0 };
codeSymb = 1;
- //
+
// searching for symbol with lowest frequency: "codeSymb"
- //
BuildFreqTable(lpData, fileSize, freq_table);
- for (uint i = codeSymb + 1; i < 256; ++i)
- {
+ for (uint i = codeSymb + 1; i < 256; ++i) {
if (freq_table[codeSymb] > freq_table[i])
codeSymb = i;
}
- //DEBUG
- //codeSymb = ':';
- //
// calculating chunks sizes
// build table of chunks offsets: chunkPos
- //
uint chunk_count_limit = 2 * fileSize / chunkMaxLen + 2;
chunkPos = (uint*)calloc(chunk_count_limit, sizeof(uint));
@@ -328,16 +289,14 @@ int FILEECHO::createTransfer() uint indx = 0;
uint chunk_offset = 0;
- for (uint len = fileSize; len; --len)
- {
+ for (uint len = fileSize; len; --len) {
if (*data == 0 || *data == codeSymb)
out_size += 2;
else
++out_size;
data++; chunk_size++;
- if (out_size >= chunkMaxLen - 1)
- {
+ if (out_size >= chunkMaxLen - 1) {
chunkPos[indx] = chunk_offset;
chunk_offset += chunk_size;
chunk_size = 0; out_size = 0;
@@ -348,8 +307,7 @@ int FILEECHO::createTransfer() chunkPos = (uint*)realloc(chunkPos, sizeof(uint)*(chunkCount + 1));
chunkPos[indx] = chunk_offset + chunk_size;
}
- else
- {
+ else {
int EncodedMaxLen = Netlib_GetBase64EncodedBufferSize(Netlib_GetBase64DecodedBufferSize(chunkMaxLen));
int DecodedMaxLen = Netlib_GetBase64DecodedBufferSize(EncodedMaxLen);
@@ -358,21 +316,19 @@ int FILEECHO::createTransfer() chunkPos = (uint*)calloc(chunkCount + 1, sizeof(uint));
uint i = 0;
- for (uint chunk_offset = 0; i < chunkCount; ++i, chunk_offset += DecodedMaxLen)
- {
+ for (uint chunk_offset = 0; i < chunkCount; ++i, chunk_offset += DecodedMaxLen) {
chunkPos[i] = chunk_offset;
}
chunkPos[i] = chunkPos[i - 1] + (fileSize % DecodedMaxLen);
}
}
- else
- chunkCount = chunkCountx;
+ else chunkCount = chunkCountx;
chunkAck = (uchar*)calloc(chunkCount, sizeof(uchar));
chunkIndx = 0; chunkSent = 0;
-
return 1;
+
createTransfer_FAILED:
if (lpData != nullptr) UnmapViewOfFile(lpData);
if (hMapping != nullptr) CloseHandle(hMapping);
@@ -382,8 +338,7 @@ createTransfer_FAILED: void FILEECHO::destroyTransfer()
{
- if (chunkCount)
- {
+ if (chunkCount) {
chunkCount = 0;
if (inSend)
free(chunkPos);
@@ -392,19 +347,17 @@ void FILEECHO::destroyTransfer() if (hMapping != nullptr) CloseHandle(hMapping);
if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile);
}
- //setState(STATE_IDLE);
- return;
}
void FILEECHO::sendReq()
{
char sendbuf[MAX_PATH];
- if (!createTransfer())
- {
- SetDlgItemText(hDlg, IDC_FILESIZE, Translate("Couldn't open a file"));
+ if (!createTransfer()) {
+ SetDlgItemText(hDlg, IDC_FILESIZE, TranslateT("Couldn't open a file"));
return;
}
+
///!!!!!!!
char *p = filename + mir_strlen(filename);
while (p != filename && *p != '\\')
@@ -413,11 +366,11 @@ void FILEECHO::sendReq() mir_strcpy(filename, p + 1);
mir_snprintf(sendbuf, Translate("Size: %d bytes"), fileSize);
- SetDlgItemText(hDlg, IDC_FILESIZE, sendbuf);
+ SetDlgItemTextA(hDlg, IDC_FILESIZE, sendbuf);
mir_snprintf(sendbuf, "?%c%c%d:%d \n" NOPLUGIN_MESSAGE, asBinary + '0', codeSymb, chunkCount, fileSize);
sendCmd(0, CMD_REQ, sendbuf, filename);
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Request sent. Awaiting of acceptance.."));
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Request sent. Awaiting of acceptance.."));
setState(STATE_REQSENT);
}
@@ -444,16 +397,15 @@ void FILEECHO::incomeRequest(char *param) fileSize = atoi(param);
mir_snprintf(buf, Translate("Size: %d bytes"), fileSize);
- SetDlgItemText(hDlg, IDC_FILENAME, filename);
- SetDlgItemText(hDlg, IDC_FILESIZE, buf);
+ SetDlgItemTextA(hDlg, IDC_FILENAME, filename);
+ SetDlgItemTextA(hDlg, IDC_FILESIZE, buf);
setState(STATE_PRERECV);
inSend = FALSE;
Skin_PlaySound("RecvFile");
int AutoMin = db_get_b(NULL, "SRFile", "AutoMin", 0);
- if (db_get_b(NULL, "SRFile", "AutoAccept", 0) && !db_get_b(hContact, "CList", "NotOnList", 0))
- {
+ if (db_get_b(NULL, "SRFile", "AutoAccept", 0) && !db_get_b(hContact, "CList", "NotOnList", 0)) {
PostMessage(hDlg, WM_COMMAND, IDC_PLAY, 0);
if (AutoMin)
ShowWindow(hDlg, SW_SHOWMINIMIZED);
@@ -461,8 +413,7 @@ void FILEECHO::incomeRequest(char *param) // UpdateWindow(hDlg);
}
// else
- if (!IsWindowVisible(hDlg) && !AutoMin)
- {
+ if (!IsWindowVisible(hDlg) && !AutoMin) {
CLISTEVENT cle = {};
cle.hContact = hContact;
cle.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SMALLICON));
@@ -471,7 +422,7 @@ void FILEECHO::incomeRequest(char *param) cle.pszService = SERVICE_NAME "/FERecvFile";
pcli->pfnAddEvent(&cle);
- MakePopupMsg(hDlg, hContact, "Incoming file...");
+ MakePopupMsg(hDlg, hContact, L"Incoming file...");
}
}
@@ -479,10 +430,9 @@ void FILEECHO::cmdACCEPT() {
if (chunkCount == 0) return;
setState(STATE_OPERATE);
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Sending..."));
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Sending..."));
lastTimestamp = GetTickCount();
- //PostMessage(hDlg, WM_TIMER, 0,0);
- //onSendTimer();
+
SetTimer(hDlg, TIMER_SEND, dwSendInterval, nullptr);
}
@@ -491,10 +441,11 @@ void FILEECHO::updateProgress() InvalidateRect(GetDlgItem(hDlg, IDC_PROGRESS), nullptr, TRUE);
updateTitle();
}
-//
+
+/////////////////////////////////////////////////////////////////////////////////////////
// called in receive mode
// used to transfer acknowledge
-//
+
void FILEECHO::onRecvTimer()
{
if (chunkCount == 0) return;
@@ -504,19 +455,14 @@ void FILEECHO::onRecvTimer() uint indx, jndx;
KillTimer(hDlg, TIMER_SEND);
- //
+
// Build response about successfully received chunks
- //
indx = jndx = 0; prev_value = chunkAck[jndx];
- while (jndx < chunkCount)
- {
- if (chunkAck[jndx] != prev_value)
- {
- if (prev_value != CHUNK_ACK)
- {
+ while (jndx < chunkCount) {
+ if (chunkAck[jndx] != prev_value) {
+ if (prev_value != CHUNK_ACK) {
p = ltoax(p, indx);
- if (indx != jndx - 1)
- {
+ if (indx != jndx - 1) {
*p++ = '-';
p = ltoax(p, jndx - 1);
}
@@ -527,24 +473,20 @@ void FILEECHO::onRecvTimer() }
jndx++;
}
- if (prev_value != CHUNK_ACK)
- {
+ if (prev_value != CHUNK_ACK) {
p = ltoax(p, indx);
- if (indx != jndx - 1)
- {
+ if (indx != jndx - 1) {
*p++ = '-';
p = ltoax(p, jndx - 1);
}
}
*p = 0;
- if (*buffer == 0)
- {
- char *msg = Translate("Received successfully");
+ if (*buffer == 0) {
+ wchar_t *msg = TranslateT("Received successfully");
SetDlgItemText(hDlg, IDC_STATUS, msg);
MakePopupMsg(hDlg, hContact, msg);
setState(STATE_FINISHED);
- if (db_get_b(NULL, "SRFile", "AutoClose", 0))
- {
+ if (db_get_b(NULL, "SRFile", "AutoClose", 0)) {
PostMessage(hDlg, WM_CLOSE, 0, 0);
pcli->pfnRemoveEvent(hContact, 0);
}
@@ -554,27 +496,24 @@ void FILEECHO::onRecvTimer() }
sendCmd(0, CMD_DACK, buffer);
free(buffer);
- //if(iState != STATE_FINISHED) SetTimer(hDlg, TIMER_SEND, lastDelay*2, 0);
}
-//
+
+/////////////////////////////////////////////////////////////////////////////////////////
// called in sending mode
// used to data transfer and
// sending of scheduled commands
-//
+
void FILEECHO::onSendTimer()
{
if (chunkCount == 0) return;
- //
+
// perform request of acknowledge, if scheduled
- //
KillTimer(hDlg, TIMER_SEND);
- //
+
// Search for next unsent chunk
- //
while (chunkIndx < chunkCount && chunkAck[chunkIndx] != CHUNK_UNSENT) chunkIndx++;
- if (iState == STATE_ACKREQ || chunkIndx == chunkCount)
- {
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Requesting of missing chunks"));
+ if (iState == STATE_ACKREQ || chunkIndx == chunkCount) {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Requesting of missing chunks"));
setState(STATE_OPERATE);
sendCmd(0, CMD_END, "", nullptr);
chunkIndx = chunkCount + 1;
@@ -588,20 +527,14 @@ void FILEECHO::onSendTimer() uchar *data_end = lpData + chunkPos[chunkIndx + 1];
ulong chksum = memcrc32(data, data_end - data, INITCRC);
- if (asBinary)
- {
- //
+ if (asBinary) {
// Encoding data to transfer with symb. filtering
- //
- while (data < data_end)
- {
+ while (data < data_end) {
uchar ch = *data++;
- if (ch == 0)
- {
+ if (ch == 0) {
*p++ = codeSymb; *p++ = '0';
}
- else if (ch == codeSymb)
- {
+ else if (ch == codeSymb) {
*p++ = codeSymb; *p++ = '+';
}
else
@@ -609,8 +542,7 @@ void FILEECHO::onSendTimer() }
*p = 0;
}
- else
- {
+ else {
ptrA enc(mir_base64_encode(data, data_end - data));
mir_strncpy((char*)buffer, enc, chunkMaxLen * 2);
}
@@ -618,7 +550,7 @@ void FILEECHO::onSendTimer() char prefix[128];
mir_snprintf(prefix, "%X,%X,%X>", chunkIndx + 1, chunkPos[chunkIndx], chksum);
#ifdef DEBUG
- overhead += mir_wstrlen((char*)buffer);
+ overhead += mir_strlen((char*)buffer);
#endif
sendCmd(0, CMD_DATA, (char*)buffer, (char*)prefix);
chunkAck[chunkIndx] = CHUNK_SENT;
@@ -629,13 +561,13 @@ void FILEECHO::onSendTimer() if (chunkIndx == chunkCount)
setState(STATE_ACKREQ);
- else
- {
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Sending..."));
+ else {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Sending..."));
updateProgress();
}
SetTimer(hDlg, TIMER_SEND, dwSendInterval, nullptr);
}
+
void FILEECHO::cmdDATA(char *param)
{
if (chunkCount == 0) return;
@@ -649,21 +581,17 @@ void FILEECHO::cmdDATA(char *param) KillTimer(hDlg, TIMER_SEND);
- //
// Decoding of incoming data
- //
uchar *data = lpData + filepos;
uchar *data_end = lpData + fileSize;
- if (asBinary)
- {
+ if (asBinary) {
uchar ch;
- while (ch = *param++)
- {
- if (ch == codeSymb)
- {
- if ((ch = *param++) == 0) goto cmdDATA_corrupted;
- switch (ch)
- {
+ while (ch = *param++) {
+ if (ch == codeSymb) {
+ if ((ch = *param++) == 0)
+ return;
+
+ switch (ch) {
case '+':
ch = codeSymb;
break;
@@ -671,52 +599,46 @@ void FILEECHO::cmdDATA(char *param) ch = 0;
break;
default:
- goto cmdDATA_corrupted;
+ return;
}
}
- if (data > data_end) goto cmdDATA_corrupted;
+ if (data > data_end)
+ return;
*data++ = ch;
}
}
- else
- {
- unsigned bufLen;
+ else {
+ size_t bufLen;
mir_ptr<BYTE> buf((BYTE*)mir_base64_decode(param, &bufLen));
memcpy(data, buf, min(bufLen, unsigned(data_end - data)));
data += bufLen;
}
- //
+
// let's check it up
- //
chksum_local = memcrc32(lpData + filepos, data - (lpData + filepos), INITCRC);
- if (chksum_local == chksum_remote)
- {
+ if (chksum_local == chksum_remote) {
if (chunkAck[chunkIndx] != CHUNK_ACK) chunkSent++;
chunkAck[chunkIndx] = CHUNK_ACK;
- //chunkPos[chunkIndx++] = filepos;
}
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Receiving..."));
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Receiving..."));
updateProgress();
-cmdDATA_corrupted:
- //SetTimer(hDlg, TIMER_SEND, lastDelay*2, 0);
- ;
}
+
void FILEECHO::cmdEND()
{
SetTimer(hDlg, TIMER_SEND, dwSendInterval, nullptr);
}
+
void FILEECHO::cmdDACK(char *param)
{
uint indx, jndx;
if (chunkCount == 0) return;
memset(chunkAck, CHUNK_ACK, sizeof(uchar)*chunkCount);
- if (*param == 'x')
- //
- // All chunks has been received successfully
- //
- {
- char *msg = Translate("Sent successfully");
+
+ // All chunks has been received successfully
+ if (*param == 'x') {
+ wchar_t *msg = TranslateT("Sent successfully");
SetDlgItemText(hDlg, IDC_STATUS, msg);
Skin_PlaySound("FileDone");
@@ -726,27 +648,22 @@ void FILEECHO::cmdDACK(char *param) return;
}
chunkSent = chunkCount;
- //
+
// Mark chunks to re-transfer,
// according received info
//
// format: chunk1, chunk3-chunk10, etc..
- //
- while (*param)
- {
+
+ while (*param) {
indx = atolx(param);
- if (*param == '-')
- {
+ if (*param == '-') {
param++; jndx = atolx(param);
}
- else
- jndx = indx;
- if (*param == 0 || *param == ',')
- {
- for (uint p = indx; p <= jndx; p++)
- {
- if (p < chunkCount)
- {
+ else jndx = indx;
+
+ if (*param == 0 || *param == ',') {
+ for (uint p = indx; p <= jndx; p++) {
+ if (p < chunkCount) {
chunkAck[p] = CHUNK_UNSENT;
chunkSent--;
}
@@ -757,9 +674,7 @@ void FILEECHO::cmdDACK(char *param) }
updateProgress();
- //
// retransfer some parts
- //
chunkIndx = 0;
SetTimer(hDlg, TIMER_SEND, dwSendInterval, nullptr);
}
@@ -767,19 +682,16 @@ void FILEECHO::cmdDACK(char *param) void FILEECHO::perform(char *str)
{
int msgId = getMsgId(str);
- if (msgId == -1)
- {
- MakePopupMsg(hDlg, hContact, Translate("Unknown command for \"File As Message\" was received"));
+ if (msgId == -1) {
+ MakePopupMsg(hDlg, hContact, TranslateT("Unknown command for \"File As Message\" was received"));
return;
}
if (inSend)
- switch (msgId)
- {
+ switch (msgId) {
case CMD_REQ:
- if (MessageBox(hDlg, Translate("Incoming file request. Do you want to proceed?"),
- Translate(SERVICE_TITLE), MB_YESNO | MB_ICONWARNING) == IDYES)
- {
- SetDlgItemText(hDlg, IDC_STATUS, "");
+ if (MessageBox(hDlg, TranslateT("Incoming file request. Do you want to proceed?"),
+ TranslateT(SERVICE_TITLE), MB_YESNO | MB_ICONWARNING) == IDYES) {
+ SetDlgItemText(hDlg, IDC_STATUS, L"");
SendMessage(hDlg, WM_COMMAND, IDC_STOP, 0);
incomeRequest(str + 1);
@@ -791,55 +703,54 @@ void FILEECHO::perform(char *str) cmdACCEPT();
break;
case CMD_CANCEL:
- {
- if (iState & (STATE_PRERECV | STATE_REQSENT | STATE_OPERATE | STATE_ACKREQ | STATE_PAUSED))
{
- char *msg = Translate("Canceled by remote user");
- SetDlgItemText(hDlg, IDC_STATUS, msg);
- MakePopupMsg(hDlg, hContact, msg);
- destroyTransfer();
- setState(STATE_CANCELLED);
+ if (iState & (STATE_PRERECV | STATE_REQSENT | STATE_OPERATE | STATE_ACKREQ | STATE_PAUSED)) {
+ wchar_t *msg = TranslateT("Canceled by remote user");
+ SetDlgItemText(hDlg, IDC_STATUS, msg);
+ MakePopupMsg(hDlg, hContact, msg);
+ destroyTransfer();
+ setState(STATE_CANCELLED);
+ }
+ break;
}
- break;
- }
case CMD_DACK:
cmdDACK(str + 1);
break;
- }
+ }
else
- switch (msgId)
- {
+ switch (msgId) {
case CMD_CANCEL:
- {
- if (iState & (STATE_PRERECV | STATE_REQSENT | STATE_OPERATE | STATE_ACKREQ | STATE_PAUSED))
{
- char *msg = Translate("Canceled by remote user");
- SetDlgItemText(hDlg, IDC_STATUS, msg);
- MakePopupMsg(hDlg, hContact, msg);
- destroyTransfer();
- setState(STATE_CANCELLED);
+ if (iState & (STATE_PRERECV | STATE_REQSENT | STATE_OPERATE | STATE_ACKREQ | STATE_PAUSED)) {
+ wchar_t *msg = TranslateT("Canceled by remote user");
+ SetDlgItemText(hDlg, IDC_STATUS, msg);
+ MakePopupMsg(hDlg, hContact, msg);
+ destroyTransfer();
+ setState(STATE_CANCELLED);
+ }
+ break;
}
- break;
- }
+
case CMD_REQ:
- if (chunkCount)
- {
- if (MessageBox(hDlg, Translate("New incoming file request. Do you want to proceed?"),
- Translate(SERVICE_TITLE), MB_YESNO | MB_ICONWARNING) != IDYES)
+ if (chunkCount) {
+ if (MessageBox(hDlg, TranslateT("New incoming file request. Do you want to proceed?"),
+ TranslateT(SERVICE_TITLE), MB_YESNO | MB_ICONWARNING) != IDYES)
break;
//sendCmd(0, CMD_CANCEL, "", NULL);
destroyTransfer();
}
- SetDlgItemText(hDlg, IDC_STATUS, "");
+ SetDlgItemText(hDlg, IDC_STATUS, L"");
incomeRequest(str + 1);
break;
+
case CMD_DATA:
cmdDATA(str + 1);
break;
+
case CMD_END:
cmdEND();
break;
- };
+ };
};
int FILEECHO::sendCmd(int, int cmd, char *szParam, char *szPrefix)
@@ -861,137 +772,102 @@ int FILEECHO::sendCmd(int, int cmd, char *szParam, char *szPrefix) }
-void CreateDirectoryTree(char *szDir)
-{
- DWORD dwAttributes;
- char *pszLastBackslash, szTestDir[MAX_PATH];
-
- mir_strncpy(szTestDir, szDir, _countof(szTestDir));
- if ((dwAttributes = GetFileAttributes(szTestDir)) != 0xffffffff && (dwAttributes & FILE_ATTRIBUTE_DIRECTORY))
- return;
- pszLastBackslash = strrchr(szTestDir, '\\');
- if (pszLastBackslash == nullptr) {
- GetCurrentDirectory(MAX_PATH, szDir);
- return;
- }
- *pszLastBackslash = 0;
- CreateDirectoryTree(szTestDir);
- CreateDirectory(szTestDir, nullptr);
-}
-
LRESULT CALLBACK ProgressWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- switch (uMsg)
- {
+ switch (uMsg) {
case WM_NCPAINT:
return 0;
+
case WM_PAINT:
- {
- HDC hdc;
- PAINTSTRUCT ps;
- RECT rc;
- HRGN hrgn;
- HBRUSH frameBrush = (HBRUSH)GetStockObject(BLACK_BRUSH);
- struct FILEECHO *dat;
-
- dat = (struct FILEECHO*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
- //if(dat == NULL)
- // return CallSubclassed(hwnd, uMsg, wParam, lParam);
- GetClientRect(hwnd, &rc);
- if (dat == nullptr || dat->chunkCount == 0)
{
- COLORREF colour;
- HBRUSH hbr;
-
- if (dat == nullptr || dat->iState != STATE_FINISHED)
- {
- hbr = (HBRUSH)(COLOR_3DFACE + 1);
- }
- else
- {
- colour = dat->rgbRecv;
- hbr = CreateSolidBrush(colour);
+ HDC hdc;
+ PAINTSTRUCT ps;
+ RECT rc;
+ HRGN hrgn;
+ HBRUSH frameBrush = (HBRUSH)GetStockObject(BLACK_BRUSH);
+ FILEECHO *dat = (FILEECHO*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
+
+ GetClientRect(hwnd, &rc);
+ if (dat == nullptr || dat->chunkCount == 0) {
+ COLORREF colour;
+ HBRUSH hbr;
+
+ if (dat == nullptr || dat->iState != STATE_FINISHED) {
+ hbr = (HBRUSH)(COLOR_3DFACE + 1);
+ }
+ else {
+ colour = dat->rgbRecv;
+ hbr = CreateSolidBrush(colour);
+ }
+ hdc = BeginPaint(hwnd, &ps);
+ FillRect(hdc, &rc, hbr);
+ FrameRect(hdc, &rc, frameBrush);
+ if (hbr != (HBRUSH)(COLOR_3DFACE + 1))
+ DeleteObject(hbr);
+ EndPaint(hwnd, &ps);
+ return 0;
}
+
+ hrgn = CreateRectRgn(rc.left, rc.top, rc.right, rc.bottom);
+
hdc = BeginPaint(hwnd, &ps);
- FillRect(hdc, &rc, hbr);
- FrameRect(hdc, &rc, frameBrush);
- if (hbr != (HBRUSH)(COLOR_3DFACE + 1))
+ SelectClipRgn(hdc, hrgn);
+
+ RECT rc2 = rc;
+ float sliceWidth = (float)((float)(rc.right - rc.left) / (float)dat->chunkCount);
+ float dx = (float)rc2.left;
+ for (uint indx = 0; indx < dat->chunkCount; indx++) {
+ HBRUSH hbr;
+ COLORREF colour = 0;
+ if (dat->inSend && indx == dat->chunkIndx)
+ colour = dat->rgbToSend;
+ else
+ switch (dat->chunkAck[indx]) {
+ case CHUNK_UNSENT:
+ colour = dat->rgbUnSent;
+ break;
+ case CHUNK_SENT:
+ colour = dat->rgbSent;
+ break;
+ case CHUNK_ACK:
+ colour = dat->rgbRecv;
+ break;
+ }
+ hbr = CreateSolidBrush(colour);
+ rc2.left = (int)dx;
+ rc2.right = (int)(dx + sliceWidth);
+ FillRect(hdc, &rc2, hbr);
+ FrameRect(hdc, &rc2, frameBrush);
DeleteObject(hbr);
+ dx += sliceWidth - 1;
+ }
+ if (rc2.right < rc.right) {
+ rc2.left = rc2.right;
+ rc2.right = rc.right;
+ FillRect(hdc, &rc2, (HBRUSH)(COLOR_3DFACE + 1));
+ }
EndPaint(hwnd, &ps);
- return 0;
- }
-
- hrgn = CreateRectRgn(rc.left, rc.top, rc.right, rc.bottom);
-
- hdc = BeginPaint(hwnd, &ps);
- SelectClipRgn(hdc, hrgn);
- RECT rc2 = rc;
- //uint sliceWidth = (rc.right - rc.left) / dat->chunkCount;
- float sliceWidth = (float)((float)(rc.right - rc.left) / (float)dat->chunkCount);
- float dx = (float)rc2.left;
- for (uint indx = 0; indx < dat->chunkCount; indx++)
- {
- HBRUSH hbr;
- COLORREF colour = 0;
- if (dat->inSend && indx == dat->chunkIndx)
- colour = dat->rgbToSend;
- else
- switch (dat->chunkAck[indx])
- {
- case CHUNK_UNSENT:
- colour = dat->rgbUnSent;
- break;
- case CHUNK_SENT:
- colour = dat->rgbSent;
- break;
- case CHUNK_ACK:
- colour = dat->rgbRecv;
- break;
- }
- hbr = CreateSolidBrush(colour);
- rc2.left = (int)dx;
- rc2.right = (int)(dx + sliceWidth);
- FillRect(hdc, &rc2, hbr);
- FrameRect(hdc, &rc2, frameBrush);
- DeleteObject(hbr);
- dx += sliceWidth - 1;
- }
- if (rc2.right < rc.right)
- {
- rc2.left = rc2.right;
- rc2.right = rc.right;
- FillRect(hdc, &rc2, (HBRUSH)(COLOR_3DFACE + 1));
+ DeleteObject(hrgn);
+ return 0;
}
- //FrameRect(hdc, &rc, (HBRUSH)(COLOR_3DLIGHT+1));
- //OffsetRect(&rc, 1,1);
- //FrameRect(hdc, &rc, (HBRUSH)(COLOR_BTNTEXT+1));
- //FrameRect(hdc, &rc, (HBRUSH)(COLOR_BTNTEXT+1));
- EndPaint(hwnd, &ps);
-
- DeleteObject(hrgn);
-
- return 0;
- }
}
return mir_callNextSubclass(hwnd, ProgressWndProc, uMsg, wParam, lParam);
}
INT_PTR CALLBACK DialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- struct FILEECHO *dat = (struct FILEECHO*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
+ FILEECHO *dat = (FILEECHO*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
HWND hwndStatus = nullptr;
- switch (uMsg)
- {
+ switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hDlg);
- {
+
dat = (FILEECHO*)lParam;
dat->hDlg = hDlg;
-
dat->updateTitle();
- hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE, "", hDlg, IDC_STATUS);
+ hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE, L"", hDlg, IDC_STATUS);
SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)dat);
WindowList_Add(hFileList, hDlg, dat->hContact);
Window_SetIcon_IcoLib(hDlg, iconList[ICON_MAIN].hIcolib);
@@ -1007,56 +883,49 @@ INT_PTR CALLBACK DialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (dat->inSend)
PostMessage(hDlg, WM_COMMAND, IDC_BROWSE, NULL);
-
return FALSE;
- }
+
case WM_FE_MESSAGE:
- {
dat->perform((char *)lParam);
delete (char *)lParam;
-
return TRUE;
- }
+
case WM_FE_SKINCHANGE:
Window_SetIcon_IcoLib(hDlg, iconList[ICON_MAIN].hIcolib);
dat->setState(dat->iState);
SendDlgItemMessage(hDlg, IDC_STOP, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcons[ICON_STOP]);
break;
+
case WM_FE_STATUSCHANGE:
- {
- char *szProto = GetContactProto(dat->hContact);
- if (szProto)
{
- int dwStatus = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_OFFLINE);
- if (dat->inSend && dwStatus != dat->contactStatus)
- {
- if (dat->contactStatus == ID_STATUS_OFFLINE)
- {
- dat->chunkIndx = dat->chunkCount;
- }
- else
- if (dwStatus == ID_STATUS_OFFLINE)
- {
- if (dat->iState & (STATE_OPERATE | STATE_ACKREQ))
- {
- char *msg = Translate("File transfer is paused because of dropped connection");
- SetDlgItemText(hDlg, IDC_STATUS, msg);
- MakePopupMsg(dat->hDlg, dat->hContact, msg);
- dat->setState(STATE_PAUSED);
- KillTimer(hDlg, TIMER_SEND);
- }
+ char *szProto = GetContactProto(dat->hContact);
+ if (szProto) {
+ int dwStatus = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_OFFLINE);
+ if (dat->inSend && dwStatus != dat->contactStatus) {
+ if (dat->contactStatus == ID_STATUS_OFFLINE) {
+ dat->chunkIndx = dat->chunkCount;
}
+ else
+ if (dwStatus == ID_STATUS_OFFLINE) {
+ if (dat->iState & (STATE_OPERATE | STATE_ACKREQ)) {
+ wchar_t *msg = TranslateT("File transfer is paused because of dropped connection");
+ SetDlgItemText(hDlg, IDC_STATUS, msg);
+ MakePopupMsg(dat->hDlg, dat->hContact, msg);
+ dat->setState(STATE_PAUSED);
+ KillTimer(hDlg, TIMER_SEND);
+ }
+ }
+ }
+ dat->contactStatus = dwStatus;
}
- dat->contactStatus = dwStatus;
}
return TRUE;
- }
+
case WM_DESTROY:
WindowList_Remove(hFileList, hDlg);
DestroyWindow(hwndStatus);
delete dat;
-
return TRUE;
case WM_TIMER:
@@ -1065,121 +934,106 @@ INT_PTR CALLBACK DialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) else
dat->onRecvTimer();
break;
+
case WM_COMMAND:
- switch (wParam)
- {
+ switch (wParam) {
case IDC_PLAY:
- {
- if (dat->iState & (STATE_IDLE | STATE_FINISHED | STATE_CANCELLED | STATE_PRERECV))
- {
- int len = GetWindowTextLength(GetDlgItem(hDlg, IDC_FILENAME)) + 1;
- free(dat->filename);
- dat->filename = (char*)malloc(len);
- GetDlgItemText(hDlg, IDC_FILENAME, dat->filename, len);
- if (dat->inSend)
- // Send offer to remote side
- {
- dat->sendReq();
- }
- else
- // Send the accept and starting to receive
- {
- char buff[MAX_PATH];
- char *bufname;
-
- GetFullPathName(dat->filename, sizeof(buff), buff, &bufname);
- *bufname = 0;
- CreateDirectoryTree(buff);
- if (!dat->createTransfer())
- {
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Failed on file initialization"));
- break;
- }
- dat->sendCmd(0, CMD_ACCEPT, "");
- dat->lastTimestamp = GetTickCount();
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Receiving..."));
- dat->setState(STATE_OPERATE);
- }
- }
- else
{
- if (dat->inSend)
- {
- if (dat->iState == STATE_OPERATE)
+ if (dat->iState & (STATE_IDLE | STATE_FINISHED | STATE_CANCELLED | STATE_PRERECV)) {
+ int len = GetWindowTextLength(GetDlgItem(hDlg, IDC_FILENAME)) + 1;
+ free(dat->filename);
+ dat->filename = (char*)malloc(len);
+ GetDlgItemTextA(hDlg, IDC_FILENAME, dat->filename, len);
+ if (dat->inSend)
+ // Send offer to remote side
{
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Paused..."));
- dat->setState(STATE_PAUSED);
- KillTimer(hDlg, TIMER_SEND);
+ dat->sendReq();
}
else
+ // Send the accept and starting to receive
{
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Sending..."));
- if (dat->chunkIndx < dat->chunkCount)
- dat->setState(STATE_OPERATE);
- else
- dat->setState(STATE_ACKREQ);
- PostMessage(hDlg, WM_TIMER, 0, 0);
- //dat->onRecvTimer();
- //SetTimer(hDlg, TIMER_SEND, dwSendInterval, NULL);
+ char buff[MAX_PATH];
+ char *bufname;
+
+ GetFullPathNameA(dat->filename, sizeof(buff), buff, &bufname);
+ *bufname = 0;
+ CreateDirectoryTree(buff);
+ if (!dat->createTransfer()) {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Failed on file initialization"));
+ break;
+ }
+ dat->sendCmd(0, CMD_ACCEPT, "");
+ dat->lastTimestamp = GetTickCount();
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Receiving..."));
+ dat->setState(STATE_OPERATE);
}
}
- else
- {
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Synchronizing..."));
- dat->setState(STATE_ACKREQ);
- PostMessage(hDlg, WM_TIMER, 0, 0);
- //dat->onRecvTimer();
- //SetTimer(hDlg, TIMER_SEND, dwSendInterval, 0);
+ else {
+ if (dat->inSend) {
+ if (dat->iState == STATE_OPERATE) {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Paused..."));
+ dat->setState(STATE_PAUSED);
+ KillTimer(hDlg, TIMER_SEND);
+ }
+ else {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Sending..."));
+ if (dat->chunkIndx < dat->chunkCount)
+ dat->setState(STATE_OPERATE);
+ else
+ dat->setState(STATE_ACKREQ);
+ PostMessage(hDlg, WM_TIMER, 0, 0);
+ }
+ }
+ else {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Synchronizing..."));
+ dat->setState(STATE_ACKREQ);
+ PostMessage(hDlg, WM_TIMER, 0, 0);
+ }
+ break;
}
- break;
}
break;
- }
+
case IDC_BROWSE:
- {
- char str[MAX_PATH];
- OPENFILENAME ofn;
-
- memset(&ofn, 0, sizeof(ofn));
- *str = 0;
- GetDlgItemText(hDlg, IDC_FILENAME, str, _countof(str));
- //ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
- ofn.lStructSize = sizeof(ofn);
- ofn.hwndOwner = hDlg;
- //ofn.lpstrFilter = "*.*";
- ofn.lpstrFile = str;
- ofn.Flags = dat->inSend ? OFN_FILEMUSTEXIST : 0;
- ofn.lpstrTitle = dat->inSend ? Translate("Select a file") : Translate("Save as");
- ofn.nMaxFile = _countof(str);
- ofn.nMaxFileTitle = MAX_PATH;
- if (!GetOpenFileName(&ofn)) break;
- if (!dat->inSend && dat->iState == STATE_FINISHED) break;
- SetDlgItemText(hDlg, IDC_FILENAME, str);
-
- int size = RetrieveFileSize(str);
- if (size != -1)
- mir_snprintf(str, Translate("Size: %d bytes"), size);
- else
- mir_strncpy(str, Translate("Can't get a file size"), _countof(str));
- SetDlgItemText(hDlg, IDC_FILESIZE, str);
+ {
+ wchar_t str[MAX_PATH]; *str = 0;
+ GetDlgItemText(hDlg, IDC_FILENAME, str, _countof(str));
+
+ OPENFILENAME ofn = {};
+ ofn.lStructSize = sizeof(ofn);
+ ofn.hwndOwner = hDlg;
+ ofn.lpstrFile = str;
+ ofn.Flags = dat->inSend ? OFN_FILEMUSTEXIST : 0;
+ ofn.lpstrTitle = dat->inSend ? TranslateT("Select a file") : TranslateT("Save as");
+ ofn.nMaxFile = _countof(str);
+ ofn.nMaxFileTitle = MAX_PATH;
+ if (!GetOpenFileName(&ofn))
+ break;
+ if (!dat->inSend && dat->iState == STATE_FINISHED)
+ break;
+
+ SetDlgItemText(hDlg, IDC_FILENAME, str);
+ int size = RetrieveFileSize(str);
+ if (size != -1)
+ mir_snwprintf(str, TranslateT("Size: %d bytes"), size);
+ else
+ mir_wstrncpy(str, TranslateT("Can't get a file size"), _countof(str));
+ SetDlgItemText(hDlg, IDC_FILESIZE, str);
+ }
break;
- }
case IDC_STOP:
case IDCANCEL:
- if (dat->iState == STATE_PRERECV)
- {
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Canceled by user"));
+ if (dat->iState == STATE_PRERECV) {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Canceled by user"));
dat->sendCmd(0, CMD_CANCEL, "", nullptr);
dat->setState(STATE_CANCELLED);
}
- if (dat->chunkCount)
- {
- if (MessageBox(hDlg, Translate("Transfer is in progress. Do you really want to close?"),
- Translate(SERVICE_TITLE), MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2) == IDYES)
- {
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Canceled by user"));
+ if (dat->chunkCount) {
+ if (MessageBox(hDlg, TranslateT("Transfer is in progress. Do you really want to close?"),
+ TranslateT(SERVICE_TITLE), MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2) == IDYES) {
+ SetDlgItemText(hDlg, IDC_STATUS, TranslateT("Canceled by user"));
dat->setState(STATE_CANCELLED);
dat->sendCmd(0, CMD_CANCEL, "", nullptr);
dat->destroyTransfer();
@@ -1187,10 +1041,9 @@ INT_PTR CALLBACK DialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) DestroyWindow(hDlg);
}
}
- else
- if (wParam == IDCANCEL)
- DestroyWindow(hDlg);
- break;//return TRUE;
+ else if (wParam == IDCANCEL)
+ DestroyWindow(hDlg);
+ break;
}
break;
}
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 594e95e395..092e6cc6f0 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -1,4 +1,4 @@ -#include "main.h"
+#include "stdafx.h"
PLUGININFOEX pluginInfo =
{
@@ -7,7 +7,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/FileAsMessage/src/optionsdlg.cpp b/plugins/FileAsMessage/src/optionsdlg.cpp index 519e5287ee..c889e3cf95 100644 --- a/plugins/FileAsMessage/src/optionsdlg.cpp +++ b/plugins/FileAsMessage/src/optionsdlg.cpp @@ -1,4 +1,4 @@ -#include "main.h"
+#include "stdafx.h"
DWORD settingDefault[] =
{
diff --git a/plugins/FileAsMessage/src/stdafx.cpp b/plugins/FileAsMessage/src/stdafx.cpp deleted file mode 100644 index 5cc77ed966..0000000000 --- a/plugins/FileAsMessage/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/*
-Copyright (C) 2012-17 Miranda NG project (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 "main.h"
\ No newline at end of file diff --git a/plugins/FileAsMessage/src/stdafx.cxx b/plugins/FileAsMessage/src/stdafx.cxx new file mode 100644 index 0000000000..fd4f341c7b --- /dev/null +++ b/plugins/FileAsMessage/src/stdafx.cxx @@ -0,0 +1 @@ +#include "stdafx.h" diff --git a/plugins/FileAsMessage/src/main.h b/plugins/FileAsMessage/src/stdafx.h index a2130ee940..af2ed0eda7 100644 --- a/plugins/FileAsMessage/src/main.h +++ b/plugins/FileAsMessage/src/stdafx.h @@ -1,51 +1,50 @@ -#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_NONSTDC_NO_DEPRECATE
-
-#include <windows.h>
-#include <io.h>
-#include <fcntl.h>
-#include <commctrl.h>
-
-#include <newpluginapi.h>
-#include <m_database.h>
-#include <m_protosvc.h>
-#include <m_langpack.h>
-#include <m_clist.h>
-#include <m_options.h>
-#include <m_skin.h>
-#include <m_popup.h>
-#include <m_icolib.h>
-#include <m_button.h>
-#include <m_netlib.h>
-#include <m_file.h>
-#include <win2k.h>
-
-#include "dialog.h"
-#include "resource.h"
-#include "version.h"
-
-#define MAXBUFSIZE 4096
-#define SERVICE_TITLE LPGEN("File As Message")
-#define SERVICE_NAME "FileAsMessage"
-
-#define SERVICE_PREFIX "<%fAM-0023%>"
-
-#define NOPLUGIN_MESSAGE "If you see this \"garbage\", probably you have no \"fileAsMessage\" plugin installed, see https://miranda-ng.org/p/FileAsMessage/ for more information and download."
-
-extern char *szServiceTitle;
-extern char *szServicePrefix;
-extern const ulong INITCRC;
-
-#define WM_FE_MESSAGE WM_USER+100
-#define WM_FE_STATUSCHANGE WM_USER+101
-#define WM_FE_SKINCHANGE WM_USER+102
-
-extern HINSTANCE hInst;
-extern MWindowList hFileList;
-extern HANDLE hEventNewFile;
-
-extern HICON hIcons[5];
-extern IconItem iconList[];
-
-ulong memcrc32(uchar *ptr, int size, ulong crc);
-INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+#define _CRT_NONSTDC_NO_DEPRECATE + +#include <windows.h> +#include <io.h> +#include <fcntl.h> +#include <commctrl.h> + +#include <newpluginapi.h> +#include <m_database.h> +#include <m_protosvc.h> +#include <m_langpack.h> +#include <m_clist.h> +#include <m_options.h> +#include <m_skin.h> +#include <m_popup.h> +#include <m_icolib.h> +#include <m_button.h> +#include <m_netlib.h> +#include <m_file.h> +#include <win2k.h> + +#include "dialog.h" +#include "resource.h" +#include "version.h" + +#define MAXBUFSIZE 4096 +#define SERVICE_TITLE LPGEN("File As Message") +#define SERVICE_NAME "FileAsMessage" + +#define SERVICE_PREFIX "<%fAM-0023%>" + +#define NOPLUGIN_MESSAGE "If you see this \"garbage\", probably you have no \"fileAsMessage\" plugin installed, see https://miranda-ng.org/p/FileAsMessage/ for more information and download." + +extern char *szServiceTitle; +extern char *szServicePrefix; +extern const ulong INITCRC; + +#define WM_FE_MESSAGE WM_USER+100 +#define WM_FE_STATUSCHANGE WM_USER+101 +#define WM_FE_SKINCHANGE WM_USER+102 + +extern HINSTANCE hInst; +extern MWindowList hFileList; +extern HANDLE hEventNewFile; + +extern HICON hIcons[5]; +extern IconItem iconList[]; + +ulong memcrc32(uchar *ptr, int size, ulong crc); +INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/FileAsMessage/src/version.h b/plugins/FileAsMessage/src/version.h index ddb306b2f3..9f7a5f8488 100644 --- a/plugins/FileAsMessage/src/version.h +++ b/plugins/FileAsMessage/src/version.h @@ -1,14 +1,13 @@ -#define __MAJOR_VERSION 0 -#define __MINOR_VERSION 0 -#define __RELEASE_NUM 2 -#define __BUILD_NUM 4 +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 1 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 #include <stdver.h> #define __PLUGIN_NAME "File as message" #define __FILENAME "FileAsMessage.dll" -#define __DESCRIPTION "File transfer by using the messaging services - as plain text." -#define __AUTHOR "Denis Stanishevskiy" -#define __AUTHOREMAIL "stdenformiranda@fromru.com" -#define __AUTHORWEB "https://miranda-ng.org/p/FileAsMessage/" -#define __COPYRIGHT "© 2004 Denis Stanishevskiy" +#define __DESCRIPTION "File transfer by using the messaging services - as plain text." +#define __AUTHOR "Denis Stanishevskiy" +#define __AUTHORWEB "https://miranda-ng.org/p/FileAsMessage/" +#define __COPYRIGHT "© 2004 Denis Stanishevskiy" diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico Binary files differdeleted file mode 100644 index 7676f25d65..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_7.x.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_7.x.ico Binary files differdeleted file mode 100644 index 4e8ccf5377..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_7.x.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mac.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mac.ico Binary files differdeleted file mode 100644 index 7f69db2598..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mac.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mobile.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mobile.ico Binary files differdeleted file mode 100644 index 00bd08b486..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mobile.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Triton.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Triton.ico Binary files differdeleted file mode 100644 index a211a49df0..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Triton.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/TerraIM.ico b/plugins/FingerprintNG/iconpacks/res/AIM/TerraIM.ico Binary files differdeleted file mode 100644 index ce9b610cc7..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/TerraIM.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/miniaim.ico b/plugins/FingerprintNG/iconpacks/res/AIM/miniaim.ico Binary files differdeleted file mode 100644 index 8268b726ff..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/miniaim.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/naim.ico b/plugins/FingerprintNG/iconpacks/res/AIM/naim.ico Binary files differdeleted file mode 100644 index 0a8d916cfe..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/AIM/naim.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Jabber/PyAIMt.ico b/plugins/FingerprintNG/iconpacks/res/Jabber/PyAIMt.ico Binary files differdeleted file mode 100644 index e5e4db6c9a..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Jabber/PyAIMt.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_AIM.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_AIM.ico Binary files differdeleted file mode 100644 index e1b38aab85..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_AIM.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index 498d408065..0ce62fdc09 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -395,14 +395,6 @@ IDI_ICQ5_OVERLAY ICON "ICQ\\overlay_ICQ_v5.ico" IDI_ICQ6_OVERLAY ICON "ICQ\\overlay_ICQ_v6.ico"
IDI_ICQ7_OVERLAY ICON "ICQ\\overlay_ICQ_v7.ico"
IDI_ICQ8_OVERLAY ICON "ICQ\\overlay_ICQ_v8.ico"
-IDI_AIM_6 ICON "AIM\\AIM_6.x.ico"
-IDI_AIM_7 ICON "AIM\\AIM_7.x.ico"
-IDI_AIM_MAC ICON "AIM\\AIM_Mac.ico"
-IDI_AIM_MOBILE ICON "AIM\\AIM_Mobile.ico"
-IDI_AIM_TRITON ICON "AIM\\AIM_Triton.ico"
-IDI_MINIAIM ICON "AIM\\miniaim.ico"
-IDI_NAIM ICON "AIM\\naim.ico"
-IDI_TERRAIM ICON "AIM\\TerraIM.ico"
IDI_AMIRC ICON "IRC\\AmIRC.ico"
IDI_AMULE ICON "IRC\\aMule.ico"
IDI_BABBEL ICON "IRC\\Babbel.ico"
@@ -543,7 +535,6 @@ IDI_TWITTER ICON "others\\Twitter.ico" IDI_HANGOUTS ICON "others\\Google+ Hangouts.ico"
IDI_WHATSAPP ICON "others\\WhatsApp.ico"
IDI_STEAM ICON "others\\Steam.ico"
-IDI_AIM_OVERLAY ICON "overlays\\overlay_proto_AIM.ico"
IDI_GMAIL_OVERLAY ICON "overlays\\overlay_proto_Gmail.ico"
IDI_ICQJ_OVERLAY ICON "overlays\\overlay_proto_ICQJ.ico"
IDI_ICQJ_PLUS_OVERLAY ICON "overlays\\overlay_proto_ICQJ_Plus.ico"
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc index 0187107716..59ab77eed4 100644 --- a/plugins/FingerprintNG/res/resource.rc +++ b/plugins/FingerprintNG/res/resource.rc @@ -78,7 +78,6 @@ BEGIN CONTROL "Unicode overlay",IDC_GROUP_OVERLAYS_UNICODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,60,120,10
CONTROL "Secure overlays",IDC_GROUP_OVERLAYS_SECURITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,50,140,10
GROUPBOX "Select protocols",IDC_STATIC,15,75,290,140
- CONTROL "AIM clients",IDC_GROUP_AIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,90,120,10
CONTROL "Gadu-Gadu clients",IDC_GROUP_GG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,100,120,10
CONTROL "ICQ clients",IDC_GROUP_ICQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,110,120,10
CONTROL "IRC clients",IDC_GROUP_IRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,120,120,10
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index d0ac9b3b30..10e6bff723 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -18,11 +18,6 @@ case MULTI_CASE: return LPGENW("Client icons") L"/" LPGENW("Multi-proto clients");
break;
-case AIM_CASE:
- if (db_get_b(NULL, MODULENAME, "GroupAIM", 1))
- return LPGENW("Client icons") L"/" LPGENW("AIM clients");
- break;
-
case GG_CASE:
if (db_get_b(NULL, MODULENAME, "GroupGG", 1))
return LPGENW("Client icons") L"/" LPGENW("Gadu-Gadu clients");
diff --git a/plugins/FingerprintNG/src/main.cpp b/plugins/FingerprintNG/src/main.cpp index f8af6c8a48..27c7d41e6f 100644 --- a/plugins/FingerprintNG/src/main.cpp +++ b/plugins/FingerprintNG/src/main.cpp @@ -37,7 +37,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 52cc5cb5ae..d2a49fca73 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -487,20 +487,6 @@ KN_FP_MASK def_kn_fp_mask[] = { "client_IRCUnknown", L"*IRC*", L"Unknown IRC client", IDI_IRC, IRC_CASE, TRUE },
//#########################################################################################################################################################################
- //################################# AIM ###############################################################################################################################
- //#########################################################################################################################################################################
- { "client_Aim7", L"AIM*7.*", L"AIM v7.x", IDI_AIM_7, AIM_CASE, TRUE },
- { "client_Aim6", L"AIM*6.*", L"AIM v6.x", IDI_AIM_6, AIM_CASE, TRUE },
-
- { "client_AIM_Triton", L"*AIM*Triton*", L"AIM Triton", IDI_AIM_TRITON, AIM_CASE, TRUE },
- { "client_AimMac", L"AIM*Mac*", L"AIM for MacOS", IDI_AIM_MAC, AIM_CASE, TRUE },
- { "client_AimMobile", L"|AIM*Mobile*|AIM*gprs*|Aim*sms*", L"AIM Mobile", IDI_AIM_MOBILE, AIM_CASE, TRUE },
- { "client_Naim", L"*naim*", L"Naim", IDI_NAIM, AIM_CASE, TRUE },
- { "client_miniaim", L"*miniaim*", L"miniaim", IDI_MINIAIM, AIM_CASE, TRUE },
- { "client_TerraIM", L"*Terra*", L"TerraIM", IDI_TERRAIM, AIM_CASE, TRUE },
- { "client_AIM", L"AIM*", L"AIM", IDI_AIM_7, AIM_CASE, TRUE },
-
- //#########################################################################################################################################################################
//################################# MSN ###############################################################################################################################
//#########################################################################################################################################################################
{ "client_WLM11", L"WLM*2011*", L"Windows Live 11", IDI_WLM_10, MSN_CASE, TRUE },
@@ -679,7 +665,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = //#########################################################################################################################################################################
//################################# PROTO OVERLAYS ####################################################################################################################
//#########################################################################################################################################################################
- { "client_AIM_overlay", L"|^AIM*|*AIM*", LPGENW("AIM overlay"), IDI_AIM_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_ICQJ_Plus_over", L"*ICQ*Plus*", LPGENW("ICQJ Plus Mod overlay"), IDI_ICQJ_PLUS_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_ICQJ_overlay", L"|^ICQ|^ICQ*|*ICQ*|MRA client", LPGENW("ICQJ overlay"), IDI_ICQJ_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_IRC_overlay", L"|^IRC*|Miranda*IRC*", LPGENW("IRC overlay"), IDI_IRC_OVERLAY, OVERLAYS_PROTO_CASE },
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 5ec7b7a793..e6f262d8f2 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -33,7 +33,6 @@ static settings[] = { IDC_GROUP_MIRANDA_PACKS, TRUE, "GroupMirandaPacks" },
{ IDC_GROUP_MULTI, TRUE, "GroupMulti" },
- { IDC_GROUP_AIM, TRUE, "GroupAIM" },
{ IDC_GROUP_GG, TRUE, "GroupGG" },
{ IDC_GROUP_ICQ, TRUE, "GroupICQ" },
{ IDC_GROUP_IRC, TRUE, "GroupIRC" },
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 8420af7194..df9580af53 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -54,7 +54,6 @@ #define IDI_UNICODE_CLIENT 75
#define IDI_PLATFORM_X32 76
#define IDI_PLATFORM_X64 77
-#define IDI_AIM_OVERLAY 78
#define IDI_GMAIL_OVERLAY 79
#define IDI_ICQJ_OVERLAY 80
#define IDI_ICQJ_PLUS_OVERLAY 81
@@ -399,14 +398,6 @@ #define IDI_MAIL_RU_OFFICIAL 702
#define IDI_MAIL_RU_UNKNOWN 703
#define IDI_MAIL_RU_WEBAGENT 704
-#define IDI_AIM_6 714
-#define IDI_AIM_7 715
-#define IDI_AIM_MAC 716
-#define IDI_AIM_MOBILE 717
-#define IDI_AIM_TRITON 718
-#define IDI_MINIAIM 719
-#define IDI_NAIM 720
-#define IDI_TERRAIM 721
#define IDI_GG 724
#define IDI_GG8_OVERLAY 725
#define IDI_GG9_OVERLAY 726
@@ -585,7 +576,6 @@ #define IDC_GROUP_MIRANDA_VERSION 10026
#define IDC_GROUP_MIRANDA_PACKS 10027
#define IDC_GROUP_MULTI 10028
-#define IDC_GROUP_AIM 10029
#define IDC_GROUP_GG 10030
#define IDC_GROUP_ICQ 10032
#define IDC_GROUP_IRC 10033
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index a44ede6da4..08f0b72fa7 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -74,7 +74,6 @@ typedef struct _foundInfo #define MIRANDA_PACKS_CASE 3003 // Miranda packs overlays
#define MULTI_CASE 3004 // multi-protocol clients
-#define AIM_CASE 3005 // AIM clients
#define GG_CASE 3006 // Gadu-Gadu clients
#define ICQ_CASE 3008 // ICQ clients
#define IRC_CASE 3009 // IRC clients
diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h index 4ee2eaffab..90d47300b8 100644 --- a/plugins/FingerprintNG/src/version.h +++ b/plugins/FingerprintNG/src/version.h @@ -28,6 +28,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __FILENAME "Fingerprint.dll"
#define __DESCRIPTION "Fingerprint NG (client version) icons module for Miranda NG."
#define __AUTHOR "faith_healer, ghazan, Mataes"
-#define __AUTHOREMAIL "faith_healer@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/Fingerprint/"
#define __COPYRIGHT "© 2006-17 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index d840c61e62..fb098b2752 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -96,7 +96,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/FloatingContacts/src/version.h b/plugins/FloatingContacts/src/version.h index 5af00f2c44..fa0d9ca2d2 100644 --- a/plugins/FloatingContacts/src/version.h +++ b/plugins/FloatingContacts/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "FltContacts.dll"
#define __DESCRIPTION "Floating Contacts plugin for Miranda."
#define __AUTHOR "Iavor Vajarov, Kosh&chka, Victor Pavlychko"
-#define __AUTHOREMAIL "ell-6@ya.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/FloatingContacts/"
#define __COPYRIGHT "© 2002-2004 I. Vajarov (ivajarov@code.bg), 2008 Kosh&chka, V. Pavlychko"
diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp index b6d8ded550..512d619ece 100644 --- a/plugins/Folders/src/folders.cpp +++ b/plugins/Folders/src/folders.cpp @@ -32,7 +32,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Folders/src/version.h b/plugins/Folders/src/version.h index 886868da09..bd045b1ebd 100644 --- a/plugins/Folders/src/version.h +++ b/plugins/Folders/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Folders.dll"
#define __DESCRIPTION "Allows plugins to save their data to user selected folders; supports variables."
#define __AUTHOR "Cristian Libotean, Miranda NG Team"
-#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/Folders/"
#define __COPYRIGHT "© 2005-2012 Cristian Libotean, 2012-17 Miranda NG Team"
diff --git a/plugins/GmailNotifier/src/check.cpp b/plugins/GmailNotifier/src/check.cpp index 6bf60cd2c7..0d642a8a42 100644 --- a/plugins/GmailNotifier/src/check.cpp +++ b/plugins/GmailNotifier/src/check.cpp @@ -98,7 +98,7 @@ void CheckMailInbox(Account *curAcc) // go!
CMStringA loginPass(FORMAT, "%s:%s", curAcc->name, curAcc->pass);
- ptrA loginPassEncoded(mir_base64_encode((BYTE*)loginPass.c_str(), loginPass.GetLength()));
+ ptrA loginPassEncoded(mir_base64_encode(loginPass.c_str(), loginPass.GetLength()));
CMStringA szUrl("https://mail.google.com"), szAuth(FORMAT, "Basic %s", loginPassEncoded.get());
if (curAcc->hosted[0])
diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp index ff6946fadc..3fc69d130d 100644 --- a/plugins/GmailNotifier/src/main.cpp +++ b/plugins/GmailNotifier/src/main.cpp @@ -30,7 +30,6 @@ static PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/GmailNotifier/src/version.h b/plugins/GmailNotifier/src/version.h index 7834d0d829..e75e38a1e6 100644 --- a/plugins/GmailNotifier/src/version.h +++ b/plugins/GmailNotifier/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "GmailNotifier.dll"
#define __DESCRIPTION "Check your Gmail inboxes locally."
#define __AUTHOR "Mixwind"
-#define __AUTHOREMAIL "mixwind@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/GmailNotifier/"
#define __COPYRIGHT "© 2005 Sun Zhuo"
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 82aca337b6..859806d57e 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -93,7 +93,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/HTTPServer/src/version.h b/plugins/HTTPServer/src/version.h index c58cfb21e1..6c93022e1c 100644 --- a/plugins/HTTPServer/src/version.h +++ b/plugins/HTTPServer/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "HTTPServer.dll" #define __DESCRIPTION "HTTP Web Server plugin for Miranda." #define __AUTHOR "Kennet Nielsen, modified by Vampik, Houdini" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/HTTPServer/" #define __COPYRIGHT "© 2003-2009 Kennet Nielsen, Vampik, Houdini" diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index 3c8a94d11a..9799c022fa 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -31,7 +31,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/HistoryLinkListPlus/src/version.h b/plugins/HistoryLinkListPlus/src/version.h index c8ab34ae17..9d5b8e8e95 100644 --- a/plugins/HistoryLinkListPlus/src/version.h +++ b/plugins/HistoryLinkListPlus/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "LinkList.dll" #define __DESCRIPTION "Generates a list of extracted URIs from the history." #define __AUTHOR "Thomas Wendel, gureedo" -#define __AUTHOREMAIL "gureedo@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/LinkList/" #define __COPYRIGHT "© 2010-2011 gureedo" diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index 7a5a4dbd09..746459a1a6 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -136,7 +136,6 @@ begin PluginInfo.version:= hppVersion;
PluginInfo.description:= hppDescription;
PluginInfo.author:= hppAuthor;
- PluginInfo.authorEmail:= hppAuthorEmail;
PluginInfo.copyright:= hppCopyright;
PluginInfo.homepage:= hppHomePageURL;
PluginInfo.flags:= UNICODE_AWARE;
diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas index dba7710003..f9f198da2a 100644 --- a/plugins/HistoryPlusPlus/hpp_global.pas +++ b/plugins/HistoryPlusPlus/hpp_global.pas @@ -168,7 +168,6 @@ const hppDescription = 'Easy, fast and feature complete history viewer.';
hppAuthor = 'theMIROn, Art Fedorov';
- hppAuthorEmail = 'themiron@mail.ru, artemf@mail.ru';
hppCopyright = ' 2006-2009 theMIROn, 2003-2006 Art Fedorov. History+ parts 2001 Christian Kastner';
hppHomePageURL = 'https://miranda-ng.org/p/HistoryPP/';
diff --git a/plugins/HistoryStats/src/main.cpp b/plugins/HistoryStats/src/main.cpp index 202a6fcea0..7f64ab6243 100644 --- a/plugins/HistoryStats/src/main.cpp +++ b/plugins/HistoryStats/src/main.cpp @@ -23,7 +23,6 @@ PLUGININFOEX g_pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/HistoryStats/src/stdafx.h b/plugins/HistoryStats/src/stdafx.h index d0b4aee7ce..06800ecb98 100644 --- a/plugins/HistoryStats/src/stdafx.h +++ b/plugins/HistoryStats/src/stdafx.h @@ -64,7 +64,6 @@ #include <m_imgsrvc.h>
#include <m_timezones.h>
-#include <m_addcontact.h> // not used, depends on m_protosvc.h
#include <m_icq.h> // depends on m_protosvc.h
#include <m_metacontacts.h>
diff --git a/plugins/HistoryStats/src/version.h b/plugins/HistoryStats/src/version.h index 0255da74da..a4cbbb7f7b 100644 --- a/plugins/HistoryStats/src/version.h +++ b/plugins/HistoryStats/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "HistoryStats.dll"
#define __DESCRIPTION "Creates detailed, colorful and highly customizable statistics using your message history."
#define __AUTHOR "Martin Afanasjew"
-#define __AUTHOREMAIL "miranda@dark-passage.de"
#define __AUTHORWEB "https://miranda-ng.org/p/HistoryStats/"
#define __COPYRIGHT "© 2005-2007 Martin Afanasjew (see README for further credits)"
diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp index ade9f3e678..0c1fdc4aac 100644 --- a/plugins/HistorySweeperLight/src/main.cpp +++ b/plugins/HistorySweeperLight/src/main.cpp @@ -34,7 +34,6 @@ static PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/HistorySweeperLight/src/version.h b/plugins/HistorySweeperLight/src/version.h index dfbb36af6d..a9f0e3fdf1 100644 --- a/plugins/HistorySweeperLight/src/version.h +++ b/plugins/HistorySweeperLight/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "HistorySweeperLight.dll"
#define __DESCRIPTION "This plugin can sweep system history, history from all contacts or only from chosen; also it may sweep history older than certain time; and may do it at Miranda NG startup/shutdown."
#define __AUTHOR "Sergey V. Gershovich a.k.a. Jazzy$, Boris Krasnovskiy, tico-tico"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/HistorySweeperLight/"
#define __COPYRIGHT "© 2002-2003 Sergey V. Gershovich a.k.a. Jazzy$, 2006-2009 Boris Krasnovskiy, 2010-2011 tico-tico"
diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp index 22814e4c9d..dce4f52a75 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp @@ -81,7 +81,6 @@ PLUGININFOEX PluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION_MIR,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/HwHotKeys/src/version.h b/plugins/HwHotKeys/src/version.h index 344f756348..bb13d2f797 100644 --- a/plugins/HwHotKeys/src/version.h +++ b/plugins/HwHotKeys/src/version.h @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. #define __DESCRIPTION_MIR "Allows you to assign expanded multimedia keys (only for PS/2 keyboards)." // описание плагина в миранде (локализуемое) #define __DESCRIPTION_DLL "Hardware HotKeys plugin for Miranda NG." // описание плагина в dll-fileinfo "FileDescription" (там многострочные строки - не работают). Нелокализуемое! #define __AUTHOR "Eugene f2065" // описание плагина в миранде -#define __AUTHOREMAIL "f2065@mail.ru" // описание плагина в миранде #define __AUTHORWEB "http://f2065.narod.ru/" // описание плагина в dll-fileinfo "CompanyName", описание плагина в миранде #define __COPYRIGHT "© 2010-2017 Eugene f2065" // описание плагина в dll-fileinfo "LegalCopyright", описание плагина в миранде diff --git a/plugins/IEHistory/src/IEHistory.cpp b/plugins/IEHistory/src/IEHistory.cpp index 6f8151f72d..06fabc6490 100644 --- a/plugins/IEHistory/src/IEHistory.cpp +++ b/plugins/IEHistory/src/IEHistory.cpp @@ -35,7 +35,7 @@ PLUGININFOEX pluginInfo = { __PLUGIN_DISPLAY_NAME, __VERSION_DWORD, __DESC, - __AUTHOR, __AUTHOREMAIL, + __AUTHOR, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/IEHistory/src/version.h b/plugins/IEHistory/src/version.h index 34d50e6bcf..92cb7eff94 100644 --- a/plugins/IEHistory/src/version.h +++ b/plugins/IEHistory/src/version.h @@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __DESC "Shows the history for a given contact using IEView." #define __AUTHOR "Cristian Libotean, Miranda NG team" -#define __AUTHOREMAIL "eblis102@yahoo.com" #define __COPYRIGHT "© 2006 Cristian Libotean, 2014-17 Miranda NG team" #define __AUTHORWEB "https://miranda-ng.org/p/IEHistory" #define __PLUGIN_DISPLAY_NAME "IEView history viewer" diff --git a/plugins/IEView/src/ieview_main.cpp b/plugins/IEView/src/ieview_main.cpp index 4b86be1748..64710f6511 100644 --- a/plugins/IEView/src/ieview_main.cpp +++ b/plugins/IEView/src/ieview_main.cpp @@ -32,7 +32,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/IEView/src/version.h b/plugins/IEView/src/version.h index ebd233c51c..e617e9f5a1 100644 --- a/plugins/IEView/src/version.h +++ b/plugins/IEView/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "IEView.dll" #define __DESCRIPTION "IE Based Chat Log." #define __AUTHOR "Piotr Piastucki, Francois Mean" -#define __AUTHOREMAIL "the_leech@users.berlios.de" #define __AUTHORWEB "https://miranda-ng.org/p/IEView/" #define __COPYRIGHT "© 2005-2011 Piotr Piastucki, Francois Mean" diff --git a/plugins/IgnoreState/src/main.cpp b/plugins/IgnoreState/src/main.cpp index df6aa14bbd..b99fcd0317 100644 --- a/plugins/IgnoreState/src/main.cpp +++ b/plugins/IgnoreState/src/main.cpp @@ -53,7 +53,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/IgnoreState/src/version.h b/plugins/IgnoreState/src/version.h index 71b8f06747..2bbea78b59 100644 --- a/plugins/IgnoreState/src/version.h +++ b/plugins/IgnoreState/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "IgnoreState.dll" #define __DESCRIPTION "Shows ignore state of contact in contact list." #define __AUTHOR "Kildor" -#define __AUTHOREMAIL "kostia@ngs.ru" #define __AUTHORWEB "https://miranda-ng.org/p/IgnoreState/" #define __COPYRIGHT "© 2009-2010 Kostia Romanov" diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index 6657111100..847049919b 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -38,7 +38,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h index 3408e433eb..4bd8769287 100644 --- a/plugins/Import/src/version.h +++ b/plugins/Import/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Import.dll"
#define __DESCRIPTION "Imports contacts and messages from another Miranda profile or from an external program."
#define __AUTHOR "Miranda team"
-#define __AUTHOREMAIL "info@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/Import/"
#define __COPYRIGHT "© 2012-2017 George Hazan"
diff --git a/plugins/ImportTXT/importtxt.dpr b/plugins/ImportTXT/importtxt.dpr index 5c5d635e0b..8a7959a197 100644 --- a/plugins/ImportTXT/importtxt.dpr +++ b/plugins/ImportTXT/importtxt.dpr @@ -56,7 +56,6 @@ begin PluginInfo.version :=$0000010A;
PluginInfo.description:='Imports history saved in TXT files from other clients.';
PluginInfo.author :='Abyss';
- PluginInfo.authorEmail:='abyss.andrey@gmail.com';
PluginInfo.copyright :=' 2008 Abyss';
PluginInfo.homepage :='https://miranda-ng.org/p/ImportTXT/';
PluginInfo.flags :=UNICODE_AWARE;
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp index 5b675e4421..71575ed798 100644 --- a/plugins/KeyboardNotify/src/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp @@ -93,7 +93,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/KeyboardNotify/src/version.h b/plugins/KeyboardNotify/src/version.h index 201bf2d1be..b71d9703b6 100644 --- a/plugins/KeyboardNotify/src/version.h +++ b/plugins/KeyboardNotify/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "KeyboardNotify.dll" #define __DESCRIPTION "Flashes your keyboard LEDs when a message has arrived." #define __AUTHOR "TioDuke" -#define __AUTHOREMAIL "tioduke@yahoo.ca" #define __AUTHORWEB "https://miranda-ng.org/p/KeyboardNotify/" #define __COPYRIGHT "© 2002-2003 Martin Öberg, 2004 Std, 2005-2008 TioDuke" diff --git a/plugins/ListeningTo/src/main.cpp b/plugins/ListeningTo/src/main.cpp index d3eb164123..d3ca7b9aa0 100644 --- a/plugins/ListeningTo/src/main.cpp +++ b/plugins/ListeningTo/src/main.cpp @@ -29,7 +29,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ListeningTo/src/version.h b/plugins/ListeningTo/src/version.h index 95b6a13741..d65fb44463 100644 --- a/plugins/ListeningTo/src/version.h +++ b/plugins/ListeningTo/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "ListeningTo.dll" #define __DESCRIPTION "Handles listening information to/for contacts." #define __AUTHOR "Ricardo Pescuma Domenecci" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/ListeningTo/" #define __COPYRIGHT "© 2006-2009 Ricardo Pescuma Domenecci" diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index e76912891c..362811eed2 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -72,7 +72,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/LotusNotify/src/version.h b/plugins/LotusNotify/src/version.h index fc759fffe4..e350839f09 100644 --- a/plugins/LotusNotify/src/version.h +++ b/plugins/LotusNotify/src/version.h @@ -10,7 +10,6 @@ #define __DESCRIPTION "Notify about new mail in Lotus Database"
#define __FILECOMMENTS "Miranda NG Plugin - Notify about new mail in Lotus Database"
#define __AUTHOR "MaKaRSoFT - http://maciej.wycik.pl/miranda"
-#define __AUTHOREMAIL "makar@poczta.of.pl"
#define __AUTHORWEB "https://miranda-ng.org/p/LotusNotify/"
#define __COPYRIGHT "© 2006 MaKaRSoFT, 2013 wsx22, 2015 pepinlebref"
#define __LEGALTRADEMARKS "Freeware"
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 4a2ba849e7..e77177358f 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -82,7 +82,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MenuItemEx/src/version.h b/plugins/MenuItemEx/src/version.h index b413e2676b..4989795f8c 100644 --- a/plugins/MenuItemEx/src/version.h +++ b/plugins/MenuItemEx/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MenuEx.dll"
#define __DESCRIPTION "Adds some useful options to a contacts menu."
#define __AUTHOR "Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel"
-#define __AUTHOREMAIL "micron@nexgo.de; baloo@bk.ru; tatarinov.sergey@gmail.com; robyer@seznam.cz"
#define __AUTHORWEB "https://miranda-ng.org/p/MenuEx/"
#define __COPYRIGHT "© 2001-03 Heiko Schillinger, © 2006-08 Baloo, © 2009-10 Billy_Bons, © 2011-13 Robert Pösel"
diff --git a/plugins/MessageState/src/main.cpp b/plugins/MessageState/src/main.cpp index 38b83bf5ec..519522b54d 100644 --- a/plugins/MessageState/src/main.cpp +++ b/plugins/MessageState/src/main.cpp @@ -10,7 +10,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MessageState/src/version.h b/plugins/MessageState/src/version.h index fea0d8d59f..a3ea4a01db 100644 --- a/plugins/MessageState/src/version.h +++ b/plugins/MessageState/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MessageState.dll"
#define __DESCRIPTION "Displays icons in message window showing whether your last outgoing message was read / is still unread."
#define __AUTHOR "MikalaiR"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/MessageState/"
#define __COPYRIGHT "© 2015-17 Miranda NG Team"
diff --git a/plugins/MimCmd/src/version.h b/plugins/MimCmd/src/version.h index 319023d290..c9625d9e64 100644 --- a/plugins/MimCmd/src/version.h +++ b/plugins/MimCmd/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MimCmd.exe"
#define __DESCRIPTION "This will tell Miranda to run the specified command."
#define __AUTHOR "Cristian Libotean"
-#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/CmdLine/"
#define __COPYRIGHT "© 2007-2011 Cristian Libotean"
diff --git a/plugins/MirFox/src/MirandaInterface.cpp b/plugins/MirFox/src/MirandaInterface.cpp index 439b859643..95d9d0feb5 100644 --- a/plugins/MirFox/src/MirandaInterface.cpp +++ b/plugins/MirFox/src/MirandaInterface.cpp @@ -26,7 +26,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MirFox/src/version.h b/plugins/MirFox/src/version.h index 7f9f2df000..b7873ba2e7 100644 --- a/plugins/MirFox/src/version.h +++ b/plugins/MirFox/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MirFox.dll"
#define __DESCRIPTION "MirFox (Miranda NG) - part of Miranda-Firefox integration - http://wsx22.3.xpdev-hosted.com"
#define __AUTHOR "Szymon Tokarz"
-#define __AUTHOREMAIL "wsx22@o2.pl"
#define __AUTHORWEB "https://miranda-ng.org/p/MirFox/"
#define __COPYRIGHT "© 2013 - 2017 Szymon Tokarz"
diff --git a/plugins/MirLua/src/main.cpp b/plugins/MirLua/src/main.cpp index 1795c56878..22fabbbdef 100644 --- a/plugins/MirLua/src/main.cpp +++ b/plugins/MirLua/src/main.cpp @@ -18,7 +18,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MirLua/src/version.h b/plugins/MirLua/src/version.h index 1525666f2a..b43e6301d0 100644 --- a/plugins/MirLua/src/version.h +++ b/plugins/MirLua/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MirLua.dll"
#define __DESCRIPTION "Extends Miranda NG functionality with Lua scripts."
#define __AUTHOR "Miranda NG team"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/MirLua/"
#define __COPYRIGHT "© 2015-17 Miranda NG project"
diff --git a/plugins/MirOTR/src/dllmain.cpp b/plugins/MirOTR/src/dllmain.cpp index 9e499f897a..bb72c7746b 100644 --- a/plugins/MirOTR/src/dllmain.cpp +++ b/plugins/MirOTR/src/dllmain.cpp @@ -13,7 +13,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MirOTR/src/version.h b/plugins/MirOTR/src/version.h index 275fa1166b..bfe6b1cf86 100644 --- a/plugins/MirOTR/src/version.h +++ b/plugins/MirOTR/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MirOTR.dll"
#define __DESCRIPTION "OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE))."
#define __AUTHOR "ProgAndy & CHEF-KOCH"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/MirOTR/"
#define __COPYRIGHT "© ProgAndy & CHEF-KOCH"
diff --git a/plugins/MirandaG15/src/Miranda.cpp b/plugins/MirandaG15/src/Miranda.cpp index 7da57367f3..10a1ec6919 100644 --- a/plugins/MirandaG15/src/Miranda.cpp +++ b/plugins/MirandaG15/src/Miranda.cpp @@ -73,7 +73,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MirandaG15/src/version.h b/plugins/MirandaG15/src/version.h index 3095c901db..fb41a9e806 100644 --- a/plugins/MirandaG15/src/version.h +++ b/plugins/MirandaG15/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MirandaG15.dll" #define __DESCRIPTION "Provides an interface to use Miranda from the LCD of various Logitech devices." #define __AUTHOR "Martin Kleinhans" -#define __AUTHOREMAIL "mail@mkleinhans.de" #define __AUTHORWEB "https://miranda-ng.org/p/MirandaG15/" #define __COPYRIGHT "© 2009 Martin Kleinhans" diff --git a/plugins/MobileState/src/main.cpp b/plugins/MobileState/src/main.cpp index 63db7151bb..d5eb32f7c2 100644 --- a/plugins/MobileState/src/main.cpp +++ b/plugins/MobileState/src/main.cpp @@ -29,7 +29,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MobileState/src/version.h b/plugins/MobileState/src/version.h index bfd59aee34..b077e9a106 100644 --- a/plugins/MobileState/src/version.h +++ b/plugins/MobileState/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MobileState.dll"
#define __DESCRIPTION "Plugin shows mobile icon in contact list next to contacts which are using mobile client."
#define __AUTHOR "Robert Pösel"
-#define __AUTHOREMAIL "robyer@seznam.cz"
#define __AUTHORWEB "https://miranda-ng.org/p/MobileState/"
#define __COPYRIGHT "© 2012-17 Robert Pösel"
diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index f9bc4d51f1..cc39c0653e 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -40,7 +40,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MsgPopup/src/version.h b/plugins/MsgPopup/src/version.h index 54379e6606..ecbccc9161 100644 --- a/plugins/MsgPopup/src/version.h +++ b/plugins/MsgPopup/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MsgPopup.dll" #define __DESCRIPTION "Plugin replaces message boxes (those having only OK button) with popups." #define __AUTHOR "StDenis" -#define __AUTHOREMAIL "stdenformiranda@fromru.com" #define __AUTHORWEB "https://miranda-ng.org/p/MsgPopup/" #define __COPYRIGHT "© 2004 Denis Stanishevskiy" diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index 686294963b..2afea9225a 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Msg_Export/src/version.h b/plugins/Msg_Export/src/version.h index cb04f386aa..4ffd396e6a 100644 --- a/plugins/Msg_Export/src/version.h +++ b/plugins/Msg_Export/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Msg_Export.dll" #define __DESCRIPTION "Exports every message, URL or file you receive to a text file." #define __AUTHOR "Kennet Nielsen, mod by ring0" -#define __AUTHOREMAIL "Kennet_N@ofir.dk" #define __AUTHORWEB "https://miranda-ng.org/p/Msg_Export/" #define __COPYRIGHT "© 2002 Kennet Nielsen, 2012-17 Miranda NG Team" diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp index 459ee0572d..5f00d1a8dd 100644 --- a/plugins/MyDetails/src/mydetails.cpp +++ b/plugins/MyDetails/src/mydetails.cpp @@ -33,7 +33,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/MyDetails/src/version.h b/plugins/MyDetails/src/version.h index c621144e1a..263549e2b1 100644 --- a/plugins/MyDetails/src/version.h +++ b/plugins/MyDetails/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "MyDetails.dll" #define __DESCRIPTION "Shows and allows you to edit your details for all accounts." #define __AUTHOR "Ricardo Pescuma Domenecci, Drugwash" -#define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/MyDetails/" #define __COPYRIGHT "© 2005-2008 Ricardo Pescuma Domenecci, Drugwash" diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index 4ab5f98280..eef50f0655 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -82,7 +82,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/NewAwaySysMod/src/version.h b/plugins/NewAwaySysMod/src/version.h index 0058c6b912..2fc57d631e 100644 --- a/plugins/NewAwaySysMod/src/version.h +++ b/plugins/NewAwaySysMod/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NewAwaySys.dll"
#define __DESCRIPTION "Allows you to handle your status messages in a convenient way."
#define __AUTHOR "NightFox, Deathdemon, XF007, Goblineye Entertainment"
-#define __AUTHOREMAIL "NightFox@myied.org"
#define __AUTHORWEB "https://miranda-ng.org/p/NewAwaySys/"
#define __COPYRIGHT "© 2010 NightFox; © 2005-2007 Chervov Dmitry; © 2004-2005 Iksaif; © 2002-2003 Goblineye Entertainment"
diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp index bb33f4a236..571abdd1be 100644 --- a/plugins/NewEventNotify/src/main.cpp +++ b/plugins/NewEventNotify/src/main.cpp @@ -39,7 +39,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/NewEventNotify/src/version.h b/plugins/NewEventNotify/src/version.h index 98c2ebd589..908b73fc10 100644 --- a/plugins/NewEventNotify/src/version.h +++ b/plugins/NewEventNotify/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NewEventNotify.dll" #define __DESCRIPTION "Notifies you when you receive a message, URL, file or any other event by displaying a popup." #define __AUTHOR "icebreaker, Prezes, vj, vlko, Joe @ Whale" -#define __AUTHOREMAIL "jokusoftware@miranda-im.org" #define __AUTHORWEB "https://miranda-ng.org/p/NewEventNotify/" #define __COPYRIGHT "" diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index eea1cf800f..70a7303963 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -45,7 +45,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/NewXstatusNotify/src/version.h b/plugins/NewXstatusNotify/src/version.h index afc55f67f3..76e9ddac61 100644 --- a/plugins/NewXstatusNotify/src/version.h +++ b/plugins/NewXstatusNotify/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NewXstatusNotify.dll"
#define __DESCRIPTION "Notifies you when a contact changes his/her (X)status or status message."
#define __AUTHOR "Luca Santarelli, Vasilich, yaho"
-#define __AUTHOREMAIL "yaho@miranda-easy.net"
#define __AUTHORWEB "https://miranda-ng.org/p/NewXstatusNotify/"
#define __COPYRIGHT "© 2001-2004 Luca Santarelli, 2005-2007 Vasilich, 2007-2011 yaho"
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 1736462b5e..11239e5610 100755 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -27,7 +27,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/New_GPG/src/version.h b/plugins/New_GPG/src/version.h index 8c156b9a16..d0d01312aa 100755 --- a/plugins/New_GPG/src/version.h +++ b/plugins/New_GPG/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "New_GPG.dll" #define __DESCRIPTION "New GPG encryption support plugin, based on code from old GPG plugin and SecureIM." #define __AUTHOR "sss" -#define __AUTHOREMAIL "sss123next@list.ru" #define __AUTHORWEB "https://miranda-ng.org/p/New_GPG/" #define __COPYRIGHT "© 2010-17 sss" diff --git a/plugins/NewsAggregator/Src/Authentication.cpp b/plugins/NewsAggregator/Src/Authentication.cpp index 4d01851929..e53c4791a0 100644 --- a/plugins/NewsAggregator/Src/Authentication.cpp +++ b/plugins/NewsAggregator/Src/Authentication.cpp @@ -42,7 +42,7 @@ void CreateAuthString(char *auth, MCONTACT hContact, HWND hwndDlg) mir_free(tlogin);
mir_free(tpass);
- mir_snprintf(auth, 250, "Basic %s", ptrA(mir_base64_encode((PBYTE)str, len)));
+ mir_snprintf(auth, 250, "Basic %s", ptrA(mir_base64_encode(str, len)));
}
INT_PTR CALLBACK AuthenticationProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
diff --git a/plugins/NewsAggregator/Src/NewsAggregator.cpp b/plugins/NewsAggregator/Src/NewsAggregator.cpp index 01a57f1ac1..bc9d91ac3a 100644 --- a/plugins/NewsAggregator/Src/NewsAggregator.cpp +++ b/plugins/NewsAggregator/Src/NewsAggregator.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/NewsAggregator/Src/version.h b/plugins/NewsAggregator/Src/version.h index b9197c3d5d..d47f44e9c8 100644 --- a/plugins/NewsAggregator/Src/version.h +++ b/plugins/NewsAggregator/Src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NewsAggregator.dll" #define __DESCRIPTION "RSS/Atom news aggregator." #define __AUTHOR "Mataes, FREAK_THEMIGHTY" -#define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/NewsAggregator/" #define __COPYRIGHT "© 2012-17 Mataes, FREAK_THEMIGHTY" diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp index f20a68161b..cbd5db623c 100644 --- a/plugins/NoHistory/src/dllmain.cpp +++ b/plugins/NoHistory/src/dllmain.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/NoHistory/src/version.h b/plugins/NoHistory/src/version.h index 31b68721b2..1519b6c710 100644 --- a/plugins/NoHistory/src/version.h +++ b/plugins/NoHistory/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NoHistory.dll" #define __DESCRIPTION "Prevent Miranda from storing any history." #define __AUTHOR "Scott Ellis, NightFox" -#define __AUTHOREMAIL "mail@scottellis.com.au; nightfox@myied.org" #define __AUTHORWEB "https://miranda-ng.org/p/NoHistory/" #define __COPYRIGHT "© 2005 Scott Ellis, 2010-17 NightFox" diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 5f7f769469..209967923b 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -16,7 +16,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Non-IM Contact/src/version.h b/plugins/Non-IM Contact/src/version.h index a2e19e413a..d8bf664b36 100644 --- a/plugins/Non-IM Contact/src/version.h +++ b/plugins/Non-IM Contact/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NimContact.dll" #define __DESCRIPTION "Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)" #define __AUTHOR "Jonathan Gordon" -#define __AUTHOREMAIL "ICQ 98791178, MSN jonnog@hotmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/NimContact/" #define __COPYRIGHT "© 2003-2004 Jonathan Gordon, jdgordy@gmail.com" diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 0ea7fd65e3..f3d2c3af51 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -22,7 +22,6 @@ static PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/NotesAndReminders/src/version.h b/plugins/NotesAndReminders/src/version.h index 295d18edec..8ab090eb82 100644 --- a/plugins/NotesAndReminders/src/version.h +++ b/plugins/NotesAndReminders/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NotesReminders.dll" #define __DESCRIPTION "Sticky Notes & Reminders Implementation for Miranda NG." #define __AUTHOR "Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer" -#define __AUTHOREMAIL "jokusoftware@users.sourceforge.net; d00mEr@dir.bg" #define __AUTHORWEB "https://miranda-ng.org/p/NotesAndReminders/" #define __COPYRIGHT "© 2003-2005 Joe Kucera, Lubomir Ivanov" diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp index 5367ea5fa4..6069a5962e 100644 --- a/plugins/NotifyAnything/src/main.cpp +++ b/plugins/NotifyAnything/src/main.cpp @@ -33,7 +33,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/NotifyAnything/src/version.h b/plugins/NotifyAnything/src/version.h index 5e87c48eef..c102285c27 100644 --- a/plugins/NotifyAnything/src/version.h +++ b/plugins/NotifyAnything/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "NotifyAnything.dll" #define __DESCRIPTION "Displays popups for custom events, triggered by UDP packages." #define __AUTHOR "Daniel Wesslen, Korney San" -#define __AUTHOREMAIL "wesslen@users.sourceforge.net, kora@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/NotifyAnything/" #define __COPYRIGHT "© 2003 Daniel Wesslen" diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 990546769b..0524554f05 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -22,7 +22,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Nudge/src/version.h b/plugins/Nudge/src/version.h index 553c4efea7..7516394138 100644 --- a/plugins/Nudge/src/version.h +++ b/plugins/Nudge/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Nudge.dll" #define __DESCRIPTION "Plugin to shake the contact list and chat window." #define __AUTHOR "Tweety/GouZ, FREAK_THEMIGHTY" -#define __AUTHOREMAIL "francois.mean@skynet.be, Sylvain.gougouzian@gmail.com, wishmaster51@googlemail.com" #define __AUTHORWEB "https://miranda-ng.org/p/Nudge/" #define __COPYRIGHT "© the miranda community" diff --git a/plugins/OpenFolder/src/openFolder.cpp b/plugins/OpenFolder/src/openFolder.cpp index 97509a117b..695aa6ac73 100644 --- a/plugins/OpenFolder/src/openFolder.cpp +++ b/plugins/OpenFolder/src/openFolder.cpp @@ -11,7 +11,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/OpenFolder/src/version.h b/plugins/OpenFolder/src/version.h index 05f208d2df..588839c6fe 100644 --- a/plugins/OpenFolder/src/version.h +++ b/plugins/OpenFolder/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "OpenFolder.dll" #define __DESCRIPTION "Adds a menu/toolbar item which opens the main Miranda NG folder." #define __AUTHOR "jarvis, Kreisquadratur" -#define __AUTHOREMAIL "jarvis@jabber.cz, djui@kreisquadratur.de" #define __AUTHORWEB "https://miranda-ng.org/p/OpenFolder/" #define __COPYRIGHT "© 2008 jarvis, © 2004 Kreisquadratur" diff --git a/plugins/OpenSSL/src/main.cpp b/plugins/OpenSSL/src/main.cpp index e523acc96d..0cb0c0f95a 100644 --- a/plugins/OpenSSL/src/main.cpp +++ b/plugins/OpenSSL/src/main.cpp @@ -32,7 +32,6 @@ PLUGININFOEX pluginInfo = { __VERSION_DWORD,
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE | STATIC_PLUGIN,
diff --git a/plugins/OpenSSL/src/version.h b/plugins/OpenSSL/src/version.h index 6dff056a72..b3a5cab126 100644 --- a/plugins/OpenSSL/src/version.h +++ b/plugins/OpenSSL/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "OpenSSL.dll" #define __DESCRIPTION "Core driver to provide OpenSSL-based SSL services." #define __AUTHOR "Miranda NG Team" -#define __AUTHOREMAIL "" -#define __AUTHORWEB "" +#define __AUTHORWEB "https://miranda-ng.org/p/OpenSSL/" #define __COPYRIGHT "© 2014-17 Miranda NG Team" diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index 2d889f6911..cd6165785f 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -31,7 +31,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/PackUpdater/Src/version.h b/plugins/PackUpdater/Src/version.h index 2823d340ee..1c086069fd 100644 --- a/plugins/PackUpdater/Src/version.h +++ b/plugins/PackUpdater/Src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "PackUpdater.dll" #define __DESCRIPTION "Simple updater for Miranda NG premodified packs." #define __AUTHOR "Mataes, ZERO_BiT" -#define __AUTHOREMAIL "mataes2007@gmail.com, zero-bit@mail.ru" #define __AUTHORWEB "https://miranda-ng.org/p/PackUpdater/" #define __COPYRIGHT "© 2011-2017 Mataes, 2007 ZERO_BiT" diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 96de6b8a51..6839195d4b 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -42,7 +42,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/PasteIt/src/version.h b/plugins/PasteIt/src/version.h index 68de25f823..bea6149880 100644 --- a/plugins/PasteIt/src/version.h +++ b/plugins/PasteIt/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "PasteIt.dll"
#define __DESCRIPTION "Uploads the text to web page and sends the URL to your friends."
#define __AUTHOR "Krzysztof Kral"
-#define __AUTHOREMAIL "programista@poczta.of.pl"
#define __AUTHORWEB "https://miranda-ng.org/p/PasteIt/"
#define __COPYRIGHT "© 2011 Krzysztof Kral"
diff --git a/plugins/Ping/src/ping.cpp b/plugins/Ping/src/ping.cpp index c703feba7a..42112e98bc 100644 --- a/plugins/Ping/src/ping.cpp +++ b/plugins/Ping/src/ping.cpp @@ -16,7 +16,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Ping/src/version.h b/plugins/Ping/src/version.h index 16ad496842..6a5b2f22e9 100644 --- a/plugins/Ping/src/version.h +++ b/plugins/Ping/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Ping.dll" #define __DESCRIPTION "Ping labelled IP addresses or domain names." #define __AUTHOR "Scott Ellis" -#define __AUTHOREMAIL "mail@scottellis.com.au" #define __AUTHORWEB "https://miranda-ng.org/p/Ping/" #define __COPYRIGHT "© 2005 Scott Ellis" diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 8e3ef7228a..abf740038b 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -591,6 +591,7 @@ static renameTable[] = { L"gender.dll", nullptr },
{ L"gtalkext.dll", nullptr },
{ L"langman.dll", nullptr },
+ { L"libtox.dll", nullptr },
{ L"metacontacts.dll", nullptr },
{ L"modernopt.dll", nullptr },
{ L"msvcp100.dll", nullptr },
diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 863a93ac7b..629ff6961c 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -30,7 +30,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/PluginUpdater/src/version.h b/plugins/PluginUpdater/src/version.h index d3477ff6fd..101680e3a2 100644 --- a/plugins/PluginUpdater/src/version.h +++ b/plugins/PluginUpdater/src/version.h @@ -7,8 +7,7 @@ #define __PLUGIN_NAME "Plugin updater" #define __FILENAME "PluginUpdater.dll" -#define __DESCRIPTION "Install and update plugins and other Miranda NG components." +#define __DESCRIPTION "Installs and updates plugins and other Miranda NG components." #define __AUTHOR "Mataes, George Hazan" -#define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/PluginUpdater/" #define __COPYRIGHT "© 2012-17 Mataes, George Hazan" diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index c6ae1a1ffc..fc276a1b63 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -54,7 +54,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index a3d5c3c425..fada19920f 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -545,9 +545,9 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count) {
bool isIm = (m_hContact && (CallProtoService(GetContactProto(m_hContact), PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) ? true : false;
- bool enableDefaultGen = (m_hContact || !(PopupOptions.actions&ACT_DEF_NOGLOBAL)) ? true : false;
- bool enableDefaultUsr = (isIm || m_hContact && !(PopupOptions.actions&ACT_DEF_IMONLY)) ? true : false;
- bool iconSize = PopupOptions.actions&ACT_LARGE ? TRUE : FALSE;
+ bool enableDefaultGen = (m_hContact || !(PopupOptions.actions & ACT_DEF_NOGLOBAL)) ? true : false;
+ bool enableDefaultUsr = (isIm || m_hContact && !(PopupOptions.actions & ACT_DEF_IMONLY)) ? true : false;
+ bool iconSize = PopupOptions.actions & ACT_LARGE ? TRUE : FALSE;
if (PopupOptions.actions & ACT_ENABLE) {
if (enableDefaultUsr && isIm && IsActionEnabled("General/Quick reply")) ++m_actionCount;
@@ -857,7 +857,7 @@ LRESULT CALLBACK ReplyEditWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_DESTROY:
PopupThreadUnlock();
- if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ if (!(PopupOptions.actions & ACT_DEF_KEEPWND))
PUDeletePopup(dat->hwndPopup);
SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)dat->oldWndProc);
SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
@@ -908,7 +908,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara switch (lParam) {
case ACT_DEF_MESSAGE:
CallServiceSync(MS_MSG_SENDMESSAGE, (WPARAM)m_hContact, 0);
- if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ if (!(PopupOptions.actions & ACT_DEF_KEEPWND))
PUDeletePopup(m_hwnd);
break;
@@ -936,7 +936,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara case ACT_DEF_DETAILS:
CallServiceSync(MS_USERINFO_SHOWDIALOG, (WPARAM)m_hContact, 0);
- if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ if (!(PopupOptions.actions & ACT_DEF_KEEPWND))
PUDeletePopup(m_hwnd);
break;
@@ -946,15 +946,9 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara break;
case ACT_DEF_ADD:
- {
- ADDCONTACTSTRUCT acs = { 0 };
- acs.hContact = m_hContact;
- acs.handleType = HANDLE_CONTACT;
- acs.szProto = nullptr;
- CallServiceSync(MS_ADDCONTACT_SHOW, NULL, (LPARAM)&acs);
- if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
- PUDeletePopup(m_hwnd);
- }
+ Contact_Add(m_hContact);
+ if (!(PopupOptions.actions & ACT_DEF_KEEPWND))
+ PUDeletePopup(m_hwnd);
break;
case ACT_DEF_PIN:
@@ -965,7 +959,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara m_bIsPinned = !m_bIsPinned;
{
- bool iconSize = PopupOptions.actions&ACT_LARGE ? TRUE : FALSE;
+ bool iconSize = PopupOptions.actions & ACT_LARGE ? TRUE : FALSE;
PUModifyActionIcon(m_hwnd, wParam, lParam, m_bIsPinned ? LoadIconEx(IDI_ACT_PINNED, iconSize) : LoadIconEx(IDI_ACT_PIN, iconSize));
}
break;
@@ -1011,7 +1005,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara case UM_MENUDONE:
{
unlock();
- if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ if (!(PopupOptions.actions & ACT_DEF_KEEPWND))
PUDeletePopup(m_hwnd);
break;
}
diff --git a/plugins/Popup/src/skin.cpp b/plugins/Popup/src/skin.cpp index 157c9aa981..bd912cf115 100644 --- a/plugins/Popup/src/skin.cpp +++ b/plugins/Popup/src/skin.cpp @@ -128,8 +128,8 @@ void PopupSkin::drawAction(MyBitmap *bmp, POPUPACTION *act, int x, int y, bool h wchar_t *str = TranslateW(wname);
GetTextExtentPoint32(bmp->getDC(), str, (int)mir_wstrlen(str), &szText);
bmp->Draw_Text(str,
- (PopupOptions.actions&ACT_LARGE) ? (x + szSpace.cx + 32) : (x + szSpace.cx + 16),
- max(y + 2, y + 2 + (((PopupOptions.actions&ACT_LARGE) ? 32 : 16) - szText.cy) / 2));
+ (PopupOptions.actions & ACT_LARGE) ? (x + szSpace.cx + 32) : (x + szSpace.cx + 16),
+ max(y + 2, y + 2 + (((PopupOptions.actions & ACT_LARGE) ? 32 : 16) - szText.cy) / 2));
mir_free(wname);
SelectObject(bmp->getDC(), hFntSave);
@@ -139,8 +139,8 @@ void PopupSkin::drawAction(MyBitmap *bmp, POPUPACTION *act, int x, int y, bool h RECT rc;
rc.left = x;
rc.top = y;
- rc.right = x + ((PopupOptions.actions&ACT_LARGE) ? 32 : 16) + 4;
- rc.bottom = y + ((PopupOptions.actions&ACT_LARGE) ? 32 : 16) + 4;
+ rc.right = x + ((PopupOptions.actions & ACT_LARGE) ? 32 : 16) + 4;
+ rc.bottom = y + ((PopupOptions.actions & ACT_LARGE) ? 32 : 16) + 4;
bmp->saveAlpha(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
HBRUSH hbr = CreateSolidBrush(fonts.clActionHover);
FrameRect(bmp->getDC(), &rc, hbr);
@@ -520,7 +520,7 @@ void PopupSkin::display(MyBitmap *bmp, PopupWnd2 *wnd, POPUPOPTIONS *options, DW drawActionBar(bmp, wnd,
db_get_b(NULL, MODULNAME, "CenterActions", 0) ?
(pt.x + (textAreaWidth - wnd->getRenderInfo()->actw) / 2) :
- (PopupOptions.actions&ACT_RIGHTICONS) ?
+ (PopupOptions.actions & ACT_RIGHTICONS) ?
(pt.x + textAreaWidth - wnd->getRenderInfo()->actw) :
// else
pt.x,
diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h index e892d518f6..75e7733f12 100644 --- a/plugins/Popup/src/stdafx.h +++ b/plugins/Popup/src/stdafx.h @@ -72,7 +72,7 @@ https://miranda-ng.org/distr/ #include <m_button.h>
#include <m_message.h>
#include <m_userinfo.h>
-#include <m_addcontact.h>
+#include <m_contacts.h>
#include <m_clc.h>
#include <m_icolib.h>
#include <m_genmenu.h>
diff --git a/plugins/Popup/src/version.h b/plugins/Popup/src/version.h index 45bbca6f8c..cbbaf99aa8 100644 --- a/plugins/Popup/src/version.h +++ b/plugins/Popup/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Popup.dll"
#define __DESCRIPTION "Provides popup notification services for different plugins."
#define __AUTHOR "MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)"
-#define __AUTHOREMAIL "mp-king@web.de"
#define __AUTHORWEB "https://miranda-ng.org/p/Popup/"
#define __COPYRIGHT "© 2002 Luca Santarelli, 2004-2007 Victor Pavlychko, 2010 MPK, Merlin_de"
diff --git a/plugins/ProfileManager/src/pmanagerEx.cpp b/plugins/ProfileManager/src/pmanagerEx.cpp index 4b221431e1..860414c0d5 100644 --- a/plugins/ProfileManager/src/pmanagerEx.cpp +++ b/plugins/ProfileManager/src/pmanagerEx.cpp @@ -23,7 +23,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ProfileManager/src/version.h b/plugins/ProfileManager/src/version.h index dbcb79f127..6fe96108dc 100644 --- a/plugins/ProfileManager/src/version.h +++ b/plugins/ProfileManager/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "PManagerEx.dll" #define __DESCRIPTION "Adds a menu item to change or load a different profile of Miranda NG, restart or run DbChecker." #define __AUTHOR "Roman Gemini" -#define __AUTHOREMAIL "woobind@ukr.net" #define __AUTHORWEB "https://miranda-ng.org/p/PManagerEx/" #define __COPYRIGHT "© 2008-10 Roman Gemini" diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 75034af9ca..7407230a1f 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -28,7 +28,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/QuickContacts/src/version.h b/plugins/QuickContacts/src/version.h index eee85d9015..9f499e0d6f 100644 --- a/plugins/QuickContacts/src/version.h +++ b/plugins/QuickContacts/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "QuickContacts.dll" #define __DESCRIPTION "Open contact-specific windows by hotkey." #define __AUTHOR "Ricardo Pescuma Domenecci, Heiko Schillinger" -#define __AUTHOREMAIL "pescuma@miranda-im.org" #define __AUTHORWEB "https://miranda-ng.org/p/QuickContacts/" #define __COPYRIGHT "© 2007-2009 Ricardo Pescuma Domenecci" diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp index f16c798875..5502ea2d14 100644 --- a/plugins/QuickMessages/src/main.cpp +++ b/plugins/QuickMessages/src/main.cpp @@ -38,7 +38,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/QuickMessages/src/version.h b/plugins/QuickMessages/src/version.h index b3ead27ca7..460fe7d3a2 100644 --- a/plugins/QuickMessages/src/version.h +++ b/plugins/QuickMessages/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "QuickMessages.dll" #define __DESCRIPTION "Plugin for quick insert pre-defined messages in message input area." #define __AUTHOR "MaD_CLuSTeR" -#define __AUTHOREMAIL "daniok@yandex.ru" #define __AUTHORWEB "https://miranda-ng.org/p/QuickMessages/" #define __COPYRIGHT "© 2008 Danil Mozhar" diff --git a/plugins/QuickReplies/src/quickreplies.cpp b/plugins/QuickReplies/src/quickreplies.cpp index cf424fa336..428b0ec6b2 100644 --- a/plugins/QuickReplies/src/quickreplies.cpp +++ b/plugins/QuickReplies/src/quickreplies.cpp @@ -28,7 +28,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/QuickReplies/src/version.h b/plugins/QuickReplies/src/version.h index 9d1580a360..d98e4c1821 100644 --- a/plugins/QuickReplies/src/version.h +++ b/plugins/QuickReplies/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "QuickReplies.dll"
#define __DESCRIPTION "Plugin for quick insert (or sending) pre-defined messages in message input area."
#define __AUTHOR "Unsane"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/QuickReplies/"
#define __COPYRIGHT "© 2010 Unsane"
diff --git a/plugins/QuickSearch/quicksearch.dpr b/plugins/QuickSearch/quicksearch.dpr index c9f90d01fb..5dede8135b 100644 --- a/plugins/QuickSearch/quicksearch.dpr +++ b/plugins/QuickSearch/quicksearch.dpr @@ -32,7 +32,6 @@ begin 'And now you may add any setting to display - for example '+
'user''s version of Miranda, group or city.';
PluginInfo.author :='Awkward, based on Bethoven sources';
- PluginInfo.authorEmail:='panda75@bk.ru; awk1975@ya.ru';
PluginInfo.copyright :='(c) 2004,2005 Bethoven; 2006-2013 Awkward';
PluginInfo.homepage :='http://code.google.com/p/delphi-miranda-plugins/';
PluginInfo.flags :=UNICODE_AWARE;
diff --git a/plugins/Quotes/docs/Utility/google.xml b/plugins/Quotes/docs/Utility/google.xml index 7b22acd3ac..c6304da1a6 100644 --- a/plugins/Quotes/docs/Utility/google.xml +++ b/plugins/Quotes/docs/Utility/google.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Provider>
<name>Google</name>
@@ -8,26 +8,57 @@ <section>
<name>Currencies</name>
<quote>
- <id>AED</id>
- <symbol>AED</symbol>
- <description>United Arab Emirates Dirham (AED)</description>
+ <id>AED</id><symbol>AED</symbol><description>United Arab Emirates Dirham (AED)</description>
+ </quote>
+ <quote>
+ <id>AFN</id><symbol>AFN</symbol><description>Afghan Afghani (AFN)</description>
+ </quote>
+ <quote>
+ <id>ALL</id><symbol>ALL</symbol><description>Albanian Lek (ALL)</description>
+ </quote>
+ <quote>
+ <id>AMD</id><symbol>AMD</symbol><description>Armenian Dram (AMD)</description>
</quote>
<quote>
<id>ANG</id><symbol>ANG</symbol><description>Netherlands Antillean Gulden (ANG)</description>
</quote>
<quote>
+ <id>AOA</id><symbol>AOA</symbol><description>Angolan Kwanza (AOA)</description>
+ </quote>
+ <quote>
<id>ARS</id><symbol>ARS</symbol><description>Argentine Peso (ARS)</description>
</quote>
<quote>
<id>AUD</id><symbol>AUD</symbol><description>Australian Dollar (AUD)</description>
</quote>
<quote>
+ <id>AWG</id><symbol>AWG</symbol><description>Aruban Florin (AWG)</description>
+ </quote>
+ <quote>
+ <id>AZN</id><symbol>AZN</symbol><description>Azerbaijani Manat (AZN)</description>
+ </quote>
+ <quote>
+ <id>BAM</id><symbol>BAM</symbol><description>Bosnia-Herzegovina Convertible Mark (BAM)</description>
+ </quote>
+ <quote>
+ <id>BBD</id><symbol>BBD</symbol><description>Barbadian Dollar (BBD)</description>
+ </quote>
+ <quote>
+ <id>BDT</id><symbol>BDT</symbol><description>Bangladeshi Taka (BDT)</description>
+ </quote>
+ <quote>
<id>BGN</id><symbol>BGN</symbol><description>Bulgarian Lev (BGN)</description>
</quote>
<quote>
<id>BHD</id><symbol>BHD</symbol><description>Bahraini Dinar (BHD)</description>
</quote>
<quote>
+ <id>BIF</id><symbol>BIF</symbol><description>Burundian Franc (BIF)</description>
+ </quote>
+ <quote>
+ <id>BMD</id><symbol>BMD</symbol><description>Bermudan Dollar (BMD)</description>
+ </quote>
+ <quote>
<id>BND</id><symbol>BND</symbol><description>Brunei Dollar (BND)</description>
</quote>
<quote>
@@ -37,58 +68,451 @@ <id>BRL</id><symbol>BRL</symbol><description>Brazilian Real (BRL)</description>
</quote>
<quote>
+ <id>BSD</id><symbol>BSD</symbol><description>Bahamian Dollar (BSD)</description>
+ </quote>
+ <quote>
+ <id>BTC</id><symbol>BTC</symbol><description>Bitcoin (BTC)</description>
+ </quote>
+ <quote>
+ <id>BTN</id><symbol>BTN</symbol><description>Bhutanese Ngultrum (BTN)</description>
+ </quote>
+ <quote>
<id>BWP</id><symbol>BWP</symbol><description>Botswana Pula (BWP)</description>
</quote>
<quote>
- <id>BYR</id><symbol>BYR</symbol><description>Belarusian Ruble (BYR)</description>
+ <id>BYN</id><symbol>BYN</symbol><description>Belarusian Ruble (BYN)</description>
+ </quote>
+ <quote>
+ <id>BYR</id><symbol>BYR</symbol><description>Belarusian Ruble (2000–2016) (BYR)</description>
+ </quote>
+ <quote>
+ <id>BZD</id><symbol>BZD</symbol><description>Belize Dollar (BZD)</description>
</quote>
<quote>
<id>CAD</id><symbol>CAD</symbol><description>Canadian Dollar (CAD)</description>
</quote>
<quote>
+ <id>CDF</id><symbol>CDF</symbol><description>Congolese Franc (CDF)</description>
+ </quote>
+ <quote>
<id>CHF</id><symbol>CHF</symbol><description>Swiss Franc (CHF)</description>
</quote>
<quote>
+ <id>CLF</id><symbol>CLF</symbol><description>Chilean Unit of Account (UF) (CLF)</description>
+ </quote>
+ <quote>
<id>CLP</id><symbol>CLP</symbol><description>Chilean Peso (CLP)</description>
</quote>
<quote>
- <id>CNY</id><symbol>CNY</symbol><description>Chinese Yuan (renminbi) (CNY)</description>
+ <id>CNH</id><symbol>CNH</symbol><description>CNH (CNH)</description>
+ </quote>
+ <quote>
+ <id>CNY</id><symbol>CNY</symbol><description>Chinese Yuan (CNY)</description>
</quote>
<quote>
<id>COP</id><symbol>COP</symbol><description>Colombian Peso (COP)</description>
</quote>
<quote>
- <id>CSD</id><symbol>CSD</symbol><description>Serbian Dinar (CSD)</description>
+ <id>CRC</id><symbol>CRC</symbol><description>Costa Rican Colón (CRC)</description>
+ </quote>
+ <quote>
+ <id>CUP</id><symbol>CUP</symbol><description>Cuban Peso (CUP)</description>
+ </quote>
+ <quote>
+ <id>CVE</id><symbol>CVE</symbol><description>Cape Verdean Escudo (CVE)</description>
</quote>
<quote>
<id>CZK</id><symbol>CZK</symbol><description>Czech Koruna (CZK)</description>
</quote>
<quote>
+ <id>DEM</id><symbol>DEM</symbol><description>German Mark (DEM)</description>
+ </quote>
+ <quote>
+ <id>DJF</id><symbol>DJF</symbol><description>Djiboutian Franc (DJF)</description>
+ </quote>
+ <quote>
<id>DKK</id><symbol>DKK</symbol><description>Danish Krone (DKK)</description>
</quote>
<quote>
- <id>EEK</id><symbol>EEK</symbol><description>Estonian Kroon (EEK)</description>
- </quote>
+ <id>DOP</id><symbol>DOP</symbol><description>Dominican Peso (DOP)</description>
+ </quote>
+ <quote>
+ <id>DZD</id><symbol>DZD</symbol><description>Algerian Dinar (DZD)</description>
+ </quote>
<quote>
<id>EGP</id><symbol>EGP</symbol><description>Egyptian Pound (EGP)</description>
</quote>
<quote>
+ <id>ERN</id><symbol>ERN</symbol><description>Eritrean Nakfa (ERN)</description>
+ </quote>
+ <quote>
+ <id>ETB</id><symbol>ETB</symbol><description>Ethiopian Birr (ETB)</description>
+ </quote>
+ <quote>
<id>EUR</id><symbol>EUR</symbol><description>Euro (EUR)</description>
</quote>
<quote>
+ <id>FIM</id><symbol>FIM</symbol><description>Finnish Markka (FIM)</description>
+ </quote>
+ <quote>
<id>FJD</id><symbol>FJD</symbol><description>Fijian Dollar (FJD)</description>
</quote>
- <quote><id>GBP</id><symbol>GBP</symbol><description>British Pound (GBP)</description></quote><quote><id>HKD</id><symbol>HKD</symbol><description>Hong Kong Dollar (HKD)</description></quote><quote><id>HNL</id><symbol>HNL</symbol><description>Honduran Lempira (HNL)</description></quote><quote><id>HRK</id><symbol>HRK</symbol><description>Croatian Kuna (HRK)</description></quote><quote><id>HUF</id><symbol>HUF</symbol><description>Hungarian Forint (HUF)</description></quote><quote><id>IDR</id><symbol>IDR</symbol><description>Indonesian Rupiah (IDR)</description></quote><quote><id>ILS</id><symbol>ILS</symbol><description>New Israeli Sheqel (ILS)</description></quote><quote><id>INR</id><symbol>INR</symbol><description>Indian Rupee (INR)</description></quote><quote><id>ISK</id><symbol>ISK</symbol><description>Icelandic Króna (ISK)</description></quote><quote><id>JPY</id><symbol>JPY</symbol><description>Japanese Yen (JPY)</description></quote><quote><id>KRW</id><symbol>KRW</symbol><description>South Korean Won (KRW)</description></quote><quote><id>KWD</id><symbol>KWD</symbol><description>Kuwaiti Dinar (KWD)</description></quote><quote><id>KZT</id><symbol>KZT</symbol><description>Kazakhstani Tenge (KZT)</description></quote><quote><id>LKR</id><symbol>LKR</symbol><description>Sri Lankan Rupee (LKR)</description></quote><quote><id>LTL</id><symbol>LTL</symbol><description>Lithuanian Litas (LTL)</description></quote><quote><id>MAD</id><symbol>MAD</symbol><description>Moroccan Dirham (MAD)</description></quote><quote><id>MUR</id><symbol>MUR</symbol><description>Mauritian Rupee (MUR)</description></quote><quote><id>MXN</id><symbol>MXN</symbol><description>Mexican Peso (MXN)</description></quote><quote><id>MYR</id><symbol>MYR</symbol><description>Malaysian Ringgit (MYR)</description></quote><quote><id>NOK</id><symbol>NOK</symbol><description>Norwegian Krone (NOK)</description></quote><quote><id>NPR</id><symbol>NPR</symbol><description>Nepalese Rupee (NPR)</description></quote><quote><id>NZD</id><symbol>NZD</symbol><description>New Zealand Dollar (NZD)</description></quote><quote><id>OMR</id><symbol>OMR</symbol><description>Omani Rial (OMR)</description></quote><quote><id>PEN</id><symbol>PEN</symbol><description>Peruvian Nuevo Sol (PEN)</description></quote><quote><id>PHP</id><symbol>PHP</symbol><description>Philippine Peso (PHP)</description></quote><quote><id>PKR</id><symbol>PKR</symbol><description>Pakistani Rupee (PKR)</description></quote><quote><id>PLN</id><symbol>PLN</symbol><description>Polish Złoty (PLN)</description></quote><quote><id>QAR</id><symbol>QAR</symbol><description>Qatari Riyal (QAR)</description></quote><quote><id>RON</id><symbol>RON</symbol><description>New Romanian Leu (RON)</description></quote>
-
+ <quote>
+ <id>FKP</id><symbol>FKP</symbol><description>Falkland Islands Pound (FKP)</description>
+ </quote>
+ <quote>
+ <id>FRF</id><symbol>FRF</symbol><description>French Franc (FRF)</description>
+ </quote>
+ <quote>
+ <id>GBP</id><symbol>GBP</symbol><description>British Pound (GBP)</description>
+ </quote>
+ <quote>
+ <id>GEL</id><symbol>GEL</symbol><description>Georgian Lari (GEL)</description>
+ </quote>
+ <quote>
+ <id>GHS</id><symbol>GHS</symbol><description>Ghanaian Cedi (GHS)</description>
+ </quote>
+ <quote>
+ <id>GIP</id><symbol>GIP</symbol><description>Gibraltar Pound (GIP)</description>
+ </quote>
+ <quote>
+ <id>GMD</id><symbol>GMD</symbol><description>Gambian Dalasi (GMD)</description>
+ </quote>
+ <quote>
+ <id>GNF</id><symbol>GNF</symbol><description>Guinean Franc (GNF)</description>
+ </quote>
+ <quote>
+ <id>GTQ</id><symbol>GTQ</symbol><description>Guatemalan Quetzal (GTQ)</description>
+ </quote>
+ <quote>
+ <id>GYD</id><symbol>GYD</symbol><description>Guyanaese Dollar (GYD)</description>
+ </quote>
+ <quote>
+ <id>HKD</id><symbol>HKD</symbol><description>Hong Kong Dollar (HKD)</description>
+ </quote>
+ <quote>
+ <id>HNL</id><symbol>HNL</symbol><description>Honduran Lempira (HNL)</description>
+ </quote>
+ <quote>
+ <id>HRK</id><symbol>HRK</symbol><description>Croatian Kuna (HRK)</description>
+ </quote>
+ <quote>
+ <id>HTG</id><symbol>HTG</symbol><description>Haitian Gourde (HTG)</description>
+ </quote>
+ <quote>
+ <id>HUF</id><symbol>HUF</symbol><description>Hungarian Forint (HUF)</description>
+ </quote>
+ <quote>
+ <id>IDR</id><symbol>IDR</symbol><description>Indonesian Rupiah (IDR)</description>
+ </quote>
+ <quote>
+ <id>IEP</id><symbol>IEP</symbol><description>Irish Pound (IEP)</description>
+ </quote>
+ <quote>
+ <id>ILS</id><symbol>ILS</symbol><description>Israeli New Shekel (ILS)</description>
+ </quote>
+ <quote>
+ <id>INR</id><symbol>INR</symbol><description>Indian Rupee (INR)</description>
+ </quote>
+ <quote>
+ <id>IQD</id><symbol>IQD</symbol><description>Iraqi Dinar (IQD)</description>
+ </quote>
+ <quote>
+ <id>IRR</id><symbol>IRR</symbol><description>Iranian Rial (IRR)</description>
+ </quote>
+ <quote>
+ <id>ISK</id><symbol>ISK</symbol><description>Icelandic Króna (ISK)</description>
+ </quote>
+ <quote>
+ <id>ITL</id><symbol>ITL</symbol><description>Italian Lira (ITL)</description>
+ </quote>
+ <quote>
+ <id>JMD</id><symbol>JMD</symbol><description>Jamaican Dollar (JMD)</description>
+ </quote>
+ <quote>
+ <id>JOD</id><symbol>JOD</symbol><description>Jordanian Dinar (JOD)</description>
+ </quote>
+ <quote>
+ <id>JPY</id><symbol>JPY</symbol><description>Japanese Yen (JPY)</description>
+ </quote>
+ <quote>
+ <id>KES</id><symbol>KES</symbol><description>Kenyan Shilling (KES)</description>
+ </quote>
+ <quote>
+ <id>KGS</id><symbol>KGS</symbol><description>Kyrgystani Som (KGS)</description>
+ </quote>
+ <quote>
+ <id>KHR</id><symbol>KHR</symbol><description>Cambodian Riel (KHR)</description>
+ </quote>
+ <quote>
+ <id>KMF</id><symbol>KMF</symbol><description>Comorian Franc (KMF)</description>
+ </quote>
+ <quote>
+ <id>KPW</id><symbol>KPW</symbol><description>North Korean Won (KPW)</description>
+ </quote>
+ <quote>
+ <id>KRW</id><symbol>KRW</symbol><description>South Korean Won (KRW)</description>
+ </quote>
+ <quote>
+ <id>KWD</id><symbol>KWD</symbol><description>Kuwaiti Dinar (KWD)</description>
+ </quote>
+ <quote>
+ <id>KYD</id><symbol>KYD</symbol><description>Cayman Islands Dollar (KYD)</description>
+ </quote>
+ <quote>
+ <id>KZT</id><symbol>KZT</symbol><description>Kazakhstani Tenge (KZT)</description>
+ </quote>
+ <quote>
+ <id>LAK</id><symbol>LAK</symbol><description>Laotian Kip (LAK)</description>
+ </quote>
+ <quote>
+ <id>LBP</id><symbol>LBP</symbol><description>Lebanese Pound (LBP)</description>
+ </quote>
+ <quote>
+ <id>LKR</id><symbol>LKR</symbol><description>Sri Lankan Rupee (LKR)</description>
+ </quote>
+ <quote>
+ <id>LRD</id><symbol>LRD</symbol><description>Liberian Dollar (LRD)</description>
+ </quote>
+ <quote>
+ <id>LSL</id><symbol>LSL</symbol><description>Lesotho Loti (LSL)</description>
+ </quote>
+ <quote>
+ <id>LTL</id><symbol>LTL</symbol><description>Lithuanian Litas (LTL)</description>
+ </quote>
+ <quote>
+ <id>LVL</id><symbol>LVL</symbol><description>Latvian Lats (LVL)</description>
+ </quote>
+ <quote>
+ <id>LYD</id><symbol>LYD</symbol><description>Libyan Dinar (LYD)</description>
+ </quote>
+ <quote>
+ <id>MAD</id><symbol>MAD</symbol><description>Moroccan Dirham (MAD)</description>
+ </quote>
+ <quote>
+ <id>MDL</id><symbol>MDL</symbol><description>Moldovan Leu (MDL)</description>
+ </quote>
+ <quote>
+ <id>MGA</id><symbol>MGA</symbol><description>Malagasy Ariary (MGA)</description>
+ </quote>
+ <quote>
+ <id>MKD</id><symbol>MKD</symbol><description>Macedonian Denar (MKD)</description>
+ </quote>
+ <quote>
+ <id>MNT</id><symbol>MNT</symbol><description>Mongolian Tugrik (MNT)</description>
+ </quote>
+ <quote>
+ <id>MOP</id><symbol>MOP</symbol><description>Macanese Pataca (MOP)</description>
+ </quote>
+ <quote>
+ <id>MRO</id><symbol>MRO</symbol><description>Mauritanian Ouguiya (MRO)</description>
+ </quote>
+ <quote>
+ <id>MUR</id><symbol>MUR</symbol><description>Mauritian Rupee (MUR)</description>
+ </quote>
+ <quote>
+ <id>MVR</id><symbol>MVR</symbol><description>Maldivian Rufiyaa (MVR)</description>
+ </quote>
+ <quote>
+ <id>MWK</id><symbol>MWK</symbol><description>Malawian Kwacha (MWK)</description>
+ </quote>
+ <quote>
+ <id>MXN</id><symbol>MXN</symbol><description>Mexican Peso (MXN)</description>
+ </quote>
+ <quote>
+ <id>MYR</id><symbol>MYR</symbol><description>Malaysian Ringgit (MYR)</description>
+ </quote>
+ <quote>
+ <id>MZN</id><symbol>MZN</symbol><description>Mozambican Metical (MZN)</description>
+ </quote>
+ <quote>
+ <id>NAD</id><symbol>NAD</symbol><description>Namibian Dollar (NAD)</description>
+ </quote>
+ <quote>
+ <id>NGN</id><symbol>NGN</symbol><description>Nigerian Naira (NGN)</description>
+ </quote>
+ <quote>
+ <id>NIO</id><symbol>NIO</symbol><description>Nicaraguan Córdoba (NIO)</description>
+ </quote>
+ <quote>
+ <id>NOK</id><symbol>NOK</symbol><description>Norwegian Krone (NOK)</description>
+ </quote>
+ <quote>
+ <id>NPR</id><symbol>NPR</symbol><description>Nepalese Rupee (NPR)</description>
+ </quote>
+ <quote>
+ <id>NZD</id><symbol>NZD</symbol><description>New Zealand Dollar (NZD)</description>
+ </quote>
+ <quote>
+ <id>OMR</id><symbol>OMR</symbol><description>Omani Rial (OMR)</description>
+ </quote>
+ <quote>
+ <id>PAB</id><symbol>PAB</symbol><description>Panamanian Balboa (PAB)</description>
+ </quote>
+ <quote>
+ <id>PEN</id><symbol>PEN</symbol><description>Peruvian Nuevo Sol (PEN)</description>
+ </quote>
+ <quote>
+ <id>PGK</id><symbol>PGK</symbol><description>Papua New Guinean Kina (PGK)</description>
+ </quote>
+ <quote>
+ <id>PHP</id><symbol>PHP</symbol><description>Philippine Peso (PHP)</description>
+ </quote>
+ <quote>
+ <id>PKG</id><symbol>PKG</symbol><description>PKG (PKG)</description>
+ </quote>
+ <quote>
+ <id>PKR</id><symbol>PKR</symbol><description>Pakistani Rupee (PKR)</description>
+ </quote>
+ <quote>
+ <id>PLN</id><symbol>PLN</symbol><description>Polish Zloty (PLN)</description>
+ </quote>
+ <quote>
+ <id>PYG</id><symbol>PYG</symbol><description>Paraguayan Guarani (PYG)</description>
+ </quote>
+ <quote>
+ <id>QAR</id><symbol>QAR</symbol><description>Qatari Riyal (QAR)</description>
+ </quote>
+ <quote>
+ <id>RON</id><symbol>RON</symbol><description>New Romanian Leu (RON)</description>
+ </quote>
+ <quote>
+ <id>RSD</id><symbol>RSD</symbol><description>Serbian Dinar (RSD)</description>
+ </quote>
<quote>
<id>RUB</id><symbol>RUB</symbol><description>Russian Ruble (RUB)</description>
</quote>
<quote>
+ <id>RWF</id><symbol>RWF</symbol><description>Rwandan Franc (RWF)</description>
+ </quote>
+ <quote>
<id>SAR</id><symbol>SAR</symbol><description>Saudi Riyal (SAR)</description>
</quote>
- <quote><id>SEK</id><symbol>SEK</symbol><description>Swedish Krona (SEK)</description></quote><quote><id>SGD</id><symbol>SGD</symbol><description>Singapore Dollar (SGD)</description></quote><quote><id>SIT</id><symbol>SIT</symbol><description>Slovenian Tolar (SIT)</description></quote><quote><id>SKK</id><symbol>SKK</symbol><description>Slovak Koruna (SKK)</description></quote><quote><id>THB</id><symbol>THB</symbol><description>Thai Baht (THB)</description></quote><quote><id>TRY</id><symbol>TRY</symbol><description>New Turkish Lira (TRY)</description></quote><quote><id>TTD</id><symbol>TTD</symbol><description>Trinidad and Tobago Dollar (TTD)</description></quote><quote><id>TWD</id><symbol>TWD</symbol><description>New Taiwan Dollar (TWD)</description></quote><quote><id>UAH</id><symbol>UAH</symbol><description>Ukrainian Hryvnia (UAH)</description></quote><quote><id>USD</id><symbol>USD</symbol><description>United States Dollar (USD)</description></quote><quote><id>VEB</id><symbol>VEB</symbol><description>Venezuelan Bolívar (VEB)</description></quote><quote><id>ZAR</id><symbol>ZAR</symbol><description>South African Rand (ZAR)</description></quote>
+ <quote>
+ <id>SBD</id><symbol>SBD</symbol><description>Solomon Islands Dollar (SBD)</description>
+ </quote>
+ <quote>
+ <id>SCR</id><symbol>SCR</symbol><description>Seychellois Rupee (SCR)</description>
+ </quote>
+ <quote>
+ <id>SDG</id><symbol>SDG</symbol><description>Sudanese Pound (SDG)</description>
+ </quote>
+ <quote>
+ <id>SEK</id><symbol>SEK</symbol><description>Swedish Krona (SEK)</description>
+ </quote>
+ <quote>
+ <id>SGD</id><symbol>SGD</symbol><description>Singapore Dollar (SGD)</description>
+ </quote>
+ <quote>
+ <id>SHP</id><symbol>SHP</symbol><description>St. Helena Pound (SHP)</description>
+ </quote>
+ <quote>
+ <id>SKK</id><symbol>SKK</symbol><description>Slovak Koruna (SKK)</description>
+ </quote>
+ <quote>
+ <id>SLL</id><symbol>SLL</symbol><description>Sierra Leonean Leone (SLL)</description>
+ </quote>
+ <quote>
+ <id>SOS</id><symbol>SOS</symbol><description>Somali Shilling (SOS)</description>
+ </quote>
+ <quote>
+ <id>SRD</id><symbol>SRD</symbol><description>Surinamese Dollar (SRD)</description>
+ </quote>
+ <quote>
+ <id>STD</id><symbol>STD</symbol><description>São Tomé & Príncipe Dobra (STD)</description>
+ </quote>
+ <quote>
+ <id>SVC</id><symbol>SVC</symbol><description>Salvadoran Colón (SVC)</description>
+ </quote>
+ <quote>
+ <id>SYP</id><symbol>SYP</symbol><description>Syrian Pound (SYP)</description>
+ </quote>
+ <quote>
+ <id>SZL</id><symbol>SZL</symbol><description>Swazi Lilangeni (SZL)</description>
+ </quote>
+ <quote>
+ <id>THB</id><symbol>THB</symbol><description>Thai Baht (THB)</description>
+ </quote>
+ <quote>
+ <id>TJS</id><symbol>TJS</symbol><description>Tajikistani Somoni (TJS)</description>
+ </quote>
+ <quote>
+ <id>TMT</id><symbol>TMT</symbol><description>Turkmenistani Manat (TMT)</description>
+ </quote>
+ <quote>
+ <id>TND</id><symbol>TND</symbol><description>Tunisian Dinar (TND)</description>
+ </quote>
+ <quote>
+ <id>TOP</id><symbol>TOP</symbol><description>Tongan Paʻanga (TOP)</description>
+ </quote>
+ <quote>
+ <id>TRY</id><symbol>TRY</symbol><description>Turkish Lira (TRY)</description>
+ </quote>
+ <quote>
+ <id>TTD</id><symbol>TTD</symbol><description>Trinidad & Tobago Dollar (TTD)</description>
+ </quote>
+ <quote>
+ <id>TWD</id><symbol>TWD</symbol><description>New Taiwan Dollar (TWD)</description>
+ </quote>
+ <quote>
+ <id>TZS</id><symbol>TZS</symbol><description>Tanzanian Shilling (TZS)</description>
+ </quote>
+ <quote>
+ <id>UAH</id><symbol>UAH</symbol><description>Ukrainian Hryvnia (UAH)</description>
+ </quote>
+ <quote>
+ <id>UGX</id><symbol>UGX</symbol><description>Ugandan Shilling (UGX)</description>
+ </quote>
+ <quote>
+ <id>USD</id><symbol>USD</symbol><description>United States Dollar (USD)</description>
+ </quote>
+ <quote>
+ <id>UYU</id><symbol>UYU</symbol><description>Uruguayan Peso (UYU)</description>
+ </quote>
+ <quote>
+ <id>UZS</id><symbol>UZS</symbol><description>Uzbekistani Som (UZS)</description>
+ </quote>
+ <quote>
+ <id>VEF</id><symbol>VEF</symbol><description>Venezuelan Bolívar (VEF)</description>
+ </quote>
<quote>
<id>VND</id><symbol>VND</symbol><description>Vietnamese Dong (VND)</description>
</quote>
+ <quote>
+ <id>VUV</id><symbol>VUV</symbol><description>Vanuatu Vatu (VUV)</description>
+ </quote>
+ <quote>
+ <id>WST</id><symbol>WST</symbol><description>Samoan Tala (WST)</description>
+ </quote>
+ <quote>
+ <id>XAF</id><symbol>XAF</symbol><description>Central African CFA Franc (FCFA)</description>
+ </quote>
+ <quote>
+ <id>XCD</id><symbol>XCD</symbol><description>East Caribbean Dollar (XCD)</description>
+ </quote>
+ <quote>
+ <id>XDR</id><symbol>XDR</symbol><description>Special Drawing Rights (XDR)</description>
+ </quote>
+ <quote>
+ <id>XOF</id><symbol>XOF</symbol><description>West African CFA Franc (CFA)</description>
+ </quote>
+ <quote>
+ <id>XPF</id><symbol>XPF</symbol><description>CFP Franc (CFPF)</description>
+ </quote>
+ <quote>
+ <id>YER</id><symbol>YER</symbol><description>Yemeni Rial (YER)</description>
+ </quote>
+ <quote>
+ <id>ZAR</id><symbol>ZAR</symbol><description>South African Rand (ZAR)</description>
+ </quote>
+ <quote>
+ <id>ZMK</id><symbol>ZMK</symbol><description>Zambian Kwacha (1968–2012) (ZMK)</description>
+ </quote>
+ <quote>
+ <id>ZMW</id><symbol>ZMW</symbol><description>Zambian Kwacha (ZMW)</description>
+ </quote>
+ <quote>
+ <id>ZWL</id><symbol>ZWL</symbol><description>Zimbabwean Dollar (2009) (ZWL)</description>
+ </quote>
</section>
</Provider>
\ No newline at end of file diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index 0a56404ca4..c8eb6d0a04 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -32,7 +32,6 @@ PLUGININFOEX Global_pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp index b2c15faa0d..6836c11520 100644 --- a/plugins/Quotes/src/ImportExport.cpp +++ b/plugins/Quotes/src/ImportExport.cpp @@ -331,7 +331,7 @@ bool handle_module(MCONTACT hContact, const IXMLNode::TXMLNodePtr& pXmlModule) mir_free(dbs.value.pwszVal);
}
else if (0 == mir_wstrcmpi(g_pszXmlTypeBlob, sType.c_str())) {
- unsigned bufLen;
+ size_t bufLen;
mir_ptr<BYTE> buf((PBYTE)mir_base64_decode(_T2A(sValue.c_str()), &bufLen));
if (buf) {
dbs.value.pbVal = buf;
diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp index d63ac57a46..f52be5a6c0 100644 --- a/plugins/Quotes/src/QuotesProviderGoogle.cpp +++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp @@ -398,7 +398,7 @@ double CQuotesProviderGoogle::Convert(double dAmount, const CQuote& from, const if ((true == parse_responce(sHTML, dResult)))
return dResult;
- throw std::runtime_error(Translate("Error occurred during html parsing."));
+ throw std::runtime_error(Translate("Error occurred during HTML parsing."));
}
else throw std::runtime_error(Translate("Error occurred during site access."));
}
diff --git a/plugins/Quotes/src/version.h b/plugins/Quotes/src/version.h index 07e7119cf4..b153c00a64 100644 --- a/plugins/Quotes/src/version.h +++ b/plugins/Quotes/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Quotes.dll"
#define __DESCRIPTION "Shows currency rates and economic quotes."
#define __AUTHOR "Dioksin"
-#define __AUTHOREMAIL "dioksin@ua.fm"
#define __AUTHORWEB "https://miranda-ng.org/p/Quotes/"
#define __COPYRIGHT ""
diff --git a/plugins/Rate/src/main.cpp b/plugins/Rate/src/main.cpp index aa15bbe0d4..1f411a7bde 100644 --- a/plugins/Rate/src/main.cpp +++ b/plugins/Rate/src/main.cpp @@ -47,7 +47,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Rate/src/version.h b/plugins/Rate/src/version.h index ccfe060611..adf40d6fa9 100644 --- a/plugins/Rate/src/version.h +++ b/plugins/Rate/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Rate.dll" #define __DESCRIPTION "Shows rating of contact in contact list (if present)." #define __AUTHOR "Kildor, Thief" -#define __AUTHOREMAIL "kostia@ngs.ru" #define __AUTHORWEB "https://miranda-ng.org/p/Rate/" #define __COPYRIGHT "© 2006-2009 Kostia Romanov, based on AuthState by Alexander Turyak" diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 0ed7142472..599a166dd8 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -37,7 +37,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/RecentContacts/src/version.h b/plugins/RecentContacts/src/version.h index 5f5c0b84fc..4036d2ec22 100644 --- a/plugins/RecentContacts/src/version.h +++ b/plugins/RecentContacts/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "RecentContacts.dll" #define __DESCRIPTION "Adds a menu item in main menu, which open the window with list of last used contacts names, sorted in order from most recent to least." #define __AUTHOR "ValeraVi, Kildor" -#define __AUTHOREMAIL "kostia@ngs.ru" #define __AUTHORWEB "https://miranda-ng.org/p/RecentContacts/" #define __COPYRIGHT "© 2005 ValeraVi, 2009 Kildor" diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index ea49a01dab..d355fcf927 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -41,7 +41,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/RemovePersonalSettings/src/version.h b/plugins/RemovePersonalSettings/src/version.h index 57e04b8703..6c2088274f 100644 --- a/plugins/RemovePersonalSettings/src/version.h +++ b/plugins/RemovePersonalSettings/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "RemovePersonalSettings.dll"
#define __DESCRIPTION "Remove personal settings to allow you to send a profile to other user(s) without sending personal data."
#define __AUTHOR "Ricardo Pescuma Domenecci"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/RemovePersonalSettings/"
#define __COPYRIGHT "© 2007-2009 Ricardo Pescuma Domenecci"
diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp index 7f2ad366ac..08cb470b64 100644 --- a/plugins/Restart/src/restart.cpp +++ b/plugins/Restart/src/restart.cpp @@ -10,7 +10,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Restart/src/version.h b/plugins/Restart/src/version.h index bd550e6dc5..7439329690 100644 --- a/plugins/Restart/src/version.h +++ b/plugins/Restart/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Restart.dll" #define __DESCRIPTION "Adds Restart menu item." #define __AUTHOR "eugene.nv" -#define __AUTHOREMAIL "ep@eugn.me" #define __AUTHORWEB "https://miranda-ng.org/p/Restart/" #define __COPYRIGHT "© 2008-13 eugene.nv" diff --git a/plugins/SMS/src/main.cpp b/plugins/SMS/src/main.cpp index c62edf3376..b8962e9fb6 100644 --- a/plugins/SMS/src/main.cpp +++ b/plugins/SMS/src/main.cpp @@ -39,7 +39,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/SMS/src/version.h b/plugins/SMS/src/version.h index b923ad70ca..e7bb0efc2c 100644 --- a/plugins/SMS/src/version.h +++ b/plugins/SMS/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SMS.dll" #define __DESCRIPTION "Send SMS text messages to mobile phones through the IM networks." #define __AUTHOR "Richard Hughes, Improved by Ariel Shulman, rewritten by Rozhuk Ivan" -#define __AUTHOREMAIL "Rozhuk_I@mail.ru" #define __AUTHORWEB "https://miranda-ng.org/p/SMS/" #define __COPYRIGHT "© 2001-02 Richard Hughes, 2003 Ariel Shulman, 2007-09 Rozhuk Ivan (Rozhuk_I@mail.ru)" diff --git a/plugins/Scriver/src/cmdlist.h b/plugins/Scriver/src/cmdlist.h index 9f2b89bb91..5495f5f103 100644 --- a/plugins/Scriver/src/cmdlist.h +++ b/plugins/Scriver/src/cmdlist.h @@ -1,6 +1,4 @@ /*
-AOL Instant Messenger Plugin for Miranda IM
-
Copyright (c) 2003 Robert Rainwater
This program is free software; you can redistribute it and/or
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 162b22b7de..b85b0f413e 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -540,10 +540,7 @@ void CSrmmWindow::onClick_Quote(CCtrlButton*) void CSrmmWindow::onClick_Add(CCtrlButton*)
{
- ADDCONTACTSTRUCT acs = {};
- acs.hContact = m_hContact;
- acs.handleType = HANDLE_CONTACT;
- CallService(MS_ADDCONTACT_SHOW, (WPARAM)m_hwnd, (LPARAM)&acs);
+ Contact_Add(m_hContact, m_hwnd);
if (!db_get_b(m_hContact, "CList", "NotOnList", 0))
ShowWindow(GetDlgItem(m_hwnd, IDC_ADD), SW_HIDE);
diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp index d3fdd9ed67..6b47a73fa7 100644 --- a/plugins/Scriver/src/srmm.cpp +++ b/plugins/Scriver/src/srmm.cpp @@ -38,7 +38,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h index 422d4fb8ae..2076df25a0 100644 --- a/plugins/Scriver/src/stdafx.h +++ b/plugins/Scriver/src/stdafx.h @@ -50,7 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_contacts.h>
#include <m_userinfo.h>
#include <m_history.h>
-#include <m_addcontact.h>
#include <m_message.h>
#include <m_file.h>
#include <m_fontservice.h>
diff --git a/plugins/Scriver/src/version.h b/plugins/Scriver/src/version.h index 7cd1c93cd9..0215a882eb 100644 --- a/plugins/Scriver/src/version.h +++ b/plugins/Scriver/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Scriver.dll" #define __DESCRIPTION "Scriver - send and receive instant messages." #define __AUTHOR "Miranda NG Development Team" -#define __AUTHOREMAIL "the_leech@users.berlios.de" #define __AUTHORWEB "https://miranda-ng.org/p/Scriver/" #define __COPYRIGHT "© 2000-2012 Miranda IM Project, 2012-17 Miranda NG project" diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index a56200fff4..d062711c6f 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -9,7 +9,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/SecureIM/src/version.h b/plugins/SecureIM/src/version.h index f23117aab2..5911977447 100644 --- a/plugins/SecureIM/src/version.h +++ b/plugins/SecureIM/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SecureIM.dll"
#define __DESCRIPTION "SecureIM plugin for Miranda NG."
#define __AUTHOR "Johell, Ghost, Nightwish, __alex, Baloo"
-#define __AUTHOREMAIL "Johell@ifrance.com, baloo@bk.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/SecureIM/"
#define __COPYRIGHT "© 2003 Johell, 2005-09 Baloo"
diff --git a/plugins/SeenPlugin/src/main.cpp b/plugins/SeenPlugin/src/main.cpp index 172897d4ef..b52d98e957 100644 --- a/plugins/SeenPlugin/src/main.cpp +++ b/plugins/SeenPlugin/src/main.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/SeenPlugin/src/version.h b/plugins/SeenPlugin/src/version.h index a71af62bab..2658d14b39 100644 --- a/plugins/SeenPlugin/src/version.h +++ b/plugins/SeenPlugin/src/version.h @@ -30,6 +30,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __FILENAME "SeenPlugin.dll"
#define __DESCRIPTION "Logs when a user was last seen online and which users were online while you were away."
#define __AUTHOR "Heiko Schillinger, YB"
-#define __AUTHOREMAIL "y_b@saaplugin.no-ip.info"
#define __AUTHORWEB "https://miranda-ng.org/p/SeenPlugin/"
#define __COPYRIGHT "© 2001-2002 Heiko Schillinger, 2003 modified by Bruno Rino, 2005-07 modified by YB"
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 309dbbc5b5..6ad6c12c97 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -220,7 +220,7 @@ static const PLUGININFOEX pluginInfo = { __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, - __AUTHOR, __AUTHOREMAIL, + __AUTHOR, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/SendScreenshotPlus/src/version.h b/plugins/SendScreenshotPlus/src/version.h index 10f0ebe1be..85869bc7e5 100644 --- a/plugins/SendScreenshotPlus/src/version.h +++ b/plugins/SendScreenshotPlus/src/version.h @@ -9,7 +9,6 @@ #define __FILENAME "SendSS.dll" #define __DESCRIPTION "Take a screenshot and send it to a contact." #define __AUTHOR "Merlin" -#define __AUTHOREMAIL "ing.u.horn@googlemail.com" #define __AUTHORWEB "https://miranda-ng.org/p/SendSS/" #define __COPYRIGHT "© 2010 Merlin, 2004-2006 Sergio Vieira Rolanski" #define __USER_AGENT_STRING "SendSS/" __VERSION_STRING_DOTS diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 6a365b73dc..303fcf3fd5 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -57,7 +57,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Sessions/Src/version.h b/plugins/Sessions/Src/version.h index 580a5abde1..6900e6a108 100644 --- a/plugins/Sessions/Src/version.h +++ b/plugins/Sessions/Src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Sessions.dll" #define __DESCRIPTION "Sessions Manager for Miranda NG." #define __AUTHOR "MaD_CLuSTeR" -#define __AUTHOREMAIL "daniok@yandex.ru" #define __AUTHORWEB "https://miranda-ng.org/p/Sessions/" #define __COPYRIGHT "© 2007-2008 Danil Mozhar" diff --git a/plugins/ShellExt/src/main.cpp b/plugins/ShellExt/src/main.cpp index c356ef7b94..266c80287e 100644 --- a/plugins/ShellExt/src/main.cpp +++ b/plugins/ShellExt/src/main.cpp @@ -14,7 +14,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ShellExt/src/version.h b/plugins/ShellExt/src/version.h index 35500637c1..6856245420 100644 --- a/plugins/ShellExt/src/version.h +++ b/plugins/ShellExt/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "ShlExt.dll" #define __DESCRIPTION "Windows Explorer extension for Miranda NG." #define __AUTHOR "Sam Kothari, Miranda NG Team" -#define __AUTHOREMAIL "egodust@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/ShellExt/" #define __COPYRIGHT "© 2009 Sam Kothari (egoDust)" diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index 8feceb95bf..0ffc1ffefc 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -39,7 +39,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/SimpleAR/src/version.h b/plugins/SimpleAR/src/version.h index ca9699cb5b..64af845a5f 100644 --- a/plugins/SimpleAR/src/version.h +++ b/plugins/SimpleAR/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SimpleAR.dll" #define __DESCRIPTION "Simple Auto Replier." #define __AUTHOR "Stark Wong, Mataes, Mikel-Ard-Ri" -#define __AUTHOREMAIL "mikelardri@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/SimpleAR/" #define __COPYRIGHT "© 2012" diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index fae0b03fcd..dafe0449b2 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -39,7 +39,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
@@ -204,9 +203,8 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int) }
else if (!wcsnicmp(msg + i, L"%time%", 6))
{
- MIRANDA_IDLE_INFO mii = {0};
- mii.cbSize = sizeof(mii);
- CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii);
+ MIRANDA_IDLE_INFO mii;
+ Idle_GetInfo(mii);
if (mii.idleType)
{
@@ -1268,9 +1266,8 @@ VOID CALLBACK SetStartupStatusProc(HWND hwnd, UINT, UINT_PTR idEvent, DWORD) VOID CALLBACK UpdateMsgTimerProc(HWND, UINT, UINT_PTR, DWORD)
{
- MIRANDA_IDLE_INFO mii = {0};
- mii.cbSize = sizeof(mii);
- CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii);
+ MIRANDA_IDLE_INFO mii;
+ Idle_GetInfo(mii);
if (db_get_b(NULL, "SimpleStatusMsg", "NoUpdateOnIdle", 1) && mii.idleType)
return;
@@ -1436,9 +1433,9 @@ static int OnIdleChanged(WPARAM, LPARAM lParam) if (!(lParam & IDF_ISIDLE))
g_iIdleTime = -1;
- MIRANDA_IDLE_INFO mii = {0};
- mii.cbSize = sizeof(mii);
- CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii);
+ MIRANDA_IDLE_INFO mii;
+ Idle_GetInfo(mii);
+
if (mii.aaStatus == 0)
{
#ifdef _DEBUG
diff --git a/plugins/SimpleStatusMsg/src/version.h b/plugins/SimpleStatusMsg/src/version.h index 153618cc56..2b0c1c8398 100644 --- a/plugins/SimpleStatusMsg/src/version.h +++ b/plugins/SimpleStatusMsg/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SimpleStatusMsg.dll" #define __DESCRIPTION "Provides a simple way to set status and away messages." #define __AUTHOR "Bartosz 'Dezeath' Białek, Harven" -#define __AUTHOREMAIL "dezred@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/SimpleStatusMsg/" #define __COPYRIGHT "© 2006-2011 Bartosz Białek, 2005 Harven" diff --git a/plugins/SkypeStatusChange/src/main.cpp b/plugins/SkypeStatusChange/src/main.cpp index c6a233ed39..a5c6fe37e1 100644 --- a/plugins/SkypeStatusChange/src/main.cpp +++ b/plugins/SkypeStatusChange/src/main.cpp @@ -15,7 +15,6 @@ PLUGININFOEX g_pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE, //not transient
diff --git a/plugins/SkypeStatusChange/src/version.h b/plugins/SkypeStatusChange/src/version.h index d0873aacd9..bae6b5221a 100644 --- a/plugins/SkypeStatusChange/src/version.h +++ b/plugins/SkypeStatusChange/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SkypeStatusChange.dll" #define __DESCRIPTION "Skype status change according to Miranda status." #define __AUTHOR "Dioksin" -#define __AUTHOREMAIL "dioksin@ua.fm" #define __AUTHORWEB "https://miranda-ng.org/p/SkypeStatusChange/" #define __COPYRIGHT "© 2009-2010 Dioksin" diff --git a/plugins/SmileyAdd/smileys/nova/AIM.msl b/plugins/SmileyAdd/smileys/nova/AIM.msl Binary files differdeleted file mode 100644 index f19834ee24..0000000000 --- a/plugins/SmileyAdd/smileys/nova/AIM.msl +++ /dev/null diff --git a/plugins/SmileyAdd/src/customsmiley.cpp b/plugins/SmileyAdd/src/customsmiley.cpp index aa631e3b2e..72690198d3 100644 --- a/plugins/SmileyAdd/src/customsmiley.cpp +++ b/plugins/SmileyAdd/src/customsmiley.cpp @@ -72,7 +72,7 @@ bool SmileyCType::CreateTriggerText(char *text) int len = (int)mir_strlen(text);
if (len == 0) return false;
- unsigned reslen;
+ size_t reslen;
ptrA res((char*)mir_base64_decode(text, &reslen));
if (res == NULL)
return false;
diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index 81c3c9bb19..3a6cfee311 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -35,7 +35,6 @@ static const PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/SmileyAdd/src/version.h b/plugins/SmileyAdd/src/version.h index 8d5a256e61..f820339434 100644 --- a/plugins/SmileyAdd/src/version.h +++ b/plugins/SmileyAdd/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SmileyAdd.dll"
#define __DESCRIPTION "Smiley support for Miranda NG."
#define __AUTHOR "Peacow, nightwish, bid, borkra"
-#define __AUTHOREMAIL "borkra@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/SmileyAdd/"
#define __COPYRIGHT "© 2012-17 Miranda NG Team, 2004-12 Boris Krasnovskiy, portions by Rein-Peter de Boer"
diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp index f9462b77e6..9464ca0a32 100644 --- a/plugins/Spamotron/src/spamotron.cpp +++ b/plugins/Spamotron/src/spamotron.cpp @@ -12,7 +12,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Spamotron/src/version.h b/plugins/Spamotron/src/version.h index 55823a9f3b..2b68799605 100644 --- a/plugins/Spamotron/src/version.h +++ b/plugins/Spamotron/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Spamotron.dll" #define __DESCRIPTION "Anti-spam plugin with captcha and Bayes filtering." #define __AUTHOR "vu1tur" -#define __AUTHOREMAIL "to@vu1tur.eu.org" #define __AUTHORWEB "https://miranda-ng.org/p/Spamotron/" #define __COPYRIGHT "© 2010 vu1tur" diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp index 935749e4ac..0640f6f10b 100644 --- a/plugins/SpellChecker/src/spellchecker.cpp +++ b/plugins/SpellChecker/src/spellchecker.cpp @@ -27,7 +27,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/SpellChecker/src/version.h b/plugins/SpellChecker/src/version.h index 3562484366..3aa2f41b06 100644 --- a/plugins/SpellChecker/src/version.h +++ b/plugins/SpellChecker/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SpellChecker.dll" #define __DESCRIPTION "Spell checker for the message windows. Uses Hunspell to do the checking." #define __AUTHOR "Ricardo Pescuma Domenecci, Wishmaster" -#define __AUTHOREMAIL "pescuma@miranda-im.org" #define __AUTHORWEB "https://miranda-ng.org/p/SpellChecker/" #define __COPYRIGHT "© 2006-2010 Ricardo Pescuma Domenecci" diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 3b453000be..0c8b476dc5 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -46,7 +46,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/SplashScreen/src/version.h b/plugins/SplashScreen/src/version.h index 91b22115a2..300f9a086d 100644 --- a/plugins/SplashScreen/src/version.h +++ b/plugins/SplashScreen/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "SplashScreen.dll"
#define __DESCRIPTION "Shows a splash at Miranda startup."
#define __AUTHOR "nullbie, Thief"
-#define __AUTHOREMAIL "thief@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/SplashScreen/"
#define __COPYRIGHT "© 2004-2007 Victor Pavlychko, 2005-2011 Alexander Turyak"
diff --git a/plugins/StartPosition/src/main.cpp b/plugins/StartPosition/src/main.cpp index 1302faac10..14bf4b1941 100644 --- a/plugins/StartPosition/src/main.cpp +++ b/plugins/StartPosition/src/main.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/StartPosition/src/version.h b/plugins/StartPosition/src/version.h index 807d53434f..8847da8096 100644 --- a/plugins/StartPosition/src/version.h +++ b/plugins/StartPosition/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "StartPosition.dll" #define __DESCRIPTION "Plugin supports starting position of Contact List relative to the taskbar and screen side." #define __AUTHOR "Felipe Brahm - souFrag" -#define __AUTHOREMAIL "felipebrahm@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/StartPosition/" #define __COPYRIGHT "© 2005-2008 Felipe Brahm - souFrag, © 2012-17 Miranda NG project" diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 11f0153843..74d3f383c9 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -68,7 +68,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESC,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/StartupSilence/src/version.h b/plugins/StartupSilence/src/version.h index 88c7193a98..05ef107b88 100644 --- a/plugins/StartupSilence/src/version.h +++ b/plugins/StartupSilence/src/version.h @@ -15,7 +15,6 @@ #define __FILENAME "StartupSilence.dll"
#define __DESC "Suppresses popups and mutes sounds for 10-300 sec at Miranda NG startup, then sets them back to predefined state (Automatically per computer settings)."
#define __AUTHOR "Vladimir Lyubimov"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/"
#define __COPYRIGHT "© 2012-17 Vladimir Lyubimov"
diff --git a/plugins/StatusChange/src/main.cpp b/plugins/StatusChange/src/main.cpp index fc34c136b3..75f30ff4b5 100644 --- a/plugins/StatusChange/src/main.cpp +++ b/plugins/StatusChange/src/main.cpp @@ -13,7 +13,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/StatusChange/src/version.h b/plugins/StatusChange/src/version.h index f03a2bf1e5..510cb9b538 100644 --- a/plugins/StatusChange/src/version.h +++ b/plugins/StatusChange/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "StatusChange.dll" #define __DESCRIPTION "Change status when you send/receive an event." #define __AUTHOR "Angelo Luiz Tartari" -#define __AUTHOREMAIL "corsario-br@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/StatusChange/" #define __COPYRIGHT "© 2002 Angelo Luiz Tartari" diff --git a/plugins/StatusManager/src/StartupStatus/ss_options.cpp b/plugins/StatusManager/src/StartupStatus/ss_options.cpp index 1fdf8141bd..90bdc218aa 100644 --- a/plugins/StatusManager/src/StartupStatus/ss_options.cpp +++ b/plugins/StatusManager/src/StartupStatus/ss_options.cpp @@ -507,24 +507,6 @@ static int DeleteSetting(const char *szSetting, void *lParam) return 0; } -static int ClearDatabase(char* filter) -{ - LIST<char> arSettings(10); - db_enum_settings(0, DeleteSetting, SSMODULENAME, &arSettings); - - for (int i = 0; i < arSettings.getCount(); i++) { - if ((filter == nullptr) || (!strncmp(filter, arSettings[i], mir_strlen(filter)))) - db_unset(0, SSMODULENAME, arSettings[i]); - mir_free(arSettings[i]); - } - - if (filter == nullptr) - db_unset(0, "AutoAway", "Confirm"); - - return 0; -} - - INT_PTR CALLBACK addProfileDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { static HWND hwndParent; @@ -748,12 +730,20 @@ public: virtual void OnApply() override { - char setting[128]; int oldCount = db_get_w(0, SSMODULENAME, SETTING_PROFILECOUNT, 0); for (int i = 0; i < oldCount; i++) { - mir_snprintf(setting, "%d_", i); - ClearDatabase(setting); + LIST<char> arSettings(10); + db_enum_settings(0, DeleteSetting, SSMODULENAME, &arSettings); + + char setting[128]; + int len = mir_snprintf(setting, "%d_", i); + for (int k = 0; k < arSettings.getCount(); k++) { + if (!strncmp(setting, arSettings[k], len)) + db_unset(0, SSMODULENAME, arSettings[k]); + mir_free(arSettings[k]); + } } + for (int i = 0; i < arProfiles.getCount(); i++) { PROFILEOPTIONS& po = arProfiles[i]; db_set_b(0, SSMODULENAME, OptName(i, SETTING_SHOWCONFIRMDIALOG), po.showDialog); @@ -767,6 +757,7 @@ public: TSettingsList& ar = *po.ps; for (int j = 0; j < ar.getCount(); j++) { if (ar[j].m_szMsg != nullptr) { + char setting[128]; mir_snprintf(setting, "%s_%s", ar[j].m_szName, SETTING_PROFILE_STSMSG); db_set_ws(0, SSMODULENAME, OptName(i, setting), ar[j].m_szMsg); } @@ -820,6 +811,7 @@ public: if (idx != -1) { TSSSetting* ps = (TSSSetting*)lstAccount.GetItemData(idx); ps->m_status = lstStatus.GetItemData(lstStatus.GetCurSel()); + NotifyChange(); } SetStatusMsg(); } diff --git a/plugins/StatusManager/src/main.cpp b/plugins/StatusManager/src/main.cpp index 7e5b41fd5d..599e3d54ae 100644 --- a/plugins/StatusManager/src/main.cpp +++ b/plugins/StatusManager/src/main.cpp @@ -43,7 +43,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESC, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/StatusManager/src/version.h b/plugins/StatusManager/src/version.h index 0f0117171f..5cac1e4939 100644 --- a/plugins/StatusManager/src/version.h +++ b/plugins/StatusManager/src/version.h @@ -12,6 +12,5 @@ #define __FILENAME "StatusManager.dll" #define __DESC "A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol." #define __AUTHOR "P Boon" -#define __AUTHOREMAIL "unregistered@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/StatusManager/" #define __COPYRIGHT "© 2003-08 P. Boon, 2008-17 George Hazan" diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index 62e09e121f..4d18f3b559 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -64,7 +64,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
@@ -118,9 +117,8 @@ static int OnSystemModulesLoaded(WPARAM, LPARAM) if (ServiceExists(MS_VARS_FORMATSTRING))
gbVarsServiceExist = TRUE;
InitVars();
- void CleanThread();
if(gbDelAllTempory || gbDelExcluded)
- new boost::thread(&CleanThread);
+ mir_forkthread(&CleanThread);
// Folders plugin support
hStopSpamLogDirH = FoldersRegisterCustomPathT(LPGEN("StopSpam"), LPGEN("StopSpam Logs"), FOLDER_LOGS);
diff --git a/plugins/StopSpamMod/src/stdafx.h b/plugins/StopSpamMod/src/stdafx.h index c8479ab49b..d5551e8d10 100755 --- a/plugins/StopSpamMod/src/stdafx.h +++ b/plugins/StopSpamMod/src/stdafx.h @@ -19,7 +19,9 @@ using namespace std; #include <m_variables.h> #include <m_folders.h> -#include <boost\thread.hpp> +#include <string> +#include <sstream> + #include <boost\regex.hpp> #include <boost\algorithm\string.hpp> #include <boost\nondet_random.hpp> @@ -38,4 +40,6 @@ extern HANDLE hStopSpamLogDirH; int OnDbContactSettingChanged(WPARAM w, LPARAM l); int OnDbEventFilterAdd(WPARAM w, LPARAM l); int OnDbEventAdded(WPARAM hContact, LPARAM hDbEvent); -int OnOptInit(WPARAM w, LPARAM l);
\ No newline at end of file +int OnOptInit(WPARAM w, LPARAM l); + +void __cdecl CleanThread(void*);
\ No newline at end of file diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp index 7943dada3f..f6f586a5eb 100755 --- a/plugins/StopSpamMod/src/utilities.cpp +++ b/plugins/StopSpamMod/src/utilities.cpp @@ -81,8 +81,7 @@ void DeleteCListGroupsByName(wchar_t* szGroupName) int RemoveTmp(WPARAM, LPARAM)
{
- void CleanThread();
- CleanThread();
+ CleanThread(0);
return 0;
}
@@ -239,59 +238,68 @@ void LogSpamToFile(MCONTACT hContact, wstring message) file.close();
}
-boost::mutex clean_mutex;
+mir_cs clean_mutex;
-void CleanProtocolTmpThread(std::string proto)
+void __cdecl CleanProtocolTmpThread(void *param)
{
+ const char *szProto = (const char*)param;
+
while (true) {
- UINT status = CallProtoService(proto.c_str(), PS_GETSTATUS, 0, 0);
+ UINT status = CallProtoService(szProto, PS_GETSTATUS, 0, 0);
if (status > ID_STATUS_OFFLINE)
break;
- boost::this_thread::sleep(boost::posix_time::seconds(2));
+ Sleep(2000);
}
std::list<MCONTACT> contacts;
- for (MCONTACT hContact = db_find_first(proto.c_str()); hContact; hContact = db_find_next(hContact, proto.c_str()))
+ for (MCONTACT hContact = db_find_first(szProto); hContact; hContact = db_find_next(hContact, szProto))
if (db_get_b(hContact, "CList", "NotOnList", 0) || (L"Not In List" == DBGetContactSettingStringPAN(hContact, "CList", "Group", L"")))
contacts.push_back(hContact);
- boost::this_thread::sleep(boost::posix_time::seconds(5));
- clean_mutex.lock();
- std::list<MCONTACT>::iterator end = contacts.end();
- for (std::list<MCONTACT>::iterator i = contacts.begin(); i != end; ++i) {
- LogSpamToFile(*i, L"Deleted");
- HistoryLogFunc(*i, "Deleted");
- db_delete_contact(*i);
+ Sleep(5000);
+ {
+ mir_cslock lck(clean_mutex);
+
+ std::list<MCONTACT>::iterator end = contacts.end();
+ for (std::list<MCONTACT>::iterator i = contacts.begin(); i != end; ++i) {
+ LogSpamToFile(*i, L"Deleted");
+ HistoryLogFunc(*i, "Deleted");
+ db_delete_contact(*i);
+ }
}
- clean_mutex.unlock();
+ mir_free(param);
}
-void CleanProtocolExclThread(std::string proto)
+void __cdecl CleanProtocolExclThread(void *param)
{
+ const char *szProto = (const char*)param;
+
while (true) {
- UINT status = CallProtoService(proto.c_str(), PS_GETSTATUS, 0, 0);
+ UINT status = CallProtoService(szProto, PS_GETSTATUS, 0, 0);
if (status > ID_STATUS_OFFLINE)
break;
- boost::this_thread::sleep(boost::posix_time::seconds(2));
+ Sleep(2000);
}
std::list<MCONTACT> contacts;
- for (MCONTACT hContact = db_find_first(proto.c_str()); hContact; hContact = db_find_next(hContact, proto.c_str()))
+ for (MCONTACT hContact = db_find_first(szProto); hContact; hContact = db_find_next(hContact, szProto))
if (db_get_b(hContact, "CList", "NotOnList", 0) && db_get_b(hContact, pluginName, "Excluded", 0))
contacts.push_back(hContact);
- boost::this_thread::sleep(boost::posix_time::seconds(5));
- clean_mutex.lock();
- std::list<MCONTACT>::iterator end = contacts.end();
- for (std::list<MCONTACT>::iterator i = contacts.begin(); i != end; ++i) {
- LogSpamToFile(*i, L"Deleted");
- HistoryLogFunc(*i, "Deleted");
- db_delete_contact(*i);
+ Sleep(5000);
+ {
+ mir_cslock lck(clean_mutex);
+ std::list<MCONTACT>::iterator end = contacts.end();
+ for (std::list<MCONTACT>::iterator i = contacts.begin(); i != end; ++i) {
+ LogSpamToFile(*i, L"Deleted");
+ HistoryLogFunc(*i, "Deleted");
+ db_delete_contact(*i);
+ }
}
- clean_mutex.unlock();
+ mir_free(param);
}
-void CleanThread()
+void __cdecl CleanThread(void*)
{
std::list<std::string> protocols;
int count = 0;
@@ -304,9 +312,9 @@ void CleanThread() std::list<std::string>::iterator end = protocols.end();
for (std::list<std::string>::iterator i = protocols.begin(); i != end; ++i) {
if (gbDelAllTempory)
- new boost::thread(boost::bind(&CleanProtocolTmpThread, *i));
+ mir_forkthread(CleanProtocolTmpThread, mir_strdup((*i).c_str()));
if (gbDelExcluded)
- new boost::thread(boost::bind(&CleanProtocolExclThread, *i));
+ mir_forkthread(CleanProtocolExclThread, mir_strdup((*i).c_str()));
}
}
diff --git a/plugins/StopSpamMod/src/version.h b/plugins/StopSpamMod/src/version.h index bce1b7655e..384b6d8607 100755 --- a/plugins/StopSpamMod/src/version.h +++ b/plugins/StopSpamMod/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "StopSpamMod.dll"
#define __DESCRIPTION "Anti-spam plugin for Miranda NG."
#define __AUTHOR "Roman Miklashevsky, sss, Elzor"
-#define __AUTHOREMAIL "sss123next@list.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/StopSpamMod/"
#define __COPYRIGHT "© 2004-2017 Roman Miklashevsky, A. Petkevich, Kosh&chka, sss, Elzor"
diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp index 342f446cbb..da64a57d50 100644 --- a/plugins/StopSpamPlus/src/options.cpp +++ b/plugins/StopSpamPlus/src/options.cpp @@ -4,13 +4,14 @@ const wchar_t pluginDescription[] = LPGENW("No more spam! Robots can't go! Only class COptMainDlg : public CPluginDlgBase
{
- CCtrlEdit edtCount;
+ CCtrlEdit edtCount, edtDescr;
CCtrlCheck chk1, chk2, chk3, chk4, chk5, chk6;
public:
COptMainDlg() :
CPluginDlgBase(hInst, IDD_MAIN, pluginName),
edtCount(this, ID_MAXQUESTCOUNT),
+ edtDescr(this, ID_DESCRIPTION),
chk1(this, ID_INFTALKPROT),
chk2(this, ID_ADDPERMANENT),
chk3(this, ID_HANDLEAUTHREQ),
@@ -27,6 +28,11 @@ public: CreateLink(chk5, g_sets.RemTmpAll);
CreateLink(chk6, g_sets.HistLog);
}
+
+ virtual void OnInitDialog() override
+ {
+ edtDescr.SetText(pluginDescription);
+ }
};
/////////////////////////////////////////////////////////////////////////////////////////
@@ -121,7 +127,7 @@ public: item.lParam = (LPARAM)p->szModuleName;
item.pszText = p->tszAccountName;
int idx = m_accounts.InsertItem(&item);
- m_accounts.SetCheckState(idx, !g_sets.ProtoDisabled(p->szModuleName));
+ m_accounts.SetCheckState(idx, g_sets.ProtoDisabled(p->szModuleName));
}
}
diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index ed9ba96a64..7352177744 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -11,7 +11,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/StopSpamPlus/src/version.h b/plugins/StopSpamPlus/src/version.h index 369ce2f5d8..3349b2f3d2 100644 --- a/plugins/StopSpamPlus/src/version.h +++ b/plugins/StopSpamPlus/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "StopSpam.dll"
#define __DESCRIPTION "Anti-spam plugin for Miranda NG."
#define __AUTHOR "Roman Miklashevsky, A. Petkevich, Kosh&chka, persei"
-#define __AUTHOREMAIL "koshechka@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/StopSpam/"
#define __COPYRIGHT "© 2004-2010 Roman Miklashevsky, A. Petkevich, Kosh&chka, persei"
diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc index 98daf77d20..35c5f8db20 100644 --- a/plugins/TabSRMM/res/chat.rc +++ b/plugins/TabSRMM/res/chat.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN
CONTROL "",IDC_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73
CONTROL "",IDC_SPLITTERY,"Static",SS_ENHMETAFILE,0,132,251,6
- CONTROL "",IDC_SRMM_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE
- CONTROL "",IDC_SRMM_LOG,"RichEdit50W",WS_VSCROLL | 0x844,8,23,164,72,WS_EX_STATICEDGE
+ CONTROL "",IDC_SRMM_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN,0,128,127,12,WS_EX_STATICEDGE
+ CONTROL "",IDC_SRMM_LOG,"RichEdit50W",WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_READONLY,8,23,164,72,WS_EX_STATICEDGE
LISTBOX IDC_SRMM_NICKLIST,182,23,69,73,LBS_MULTIPLESEL | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | LBS_NODATA | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
CONTROL "",IDC_PANELSPLITTER,"Static",SS_ENHMETAFILE,0,32,252,1,WS_EX_TRANSPARENT
END
diff --git a/plugins/TabSRMM/res/msgwindow.rc b/plugins/TabSRMM/res/msgwindow.rc index f934f22b30..6b76b6f1d3 100644 --- a/plugins/TabSRMM/res/msgwindow.rc +++ b/plugins/TabSRMM/res/msgwindow.rc @@ -36,10 +36,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_SPLITTERY,"Static",SS_ENHMETAFILE,0,46,187,1
- CONTROL "",IDC_SRMM_MESSAGE,"RichEdit50W",ES_MULTILINE |
- ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN |
- WS_VSCROLL | WS_TABSTOP,0,48,144,31,WS_EX_ACCEPTFILES |
- WS_EX_STATICEDGE
+ CONTROL "",IDC_SRMM_MESSAGE,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_TABSTOP,0,48,144,31,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE
CONTROL "",IDC_CONTACTPIC,"Button",BS_OWNERDRAW,155,48,34,31
CONTROL "",IDC_MULTISPLITTER,"Static",SS_ENHMETAFILE,186,0,2,30
CONTROL "&Retry",IDC_RETRY,"MButtonClass",WS_TABSTOP,26,10,55,12,0x18000000L
diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc index 7a0c7c38f0..3a3fe612e8 100644 --- a/plugins/TabSRMM/res/resource.rc +++ b/plugins/TabSRMM/res/resource.rc @@ -742,39 +742,11 @@ BEGIN MENUITEM "Don't play sounds", ID_TRAYCONTEXT_DON40223
MENUITEM "Be ""super quiet""", ID_TRAYCONTEXT_BE
END
- POPUP "Font"
- BEGIN
- MENUITEM "Default color", ID_FONT_DEFAULTCOLOR
- MENUITEM "Red", ID_FONT_RED
- MENUITEM "Green", ID_FONT_GREEN
- MENUITEM "Blue", ID_FONT_BLUE
- MENUITEM "Magenta", ID_FONT_MAGENTA
- MENUITEM "Yellow", ID_FONT_YELLOW
- MENUITEM "Cyan", ID_FONT_CYAN
- MENUITEM "Black", ID_FONT_BLACK
- MENUITEM "White", ID_FONT_WHITE
- MENUITEM SEPARATOR
- MENUITEM "Clear all formatting", ID_FONT_CLEARALLFORMATTING
- END
- POPUP "Dummy", INACTIVE
- BEGIN
- MENUITEM "No message sessions opened", ID_DUMMY_NOMESSAGESESSIONSOPENED
- END
POPUP "Favorites"
BEGIN
MENUITEM "Add contact to favorites", ID_FAVORITES_ADDCONTACTTOFAVORITES
MENUITEM "Remove contact from favorites", ID_FAVORITES_REMOVECONTACTFROMFAVORITES
END
- POPUP "Apparentmenu"
- BEGIN
- MENUITEM "dummy", 65535
- END
- POPUP "Panelpicmenu"
- BEGIN
- MENUITEM SEPARATOR
- MENUITEM "Contact picture settings...", ID_PICMENU_SETTINGS
- MENUITEM "Save this picture as...", ID_PANELPICMENU_SAVETHISPICTUREAS
- END
POPUP "Splitter context"
BEGIN
MENUITEM "Set position for this session", ID_SPLITTERCONTEXT_SETPOSITIONFORTHISSESSION
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 49ca11556a..d603663344 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -335,7 +335,7 @@ LRESULT CTabBaseDlg::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPar break; case IDC_INFOPANELMENU: - submenu = GetSubMenu(PluginConfig.g_hMenuContext, 9); + submenu = GetSubMenu(PluginConfig.g_hMenuContext, 7); GetWindowRect(GetDlgItem(m_hwnd, IDC_NAME), &rc); EnableMenuItem(submenu, ID_FAVORITES_ADDCONTACTTOFAVORITES, !m_cache->isFavorite() ? MF_ENABLED : MF_GRAYED); diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 89b5fc0194..fcbfb1d36a 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -281,14 +281,6 @@ int CGlobals::ModulesLoaded(WPARAM, LPARAM) ::CreateImageList(TRUE);
::CB_InitCustomButtons();
- MENUITEMINFOA mii = { 0 };
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_BITMAP;
- mii.hbmpItem = HBMMENU_CALLBACK;
- HMENU submenu = GetSubMenu(PluginConfig.g_hMenuContext, 7);
- for (int k = 0; k <= 8; k++)
- SetMenuItemInfoA(submenu, (UINT_PTR)k, TRUE, &mii);
-
PluginConfig.reloadSystemModulesChanged();
::Chat_ModulesLoaded();
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index 75bb584b7d..94b6ccdc9d 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -218,7 +218,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP BOOL iSelection = TrackPopupMenu(PluginConfig.g_hMenuTrayUnread, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, nullptr);
HandleMenuEntryFromhContact((MCONTACT)iSelection);
}
- else TrackPopupMenu(GetSubMenu(PluginConfig.g_hMenuContext, 8), TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, nullptr);
+ else TrackPopupMenu(GetSubMenu(PluginConfig.g_hMenuContext, 6), TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, nullptr);
if (wParam == 100)
PostMessage(hwndDlg, WM_NULL, 0, 0);
diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index 05fa5f9e8d..1c2f0b106f 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -329,7 +329,7 @@ void CInfoPanel::renderContent(const HDC hdc) dis.rcItem = m_dat->m_rcPic;
dis.hDC = hdc;
dis.hwndItem = m_dat->GetHwnd();
- if (m_dat->MsgWindowDrawHandler(0, (LPARAM)&dis) == 0) {
+ if (m_dat->MsgWindowDrawHandler(&dis) == 0) {
::PostMessage(m_dat->GetHwnd(), WM_SIZE, 0, 1);
::PostMessage(m_dat->GetHwnd(), DM_FORCEREDRAW, 0, 0);
}
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 82c75e8783..e8a653bbbe 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -358,7 +358,7 @@ void CSrmmWindow::MsgWindowUpdateState(UINT msg) m_pWnd->Invalidate();
}
-void TSAPI ShowMultipleControls(HWND hwndDlg, const UINT *controls, int cControls, int state)
+static void ShowMultipleControls(HWND hwndDlg, const UINT *controls, int cControls, int state)
{
for (int i = 0; i < cControls; i++)
Utils::showDlgControl(hwndDlg, controls[i], state);
@@ -513,7 +513,7 @@ LRESULT CALLBACK SplitterSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (dat->m_bIsAutosizingInput)
selection = ID_SPLITTERCONTEXT_SETPOSITIONFORTHISSESSION;
else
- selection = TrackPopupMenu(GetSubMenu(PluginConfig.g_hMenuContext, 12), TPM_RETURNCMD, pt.x, pt.y, 0, hwndParent, nullptr);
+ selection = TrackPopupMenu(GetSubMenu(PluginConfig.g_hMenuContext, 8), TPM_RETURNCMD, pt.x, pt.y, 0, hwndParent, nullptr);
switch (selection) {
case ID_SPLITTERCONTEXT_SAVEFORTHISCONTACTONLY:
@@ -579,7 +579,6 @@ CSrmmWindow::CSrmmWindow() m_btnOk.OnClick = Callback(this, &CSrmmWindow::onClick_Ok);
m_btnAdd.OnClick = Callback(this, &CSrmmWindow::onClick_Add);
m_btnQuote.OnClick = Callback(this, &CSrmmWindow::onClick_Quote);
- m_btnColor.OnClick = Callback(this, &CSrmmWindow::onClick_Color);
m_btnCancelAdd.OnClick = Callback(this, &CSrmmWindow::onClick_CancelAdd);
m_message.OnChange = Callback(this, &CSrmmWindow::onChange_Message);
@@ -1169,11 +1168,8 @@ void CSrmmWindow::onClick_Ok(CCtrlButton*) void CSrmmWindow::onClick_Add(CCtrlButton*)
{
- ADDCONTACTSTRUCT acs = {};
- acs.hContact = m_hContact;
- acs.handleType = HANDLE_CONTACT;
- acs.szProto = nullptr;
- CallService(MS_ADDCONTACT_SHOW, (WPARAM)m_hwnd, (LPARAM)&acs);
+ Contact_Add(m_hContact, m_hwnd);
+
if (!db_get_b(m_hContact, "CList", "NotOnList", 0)) {
m_bNotOnList = FALSE;
ShowMultipleControls(m_hwnd, addControls, _countof(addControls), SW_HIDE);
@@ -1183,42 +1179,6 @@ void CSrmmWindow::onClick_Add(CCtrlButton*) }
}
-void CSrmmWindow::onClick_Color(CCtrlButton *pButton)
-{
- CHARFORMAT2 cf;
- ZeroMemory(&cf, sizeof(CHARFORMAT2));
- cf.cbSize = sizeof(CHARFORMAT2);
- cf.dwMask = CFM_COLOR;
- cf.dwEffects = 0;
-
- RECT rc;
- GetWindowRect(pButton->GetHwnd(), &rc);
- int iSelection = TrackPopupMenu(GetSubMenu(PluginConfig.g_hMenuContext, 7), TPM_RETURNCMD, rc.left, rc.bottom, 0, m_hwnd, nullptr);
- if (iSelection == ID_FONT_CLEARALLFORMATTING) {
- cf.dwMask = CFM_BOLD | CFM_COLOR | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT;
- cf.crTextColor = M.GetDword(FONTMODULE, "Font16Col", 0);
- m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
- return;
- }
-
- if (iSelection == ID_FONT_DEFAULTCOLOR) {
- cf.crTextColor = M.GetDword(FONTMODULE, "Font16Col", 0);
- for (int i = 0; i < Utils::rtf_clrs.getCount(); i++)
- if (Utils::rtf_clrs[i].clr == cf.crTextColor)
- cf.crTextColor = RGB(GetRValue(cf.crTextColor), GetGValue(cf.crTextColor), GetBValue(cf.crTextColor) == 0 ? GetBValue(cf.crTextColor) + 1 : GetBValue(cf.crTextColor) - 1);
-
- m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
- return;
- }
-
- for (int i = 0; i < RTF_CTABLE_DEFSIZE; i++) {
- if (Utils::rtf_clrs[i].menuid == iSelection) {
- cf.crTextColor = Utils::rtf_clrs[i].clr;
- m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
- }
- }
-}
-
void CSrmmWindow::onClick_Quote(CCtrlButton*)
{
CHARRANGE sel;
@@ -2835,7 +2795,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) break;
case WM_DRAWITEM:
- return MsgWindowDrawHandler(wParam, lParam);
+ return MsgWindowDrawHandler((DRAWITEMSTRUCT*)lParam);
case WM_APPCOMMAND:
{
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 920bf14be9..85fffcb7c7 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -887,8 +887,10 @@ BOOL CTabBaseDlg::DoRtfToTags(CMStringW &pszText) const if (iCol > 0) {
if (isChat()) {
if (mi && mi->bColor) {
- if (iInd >= 0)
- res.AppendFormat(L"%%c%u", iInd);
+ if (iInd >= 0) {
+ if (!(res.IsEmpty() && m_pContainer->theme.fontColors[MSGFONTID_MESSAGEAREA] == pColors[iInd]))
+ res.AppendFormat(L"%%c%u", iInd);
+ }
else if (!res.IsEmpty())
res.Append(L"%%C");
}
@@ -1376,57 +1378,8 @@ void CTabBaseDlg::HandlePasteAndSend() // draw various elements of the message window, like avatar(s), info panel fields
// and the color formatting menu
-int CTabBaseDlg::MsgWindowDrawHandler(WPARAM, LPARAM lParam)
+int CTabBaseDlg::MsgWindowDrawHandler(DRAWITEMSTRUCT *dis)
{
- LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
- if (dis->CtlType == ODT_MENU && dis->hwndItem == (HWND)GetSubMenu(PluginConfig.g_hMenuContext, 7)) {
- RECT rc = { 0 };
- HBRUSH old, col;
- COLORREF clr;
- switch (dis->itemID) {
- case ID_FONT_RED:
- clr = RGB(255, 0, 0);
- break;
- case ID_FONT_BLUE:
- clr = RGB(0, 0, 255);
- break;
- case ID_FONT_GREEN:
- clr = RGB(0, 255, 0);
- break;
- case ID_FONT_MAGENTA:
- clr = RGB(255, 0, 255);
- break;
- case ID_FONT_YELLOW:
- clr = RGB(255, 255, 0);
- break;
- case ID_FONT_WHITE:
- clr = RGB(255, 255, 255);
- break;
- case ID_FONT_DEFAULTCOLOR:
- clr = GetSysColor(COLOR_MENU);
- break;
- case ID_FONT_CYAN:
- clr = RGB(0, 255, 255);
- break;
- case ID_FONT_BLACK:
- clr = RGB(0, 0, 0);
- break;
- default:
- clr = 0;
- }
- col = (HBRUSH)CreateSolidBrush(clr);
- old = (HBRUSH)SelectObject(dis->hDC, col);
- rc.left = 2;
- rc.top = dis->rcItem.top - 5;
- rc.right = 15;
- rc.bottom = dis->rcItem.bottom + 4;
- Rectangle(dis->hDC, rc.left - 1, rc.top - 1, rc.right + 1, rc.bottom + 1);
- FillRect(dis->hDC, &rc, col);
- SelectObject(dis->hDC, old);
- DeleteObject(col);
- return TRUE;
- }
-
HBITMAP hbmAvatar = m_ace ? m_ace->hbmPic : PluginConfig.g_hbmUnknown;
if ((dis->hwndItem == GetDlgItem(m_hwnd, IDC_CONTACTPIC) && m_bShowAvatar) || (dis->hwndItem == m_hwnd && m_pPanel.isActive())) {
if (hbmAvatar == nullptr)
@@ -1568,7 +1521,7 @@ int CTabBaseDlg::MsgWindowDrawHandler(WPARAM, LPARAM lParam) return TRUE;
}
- return Menu_DrawItem(lParam);
+ return Menu_DrawItem((LPARAM)dis);
}
void TSAPI LoadThemeDefaults(TContainerData *pContainer)
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index f3664676a3..10b69baf5e 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -445,9 +445,9 @@ public: void UpdateReadChars() const;
void UpdateSaveAndSendButton();
- int MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam);
- int MsgWindowUpdateMenu(HMENU submenu, int menuID);
+ int MsgWindowDrawHandler(DRAWITEMSTRUCT *dis);
int MsgWindowMenuHandler(int selection, int menuId);
+ int MsgWindowUpdateMenu(HMENU submenu, int menuID);
void RenderToolbarBG(HDC hdc, const RECT &rcWindow) const;
void UpdateToolbarBG();
@@ -490,7 +490,6 @@ public: void onClick_Ok(CCtrlButton*);
void onClick_Add(CCtrlButton*);
- void onClick_Color(CCtrlButton*);
void onClick_Quote(CCtrlButton*);
void onClick_CancelAdd(CCtrlButton*);
diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h index ae0ed1e315..c4472425c5 100644 --- a/plugins/TabSRMM/src/resource.h +++ b/plugins/TabSRMM/src/resource.h @@ -684,16 +684,6 @@ #define ID_SIZE_NORMAL 40189
#define ID_SIZE_SMALLER 40190
#define ID_SIZE_TINY 40191
-#define ID_FONT_RED 40192
-#define ID_FONT_GREEN 40193
-#define ID_FONT_BLUE 40194
-#define ID_FONT_MAGENTA 40195
-#define ID_FONT_YELLOW 40196
-#define ID_FONT_BLACK 40197
-#define ID_FONT_WHITE 40198
-#define ID_FONT_CLEARALLFORMATTING 40199
-#define ID_FONT_DEFAULTCOLOR 40200
-#define ID_FONT_CYAN 40201
#define ID_DUMMY_NOMESSAGESESSIONSOPENED 40202
#define ID_SENDMENU_SENDWITHOUTTIMEOUTS 40203
#define ID_TRAYCONTEXT_SHOWTHETRAYICON 40204
@@ -734,14 +724,3 @@ #define ID_QUEUEMANAGER_RESUMESELECTED 40259
#define ID_QUEUEMANAGER_CANCELALLMULTISENDJOBS 40260
#define ID_QUEUEMANAGER_COPYMESSAGETOCLIPBOARD 40261
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 18
-#define _APS_NEXT_COMMAND_VALUE 40263
-#define _APS_NEXT_CONTROL_VALUE 1453
-#define _APS_NEXT_SYMED_VALUE 40283
-#endif
-#endif
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index 1a294368a9..7377e6f992 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -700,7 +700,7 @@ INT_PTR CALLBACK CSendLater::DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM switch (((LPNMHDR)lParam)->code) {
case NM_RCLICK:
HMENU hMenu = ::LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_TABCONTEXT));
- HMENU hSubMenu = ::GetSubMenu(hMenu, 13);
+ HMENU hSubMenu = ::GetSubMenu(hMenu, 9);
::TranslateMenu(hSubMenu);
POINT pt;
diff --git a/plugins/TabSRMM/src/sendqueue.h b/plugins/TabSRMM/src/sendqueue.h index 5f1d8315f7..9929843238 100644 --- a/plugins/TabSRMM/src/sendqueue.h +++ b/plugins/TabSRMM/src/sendqueue.h @@ -108,7 +108,6 @@ private: extern SendQueue *sendQueue;
int TSAPI ActivateExistingTab(TContainerData *pContainer, HWND hwndChild);
-void TSAPI ShowMultipleControls(const HWND hwndDlg, const UINT * controls, int cControls, int state);
void TSAPI HandleIconFeedback(CTabBaseDlg *dat, HICON iIcon);
#endif /* __SENDQUEUE_H */
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp index 6ed8559fd7..ec95bf5ce7 100644 --- a/plugins/TabSRMM/src/srmm.cpp +++ b/plugins/TabSRMM/src/srmm.cpp @@ -44,7 +44,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h index 452fb3151a..0f20db7320 100644 --- a/plugins/TabSRMM/src/stdafx.h +++ b/plugins/TabSRMM/src/stdafx.h @@ -65,7 +65,6 @@ #include <m_clist.h>
#include <m_userinfo.h>
#include <m_history.h>
-#include <m_addcontact.h>
#include <m_file.h>
#include <m_fontservice.h>
#include <m_acc.h>
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index 3608625705..df7dae8015 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -112,7 +112,7 @@ search_again: c_closing = colorname.GetLength();
const wchar_t *wszColname = colorname.c_str();
if (endmark != -1 && c_closing > 2 && c_closing <= 6 && iswalnum(colorname[0]) && iswalnum(colorname[c_closing - 1])) {
- Utils::RTF_ColorAdd(wszColname, c_closing);
+ Utils::RTF_ColorAdd(wszColname);
if (!was_added) {
clr_was_added = was_added = true;
goto search_again;
@@ -414,49 +414,22 @@ int CTabBaseDlg::FindRTLLocale() /////////////////////////////////////////////////////////////////////////////////////////
// init default color table. the table may grow when using custom colors via bbcodes
-static TRTFColorTable _rtf_ctable[] =
-{
- { L"black", 0, ID_FONT_BLACK },
- { L"", RGB(0,0,128), -1 },
- { L"", RGB(0,128,128), -1 },
- { L"", RGB(128,0,128), -1 },
- { L"", RGB(0,128,0), -1 },
- { L"", RGB(128,128,0), -1 },
- { L"", RGB(128,0,0), -1 },
- { L"", RGB(128,128,128), -1 },
-
- { L"", RGB(192,192,192), -1 },
- { L"blue", RGB(0, 0, 255), ID_FONT_BLUE },
- { L"cyan", RGB(0, 255, 255), ID_FONT_CYAN },
- { L"magenta", RGB(255, 0, 255), ID_FONT_MAGENTA },
- { L"green", RGB(0, 255, 0), ID_FONT_GREEN },
- { L"yellow", RGB(255, 255, 0), ID_FONT_YELLOW },
- { L"red", RGB(255, 0, 0), ID_FONT_RED },
- { L"white", RGB(255, 255, 255), ID_FONT_WHITE }
-};
-
void Utils::RTF_CTableInit()
{
- for (int i = 0; i < _countof(_rtf_ctable); i++)
- rtf_clrs.insert(new TRTFColorTable(_rtf_ctable[i]));
+ int iTableSize;
+ COLORREF *pTable = Srmm_GetColorTable(&iTableSize);
+ for (int i = 0; i < iTableSize; i++)
+ rtf_clrs.insert(new TRTFColorTable(L"", pTable[i]));
}
/////////////////////////////////////////////////////////////////////////////////////////
// add a color to the global rtf color table
-void Utils::RTF_ColorAdd(const wchar_t *tszColname, size_t length)
+void Utils::RTF_ColorAdd(const wchar_t *tszColname)
{
- TRTFColorTable *p = new TRTFColorTable;
-
wchar_t *stopped;
COLORREF clr = wcstol(tszColname, &stopped, 16);
- mir_snwprintf(p->szName, length + 1, L"%06x", clr);
- p->menuid = 0;
-
- clr = wcstol(tszColname, &stopped, 16);
- p->clr = (RGB(GetBValue(clr), GetGValue(clr), GetRValue(clr)));
-
- rtf_clrs.insert(p);
+ rtf_clrs.insert(new TRTFColorTable(tszColname, RGB(GetBValue(clr), GetGValue(clr), GetRValue(clr))));
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h index 9461b3acde..eac7e070e5 100644 --- a/plugins/TabSRMM/src/utils.h +++ b/plugins/TabSRMM/src/utils.h @@ -38,9 +38,14 @@ struct TRTFColorTable
{
- wchar_t szName[10];
+ __forceinline TRTFColorTable(const wchar_t *wszName, COLORREF _clr) :
+ clr(_clr)
+ {
+ mir_wstrncpy(szName, wszName, _countof(szName));
+ }
+
+ wchar_t szName[10];
COLORREF clr;
- int menuid;
};
class Utils {
@@ -51,7 +56,7 @@ public: static char* FilterEventMarkers(char *szText);
static void DoubleAmpersands(wchar_t *pszText, size_t len);
static void RTF_CTableInit();
- static void RTF_ColorAdd(const wchar_t *tszColname, size_t length);
+ static void RTF_ColorAdd(const wchar_t *tszColname);
static int ReadContainerSettingsFromDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = 0);
static int WriteContainerSettingsToDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = 0);
static void SettingsToContainer(TContainerData *pContainer);
diff --git a/plugins/TabSRMM/src/version.h b/plugins/TabSRMM/src/version.h index d591342b56..b4e4e3dc6c 100644 --- a/plugins/TabSRMM/src/version.h +++ b/plugins/TabSRMM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 3
#define __MINOR_VERSION 5
#define __RELEASE_NUM 0
-#define __BUILD_NUM 7
+#define __BUILD_NUM 8
#include <stdver.h>
@@ -9,6 +9,5 @@ #define __FILENAME "TabSRMM.dll"
#define __DESCRIPTION "IM and group chat module for Miranda NG."
#define __AUTHOR "The Miranda developers team and contributors"
-#define __AUTHOREMAIL "silvercircle@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/TabSRMM/"
#define __COPYRIGHT "© 2012-17 Miranda NG team, 2000-2010 Miranda Project and contributors."
diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index a1e9c2a56d..f8616460de 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -45,7 +45,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/TipperYM/src/version.h b/plugins/TipperYM/src/version.h index e8428aee33..7508fe7faf 100644 --- a/plugins/TipperYM/src/version.h +++ b/plugins/TipperYM/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Tipper.dll"
#define __DESCRIPTION "Tooltip notification windows."
#define __AUTHOR "Scott Ellis, yaho"
-#define __AUTHOREMAIL "yaho@miranda-easy.net"
#define __AUTHORWEB "https://miranda-ng.org/p/Tipper/"
#define __COPYRIGHT "© 2005-2007 Scott Ellis, 2007-2011 Jan Holub"
diff --git a/plugins/Toaster/src/main.cpp b/plugins/Toaster/src/main.cpp index fe4d45943e..f48c47ea20 100644 --- a/plugins/Toaster/src/main.cpp +++ b/plugins/Toaster/src/main.cpp @@ -11,7 +11,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Toaster/src/version.h b/plugins/Toaster/src/version.h index ecd1e63774..e6fa41db58 100644 --- a/plugins/Toaster/src/version.h +++ b/plugins/Toaster/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Toaster.dll"
#define __DESCRIPTION "Provides popup services based on Windows toast notification for different plugins."
#define __AUTHOR "Miranda NG team"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Toaster/"
#define __COPYRIGHT "© 2015-17 Miranda NG project"
diff --git a/plugins/TooltipNotify/src/main.cpp b/plugins/TooltipNotify/src/main.cpp index 7151d44a06..9b84a68cb5 100644 --- a/plugins/TooltipNotify/src/main.cpp +++ b/plugins/TooltipNotify/src/main.cpp @@ -40,7 +40,6 @@ static PLUGININFOEX sPluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/TooltipNotify/src/version.h b/plugins/TooltipNotify/src/version.h index 57407ab729..46c7a062df 100644 --- a/plugins/TooltipNotify/src/version.h +++ b/plugins/TooltipNotify/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "TooltipNotify.dll"
#define __DESCRIPTION "Shows a small tooltip above system tray area when a contact status is changed."
#define __AUTHOR "perf"
-#define __AUTHOREMAIL "perf@mail333.com"
#define __AUTHORWEB "https://miranda-ng.org/p/TooltipNotify/"
#define __COPYRIGHT "© 2004-2008 Gneedah software"
diff --git a/plugins/TopToolBar/src/main.cpp b/plugins/TopToolBar/src/main.cpp index 17c3ad9b97..4d39833380 100644 --- a/plugins/TopToolBar/src/main.cpp +++ b/plugins/TopToolBar/src/main.cpp @@ -12,7 +12,6 @@ PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/TopToolBar/src/version.h b/plugins/TopToolBar/src/version.h index 37294d4c91..bf9fee7f1e 100644 --- a/plugins/TopToolBar/src/version.h +++ b/plugins/TopToolBar/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "TopToolBar.dll"
#define __DESCRIPTION "ToptoolBar adds buttons in top frame for fast access."
#define __AUTHOR "Bethoven"
-#define __AUTHOREMAIL "bethoven@mailgate.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/TopToolBar/"
#define __COPYRIGHT "© 2003-2008 Bethoven"
diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index 3c2c81fa82..f164c09816 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -106,7 +106,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/TrafficCounter/src/resource.h b/plugins/TrafficCounter/src/resource.h index 1618f40849..578cfbb0bc 100644 --- a/plugins/TrafficCounter/src/resource.h +++ b/plugins/TrafficCounter/src/resource.h @@ -389,7 +389,6 @@ #define IDC_PLUGINCPYR 1681
#define IDC_PLUGINURL 1682
#define IDC_PLUGINPID 1683
-#define IDC_PLUGINEMAIL 1684
#define IDC_IDLESPIN 1687
#define IDC_NODBDRIVERS 1690
#define IDC_IDLESTATUSLOCK 1691
diff --git a/plugins/TrafficCounter/src/version.h b/plugins/TrafficCounter/src/version.h index 46154c826f..6acb2ae8ac 100644 --- a/plugins/TrafficCounter/src/version.h +++ b/plugins/TrafficCounter/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "TrafficCounter.dll"
#define __DESCRIPTION "Adding traffic and time counters."
#define __AUTHOR "Ghost, Mironych"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/TrafficCounter/"
#define __COPYRIGHT "© 2002-2006 Ghost, 2007-2012 Mironych"
diff --git a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp index d61b374d12..7cba65cf85 100644 --- a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp +++ b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp @@ -29,7 +29,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/TranslitSwitcher/src/version.h b/plugins/TranslitSwitcher/src/version.h index d308e511c1..7edff2681d 100644 --- a/plugins/TranslitSwitcher/src/version.h +++ b/plugins/TranslitSwitcher/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "TranslitSwitcher.dll" #define __DESCRIPTION "Allows you to switch a layout or transliterate or invert case of the entered text in the message window with SmileyAdd support." #define __AUTHOR "Mataes, tico-tico, Tim" -#define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/TranslitSwitcher/" #define __COPYRIGHT "© 2011-17 Mataes, tico-tico, 2007 Dmitry Titkov" diff --git a/plugins/UserGuide/src/main.cpp b/plugins/UserGuide/src/main.cpp index de77c75a9d..593d79a022 100644 --- a/plugins/UserGuide/src/main.cpp +++ b/plugins/UserGuide/src/main.cpp @@ -10,7 +10,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/UserGuide/src/version.h b/plugins/UserGuide/src/version.h index ab676d20ec..a725a81115 100644 --- a/plugins/UserGuide/src/version.h +++ b/plugins/UserGuide/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "UserGuide.dll" #define __DESCRIPTION "This plugin adds the main menu item used to view Miranda NG pack user guide." #define __AUTHOR "Yasnovidyashii" -#define __AUTHOREMAIL "yasnovidyashii@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/UserGuide/" #define __COPYRIGHT "© 2009 Mikhail Yuriev" diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 1eb4404029..1dec35ecbf 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -355,7 +355,7 @@ int CExImContactXML::ExportSetting(TiXmlElement *xmlModule, LPCSTR pszModule, LP str = (LPSTR)mir_alloc(baselen + 6);
assert(str != nullptr);
// encode data
- if ( mir_base64_encodebuf(dbv.pbVal, dbv.cpbVal, str+1, baselen)) {
+ if (mir_base64_encodebuf(dbv.pbVal, dbv.cpbVal, str+1, baselen)) {
str[baselen+1] = 0;
str[0] = 'n';
xmlValue = new TiXmlText(str);
@@ -537,7 +537,7 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) LPCSTR pUID = xContact->Attribute("uidv");
if (pUID != nullptr) {
- unsigned valLen;
+ size_t valLen;
PBYTE pbVal = nullptr;
switch (*(pUID++)) {
@@ -866,7 +866,7 @@ int CExImContactXML::ImportSetting(LPCSTR pszModule, TiXmlElement *xmlEntry) DBVARIANT dbv = { 0 };
// convert data
- unsigned baselen;
+ size_t baselen;
switch (value[0]) {
case 'b': //'b' bVal and cVal are valid
@@ -952,7 +952,7 @@ int CExImContactXML::ImportEvent(LPCSTR pszModule, TiXmlElement *xmlEvent) if (!tmp || tmp[0] == 0)
return ERROR_INVALID_VALUE;
- unsigned baselen;
+ size_t baselen;
mir_ptr<BYTE> tmpVal((PBYTE)mir_base64_decode(tmp, &baselen));
if (tmpVal != NULL) {
// event owning module
diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index b44a98ca60..72e20d8806 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -27,7 +27,6 @@ static PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/UserInfoEx/src/version.h b/plugins/UserInfoEx/src/version.h index 557c55d5e4..df1cc5a311 100644 --- a/plugins/UserInfoEx/src/version.h +++ b/plugins/UserInfoEx/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "UInfoEx.dll"
#define __DESCRIPTION "Extended UserInfo module for Miranda NG. Provides interface to edit all contact information."
#define __AUTHOR "DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
-#define __AUTHOREMAIL "deathaxe@web.de"
#define __AUTHORWEB "https://miranda-ng.org/p/UInfoEx/"
#define __COPYRIGHT "© 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
diff --git a/plugins/Variables/src/main.cpp b/plugins/Variables/src/main.cpp index 059f49116f..3ddf6b707c 100644 --- a/plugins/Variables/src/main.cpp +++ b/plugins/Variables/src/main.cpp @@ -38,7 +38,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Variables/src/version.h b/plugins/Variables/src/version.h index 010c047d72..e93bd0c549 100644 --- a/plugins/Variables/src/version.h +++ b/plugins/Variables/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Variables.dll" #define __DESCRIPTION "Adds support for dynamic variables in strings for plugins." #define __AUTHOR "P Boon" -#define __AUTHOREMAIL "unregistered@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/Variables/" #define __COPYRIGHT "© 2003-2008 P. Boon, Ricardo Pescuma, George Hazan" diff --git a/plugins/Watrack/docs/sampledll.dpr b/plugins/Watrack/docs/sampledll.dpr index d9c6839060..5a6c3b0c80 100644 --- a/plugins/Watrack/docs/sampledll.dpr +++ b/plugins/Watrack/docs/sampledll.dpr @@ -12,7 +12,6 @@ const version :$00000001;
description:'The long description of your plugin, to go in the plugin options dialog';
author :'J. Random Hacker';
- authorEmail:'noreply@sourceforge.net';
copyright :'(c) 2003 J. Random Hacker';
homepage :'http://miranda-icq.sourceforge.net/';
flags :UNICODE_AWARE;
diff --git a/plugins/Watrack/player.ini b/plugins/Watrack/player.ini index 79676eb034..cc356a1707 100644 --- a/plugins/Watrack/player.ini +++ b/plugins/Watrack/player.ini @@ -39,7 +39,7 @@ url='http://audioplayer.sourceforge.net/' [Billy]
class='TAppBilly'
-url='http://sheepfriends.com/?page=billy'
+url='https://www.sheepfriends.com/index-page=billy.html'
[BizzOn]
class='BizzOn v2.x'
@@ -68,6 +68,7 @@ url='http://www.cyberlink.com/' [Daum PotPlayer]
class='PotPlayer'
class1='PotPlayer64'
+url='http://potplayer.daum.net/'
notes='"Daum PotPlayer" text for stopped player?'
[dBpowerAMP]
@@ -106,7 +107,7 @@ url='http://www.freeboxjukebox.com/' [J.River Media Center]
class='MJFrame'
class1='J. River Display Window'
-url='http://www.jrmediacenter.com/'
+url='https://jriver.com/'
[HKDC]
text='HKDC_HangWnd'
@@ -125,7 +126,7 @@ class='TApplication' file='KMPLAYER.EXE'
flags=8
url='http://www.kmplayer.com'
-Notes='Winamp API used to get more info'
+notes='Winamp API used to get more info'
[MPlayer]
class='MPlayer - The Movie Player'
diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr index 478ced86a1..8fa8d684c3 100644 --- a/plugins/Watrack/watrack.dpr +++ b/plugins/Watrack/watrack.dpr @@ -46,7 +46,6 @@ begin PluginInfo.version :=$0000060C;
PluginInfo.description:='Paste played music info into message window or status text';
PluginInfo.author :='Awkward';
- PluginInfo.authorEmail:='panda75@bk.ru; awk1975@ya.ru';
PluginInfo.copyright :='(c) 2005-2012 Awkward';
PluginInfo.homepage :='http://code.google.com/p/delphi-miranda-plugins/';
PluginInfo.flags :=UNICODE_AWARE;
diff --git a/plugins/Watrack_MPD/src/init.cpp b/plugins/Watrack_MPD/src/init.cpp index 41d24efd60..9d28c299ff 100755 --- a/plugins/Watrack_MPD/src/init.cpp +++ b/plugins/Watrack_MPD/src/init.cpp @@ -29,7 +29,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/Watrack_MPD/src/version.h b/plugins/Watrack_MPD/src/version.h index a973d9afdd..e07d6950e5 100644 --- a/plugins/Watrack_MPD/src/version.h +++ b/plugins/Watrack_MPD/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Watrack_MPD.dll" #define __DESCRIPTION "Music Player Daemon support for Watrack." #define __AUTHOR "sss" -#define __AUTHOREMAIL "sss123next@list.ru" #define __AUTHORWEB "https://miranda-ng.org/p/Watrack_MPD/" #define __COPYRIGHT "© 2009 sss" diff --git a/plugins/Weather/src/version.h b/plugins/Weather/src/version.h index 7562216179..ed24bd5ae8 100644 --- a/plugins/Weather/src/version.h +++ b/plugins/Weather/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Weather.dll"
#define __DESCRIPTION "Retrieves weather information and displays it in your contact list."
#define __AUTHOR "Miranda NG Team"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Weather/"
#define __COPYRIGHT "© 2002-2005 NoName, 2005-2010 Boris Krasnovskiy, 2012-17 Miranda NG Team"
diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index 6739dcf5da..3b89d9a4c1 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -66,7 +66,6 @@ static const PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index 421e92fdd2..3ba57dd526 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -37,7 +37,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/WebView/src/version.h b/plugins/WebView/src/version.h index 42f5d505c1..bd26cbb97e 100644 --- a/plugins/WebView/src/version.h +++ b/plugins/WebView/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "Webview.dll" #define __DESCRIPTION "Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window." #define __AUTHOR "Vincent Joyce" -#define __AUTHOREMAIL "ungoliante666@hotmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/WebView/" #define __COPYRIGHT "© 2011 Vincent Joyce" diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp index b2d18a66ef..a9664c377b 100644 --- a/plugins/WhenWasIt/src/WhenWasIt.cpp +++ b/plugins/WhenWasIt/src/WhenWasIt.cpp @@ -37,7 +37,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/WhenWasIt/src/version.h b/plugins/WhenWasIt/src/version.h index 08db3ede63..6cc416903c 100644 --- a/plugins/WhenWasIt/src/version.h +++ b/plugins/WhenWasIt/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "WhenWasIt.dll"
#define __DESCRIPTION "Notifies you of upcoming birthdays."
#define __AUTHOR "Cristian Libotean"
-#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/WhenWasIt/"
#define __COPYRIGHT "© 2006-2011 Cristian Libotean"
diff --git a/plugins/WhoUsesMyFiles/src/version.h b/plugins/WhoUsesMyFiles/src/version.h index 9fc7bab382..f5696f4df3 100644 --- a/plugins/WhoUsesMyFiles/src/version.h +++ b/plugins/WhoUsesMyFiles/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "WhoUsesMyFiles.dll" #define __DESCRIPTION "Scans for network users of your shared files and notify you with popups." #define __AUTHOR "Nikolay Redko" -#define __AUTHOREMAIL "nike000@users.sf.net" #define __AUTHORWEB "https://miranda-ng.org/p/WhoUsesMyFiles/" #define __COPYRIGHT "© 2003 Nike" diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp index 1a6ae70dad..f915b42d00 100644 --- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp +++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp @@ -13,7 +13,6 @@ static PLUGININFOEX pluginInfo = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index daffa20758..293a296ec5 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -18,7 +18,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/WinterSpeak/src/version.h b/plugins/WinterSpeak/src/version.h index d0043659db..96e467db58 100644 --- a/plugins/WinterSpeak/src/version.h +++ b/plugins/WinterSpeak/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "WinterSpeak.dll" #define __DESCRIPTION "Miranda interface to the Microsoft Speech API." #define __AUTHOR "Ryan Winter, BlubbFish" -#define __AUTHOREMAIL "miranda@blubbfish.net" #define __AUTHORWEB "https://miranda-ng.org/p/WinterSpeak/" #define __COPYRIGHT "© 2002 Ryan Winter, 2013 BlubbFish" diff --git a/plugins/XSoundNotify/src/version.h b/plugins/XSoundNotify/src/version.h index 420ab55dcc..5a56cf5757 100644 --- a/plugins/XSoundNotify/src/version.h +++ b/plugins/XSoundNotify/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "XSoundNotify.dll" #define __DESCRIPTION "Provides extended options for sound notifications." #define __AUTHOR "Roman Torsten" -#define __AUTHOREMAIL "rs_torsten-public@yahoo.com" #define __AUTHORWEB "https://miranda-ng.org/p/XSoundNotify/" #define __COPYRIGHT "© 2011 Roman Torsten" diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp index dc2feaa354..f5b87586cd 100644 --- a/plugins/XSoundNotify/src/xsn_main.cpp +++ b/plugins/XSoundNotify/src/xsn_main.cpp @@ -25,7 +25,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/YAMN/res/YAMN.rc b/plugins/YAMN/res/YAMN.rc index 68436a49ae..c7bf41f838 100644 --- a/plugins/YAMN/res/YAMN.rc +++ b/plugins/YAMN/res/YAMN.rc @@ -163,8 +163,6 @@ BEGIN EDITTEXT IDC_STDESC,85,41,215,23,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_GROUP
LTEXT "Copyright:",IDC_STATIC,13,64,72,10
EDITTEXT IDC_STCOPY,85,63,215,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_GROUP
- LTEXT "E-mail:",IDC_STATIC,13,77,72,11
- EDITTEXT IDC_STMAIL,85,76,214,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_GROUP
LTEXT "Homepage:",IDC_STATIC,13,101,72,11
CONTROL "",IDC_STWWW,"Hyperlink",WS_TABSTOP,85,101,215,11
END
diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp index 0a83969f8e..ef98f4f27e 100644 --- a/plugins/YAMN/src/main.cpp +++ b/plugins/YAMN/src/main.cpp @@ -38,7 +38,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, __AUTHOR, - __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp index edd7598c26..71b34d6a27 100644 --- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp @@ -126,7 +126,6 @@ YAMN_PROTOREGISTRATION POP3ProtocolRegistration = __VERSION_STRING_DOTS,
__COPYRIGHT,
__DESCRIPTION,
- __AUTHOREMAIL,
__AUTHORWEB,
};
diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index 5d239f3e1e..33a679651a 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -97,7 +97,6 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM) SetDlgItemTextA(hDlg, IDC_STVER, PParser->Plugin->PluginInfo->Ver);
SetDlgItemTextA(hDlg, IDC_STDESC, PParser->Plugin->PluginInfo->Description == nullptr ? "" : PParser->Plugin->PluginInfo->Description);
SetDlgItemTextA(hDlg, IDC_STCOPY, PParser->Plugin->PluginInfo->Copyright == nullptr ? "" : PParser->Plugin->PluginInfo->Copyright);
- SetDlgItemTextA(hDlg, IDC_STMAIL, PParser->Plugin->PluginInfo->Email == nullptr ? "" : PParser->Plugin->PluginInfo->Email);
SetDlgItemTextA(hDlg, IDC_STWWW, PParser->Plugin->PluginInfo->WWW == nullptr ? "" : PParser->Plugin->PluginInfo->WWW);
break;
}
@@ -106,7 +105,6 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM) SetDlgItemTextA(hDlg, IDC_STVER, FParser->Plugin->PluginInfo->Ver);
SetDlgItemTextA(hDlg, IDC_STDESC, FParser->Plugin->PluginInfo->Description == nullptr ? "" : FParser->Plugin->PluginInfo->Description);
SetDlgItemTextA(hDlg, IDC_STCOPY, FParser->Plugin->PluginInfo->Copyright == nullptr ? "" : FParser->Plugin->PluginInfo->Copyright);
- SetDlgItemTextA(hDlg, IDC_STMAIL, FParser->Plugin->PluginInfo->Email == nullptr ? "" : FParser->Plugin->PluginInfo->Email);
SetDlgItemTextA(hDlg, IDC_STWWW, FParser->Plugin->PluginInfo->WWW == nullptr ? "" : FParser->Plugin->PluginInfo->WWW);
break;
}
diff --git a/plugins/YAMN/src/resource.h b/plugins/YAMN/src/resource.h index 79965d6ae6..32b65d2c91 100644 --- a/plugins/YAMN/src/resource.h +++ b/plugins/YAMN/src/resource.h @@ -90,7 +90,6 @@ #define IDC_STSTATUS 1102
#define IDC_COMBOPLUGINS 1104
#define IDC_STWWW 1111
-#define IDC_STMAIL 1113
#define IDC_STCOPY 1114
#define IDC_STDESC 1115
#define IDC_STVER 1116
diff --git a/plugins/YAMN/src/version.h b/plugins/YAMN/src/version.h index d9e8ed5c85..8efb4975b9 100644 --- a/plugins/YAMN/src/version.h +++ b/plugins/YAMN/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "YAMN.dll"
#define __DESCRIPTION "Mail notifier and browser for Miranda NG. Included POP3 protocol."
#define __AUTHOR "y_b, tweety, majvan"
-#define __AUTHOREMAIL "francois.mean@skynet.be"
#define __AUTHORWEB "https://miranda-ng.org/p/YAMN/"
#define __COPYRIGHT "© 2002-2004 majvan, 2005-2007 tweety, y_b, Miranda community"
diff --git a/plugins/YAPP/src/version.h b/plugins/YAPP/src/version.h index 168719a1ab..e0e0797238 100644 --- a/plugins/YAPP/src/version.h +++ b/plugins/YAPP/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "YAPP.dll"
#define __DESCRIPTION "Yet Another Popup Plugin - Provides popup notification window services to other plugins."
#define __AUTHOR "Scott Ellis"
-#define __AUTHOREMAIL "mail@scottellis.com.au"
#define __AUTHORWEB "https://miranda-ng.org/p/YAPP/"
#define __COPYRIGHT "© 2005-2006 Scott Ellis"
diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index 482f774ec6..abf01aeb67 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -34,7 +34,6 @@ PLUGININFOEX pluginInfo={ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp index d33937b679..4bea49cf35 100644 --- a/plugins/YARelay/src/main.cpp +++ b/plugins/YARelay/src/main.cpp @@ -37,7 +37,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/YARelay/src/version.h b/plugins/YARelay/src/version.h index d565b2ec64..90c48a27de 100644 --- a/plugins/YARelay/src/version.h +++ b/plugins/YARelay/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "YARelay.dll" #define __DESCRIPTION "Forwards messages to some contact when you are not available." #define __AUTHOR "Anar Ibragimoff" -#define __AUTHOREMAIL "ai91@mail.ru" #define __AUTHORWEB "https://miranda-ng.org/p/YARelay/" #define __COPYRIGHT "© 2005 Anar Ibragimoff" diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp index 11983be572..172b961d8e 100644 --- a/plugins/ZeroNotification/src/main.cpp +++ b/plugins/ZeroNotification/src/main.cpp @@ -36,7 +36,6 @@ PLUGININFOEX pluginInfoEx = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ZeroNotification/src/version.h b/plugins/ZeroNotification/src/version.h index a69a5c5435..21438a72eb 100644 --- a/plugins/ZeroNotification/src/version.h +++ b/plugins/ZeroNotification/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "ZeroNotify.dll"
#define __DESCRIPTION "Adds options to automatically disable notifications when a protocol is in a certain status."
#define __AUTHOR "bidyut, Maat"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/ZeroNotify/"
#define __COPYRIGHT "© 2005 bidyut, 2009 Maat"
diff --git a/plugins/ZeroSwitch/src/ZeroSwitch.cpp b/plugins/ZeroSwitch/src/ZeroSwitch.cpp index e38dc64403..1230b92a2e 100644 --- a/plugins/ZeroSwitch/src/ZeroSwitch.cpp +++ b/plugins/ZeroSwitch/src/ZeroSwitch.cpp @@ -15,7 +15,6 @@ PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/ZeroSwitch/src/version.h b/plugins/ZeroSwitch/src/version.h index 0f3801c22a..bf44a22bc4 100644 --- a/plugins/ZeroSwitch/src/version.h +++ b/plugins/ZeroSwitch/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "ZeroSwitch.dll"
#define __DESCRIPTION "Adds Miranda NG icon into Alt-Tab switch dialog even if Miranda's main window has style other Title bar."
#define __AUTHOR "ZERO_BiT"
-#define __AUTHOREMAIL "zero-bit@mail.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/ZeroSwitch/"
#define __COPYRIGHT "© 2007 ZERO_BiT"
diff --git a/plugins/helpers/commonheaders.h b/plugins/helpers/commonheaders.h index f85a681b1e..77ff813360 100644 --- a/plugins/helpers/commonheaders.h +++ b/plugins/helpers/commonheaders.h @@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_message.h>
#include <m_userinfo.h>
#include <m_history.h>
-#include <m_addcontact.h>
#include <m_findadd.h>
#include <m_file.h>
#include <m_email.h>
diff --git a/plugins/mRadio/mradio.dpr b/plugins/mRadio/mradio.dpr index 28ee6d3e9c..7133e70002 100644 --- a/plugins/mRadio/mradio.dpr +++ b/plugins/mRadio/mradio.dpr @@ -36,7 +36,6 @@ begin PluginInfo.description:='This plugin plays and records Internet radio streams.'+
' Also local media files can be played.';
PluginInfo.author :='Awkward';
- PluginInfo.authorEmail:='panda75@bk.ru; awk1975@ya.ru';
PluginInfo.copyright :='(c) 2007-2014 Awkward';
PluginInfo.homepage :='http://code.google.com/p/delphi-miranda-plugins/';
PluginInfo.flags :=UNICODE_AWARE;
diff --git a/plugins/mRadio/rbass.pas b/plugins/mRadio/rbass.pas index 509d4e9057..2ef45bb08f 100644 --- a/plugins/mRadio/rbass.pas +++ b/plugins/mRadio/rbass.pas @@ -304,7 +304,7 @@ begin mGetMem(basspath,1024);
- // trying to load Bass.dll from custom
+ // trying to load bass.dll from custom
custom:=DBReadUnicode(0,PluginName,optBASSPath,nil);
if custom<>nil then
begin
@@ -339,7 +339,7 @@ begin result:=Load_BASSDLL(basspath);
if not result then
begin
- pc:=StrCopyW(StrCopyEW(pc,'bass\'),BASSName); // %miranda_path%\plugins\bass\
+ pc:=StrCopyW(StrCopyEW(pc,'BASS\'),BASSName); // %miranda_path%\plugins\BASS\
result:=Load_BASSDLL(basspath);
end;
end;
@@ -348,11 +348,11 @@ begin // not found but custom path is empty
if (not result) and (custom=nil) then
begin
- if MessageboxW(0,TranslateW('BASS.DLL not found! Choose BASS.dll path manually'),
+ if MessageboxW(0,TranslateW('bass.dll not found! Choose bass.dll path manually'),
cPluginName,MB_YESNO)=IDYES then
begin
pc:=nil;
- if SelectDirectory(TranslateW('Choose BASS.dll path'),pc,0) then
+ if SelectDirectory(TranslateW('Choose bass.dll path'),pc,0) then
begin
//!! if options page opened, need to change edit field
@@ -372,18 +372,18 @@ begin end;
end;
- // check Bass.dll version
+ // check bass.dll version
if result then
begin
if (BASS_GetVersion shr 16)<BASSVERSION then
begin
Unload_BASSDLL;
result:=false;
- BassError('Wrong version of BASS.DLL');
+ BassError('Wrong version of bass.dll');
end
else
begin
- // load Bass plugins
+ // load BASS plugins
pc:=StrCopyW(pc,'bass*.dll');
fh:=FindFirstFileW(basspath,fd);
if fh<>THANDLE(INVALID_HANDLE_VALUE) then
@@ -391,7 +391,7 @@ begin repeat
StrCopyW(pc,fd.cFileName);
if BASS_PluginLoad(pAnsiChar(basspath),BASS_UNICODE)=0 then
-;// break; // ignore if unsuccefull plugin load
+;// break; // ignore if unsuccessful plugin load
until not FindNextFileW(fh,fd);
FindClose(fh);
end;
@@ -402,7 +402,7 @@ begin end
else
begin
- BassError('BASS.DLL not found!');
+ BassError('bass.dll not found!');
end;
mFreeMem(custom);
diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp index afc87735db..6c0a5d60a2 100644 --- a/plugins/mTextControl/src/main.cpp +++ b/plugins/mTextControl/src/main.cpp @@ -36,7 +36,6 @@ PLUGININFOEX pluginInfoEx = PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/mTextControl/src/version.h b/plugins/mTextControl/src/version.h index 480791cbd2..45e9e1bf0f 100644 --- a/plugins/mTextControl/src/version.h +++ b/plugins/mTextControl/src/version.h @@ -9,6 +9,5 @@ #define __FILENAME "mTextControl.dll"
#define __DESCRIPTION "Provides text render API for different plugins."
#define __AUTHOR "Merlin_de, Victor Pavlychko"
-#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/mTextControl/"
#define __COPYRIGHT "© 2005-2006 Victor Pavlychko, 2010 Merlin_de"
diff --git a/plugins/wbOSD/src/main.cpp b/plugins/wbOSD/src/main.cpp index def91cae53..a898fcd591 100644 --- a/plugins/wbOSD/src/main.cpp +++ b/plugins/wbOSD/src/main.cpp @@ -27,7 +27,6 @@ static PLUGININFOEX pluginInfo = { PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
- __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
diff --git a/plugins/wbOSD/src/version.h b/plugins/wbOSD/src/version.h index 8f40116d9f..56b84e750c 100644 --- a/plugins/wbOSD/src/version.h +++ b/plugins/wbOSD/src/version.h @@ -30,6 +30,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __FILENAME "wbOSD.dll"
#define __DESCRIPTION "Shows new message/status change info using on-screen display."
#define __AUTHOR "Andrej Krutak"
-#define __AUTHOREMAIL "andree182@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/wbOSD/"
#define __COPYRIGHT "© 2005 Andrej Krutak"
|