From 824ba24134aaeaa81275bc57aa29cc53aeafafe3 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 4 Sep 2021 04:59:00 +0700 Subject: [PATCH] Removed config option `background`. --- CHANGELOG_NEXT.md | 6 ++++ CMakeLists.txt | 11 +----- src/App.cpp | 9 ++--- src/App_unix.cpp | 68 -------------------------------------- src/App_win.cpp | 50 ---------------------------- src/base | 2 +- src/core/config/Config.cpp | 1 - src/core/config/usage.h | 1 - 8 files changed, 10 insertions(+), 138 deletions(-) create mode 100644 CHANGELOG_NEXT.md delete mode 100644 src/App_unix.cpp delete mode 100644 src/App_win.cpp diff --git a/CHANGELOG_NEXT.md b/CHANGELOG_NEXT.md new file mode 100644 index 00000000..dd150ae8 --- /dev/null +++ b/CHANGELOG_NEXT.md @@ -0,0 +1,6 @@ +# v7.0.0 +- `src/base` is now a git submodule for the [base](https://github.com/xmrig/base) project, build instructions require slight update. +- Removed config option `background` (only command line available). Switching to background now happens on a very early stage before any I/O. + +# Previous versions +[doc/CHANGELOG_OLD.md](doc/CHANGELOG_OLD.md) diff --git a/CMakeLists.txt b/CMakeLists.txt index d187138b..10fbdf86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,19 +132,10 @@ endif() if (XMRIG_OS_WIN) list(APPEND SOURCES res/app.rc - src/App_win.cpp src/crypto/common/VirtualMemory_win.cpp ) -elseif (XMRIG_OS_APPLE) - list(APPEND SOURCES - src/App_unix.cpp - src/crypto/common/VirtualMemory_unix.cpp - ) else() - list(APPEND SOURCES - src/App_unix.cpp - src/crypto/common/VirtualMemory_unix.cpp - ) + list(APPEND SOURCES src/crypto/common/VirtualMemory_unix.cpp) if (XMRIG_OS_LINUX AND NOT XMRIG_OS_ANDROID) list(APPEND SOURCES diff --git a/src/App.cpp b/src/App.cpp index 6ef601e3..0956a32d 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -63,17 +63,12 @@ int xmrig::App::exec() m_signals = std::make_shared(this); - int rc = 0; - if (background(rc)) { - return rc; - } - - rc = m_controller->init(); + int rc = m_controller->init(); if (rc != 0) { return rc; } - if (!m_controller->isBackground()) { + if (!Log::isBackground()) { m_console = std::make_shared(this); } diff --git a/src/App_unix.cpp b/src/App_unix.cpp deleted file mode 100644 index b0b80079..00000000 --- a/src/App_unix.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , - * - * 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 3 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, see . - */ - - -#include -#include -#include -#include - - -#include "App.h" -#include "base/io/log/Log.h" -#include "core/Controller.h" - - -bool xmrig::App::background(int &rc) -{ - if (!m_controller->isBackground()) { - return false; - } - - int i = fork(); - if (i < 0) { - rc = 1; - - return true; - } - - if (i > 0) { - rc = 0; - - return true; - } - - i = setsid(); - - if (i < 0) { - LOG_ERR("setsid() failed (errno = %d)", errno); - } - - i = chdir("/"); - if (i < 0) { - LOG_ERR("chdir() failed (errno = %d)", errno); - } - - return false; -} diff --git a/src/App_win.cpp b/src/App_win.cpp deleted file mode 100644 index e803080c..00000000 --- a/src/App_win.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , - * - * 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 3 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, see . - */ - - -#include -#include - - -#include "App.h" -#include "core/Controller.h" - - -bool xmrig::App::background(int &) -{ - if (!m_controller->isBackground()) { - return false; - } - - HWND hcon = GetConsoleWindow(); - if (hcon) { - ShowWindow(hcon, SW_HIDE); - } else { - HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); - CloseHandle(h); - FreeConsole(); - } - - return false; -} diff --git a/src/base b/src/base index eecf9776..cf5c70fd 160000 --- a/src/base +++ b/src/base @@ -1 +1 @@ -Subproject commit eecf97769a019ef2266e51b5ca2172a1834eef78 +Subproject commit cf5c70fde6594355a887bfb48762730ecf558c16 diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index 3219e711..87b67e01 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -261,7 +261,6 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const doc.AddMember(StringRef(kApi), api, allocator); doc.AddMember(StringRef(kHttp), m_http.toJSON(doc), allocator); doc.AddMember(StringRef(kAutosave), isAutoSave(), allocator); - doc.AddMember(StringRef(kBackground), isBackground(), allocator); doc.AddMember(StringRef(kColors), Log::isColors(), allocator); doc.AddMember(StringRef(kTitle), title().toJSON(), allocator); diff --git a/src/core/config/usage.h b/src/core/config/usage.h index 9beb4cda..4102894f 100644 --- a/src/core/config/usage.h +++ b/src/core/config/usage.h @@ -170,7 +170,6 @@ static const std::string &usage() u += "\nMisc:\n"; u += " -c, --config=FILE load a JSON-format configuration file\n"; - u += " -B, --background run the miner in the background\n"; u += " --dry-run test configuration and exit\n"; # ifdef XMRIG_OS_WIN