Skip to content

Commit deef322

Browse files
mellery451seelabs
mellery451
authored and
seelabs
committed
Remove outputDebugString, replace getComputerName
1 parent 9456b83 commit deef322

12 files changed

Lines changed: 9 additions & 260 deletions

File tree

‎Builds/VisualStudio2015/RippleD.vcxproj‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,9 +1597,6 @@
15971597
</ClInclude>
15981598
<ClInclude Include="..\..\src\ripple\beast\core\BasicNativeHeaders.h">
15991599
</ClInclude>
1600-
<ClCompile Include="..\..\src\ripple\beast\core\bsd_SystemStats.cpp">
1601-
<ExcludedFromBuild>True</ExcludedFromBuild>
1602-
</ClCompile>
16031600
<ClInclude Include="..\..\src\ripple\beast\core\ByteOrder.h">
16041601
</ClInclude>
16051602
<ClInclude Include="..\..\src\ripple\beast\core\CompilerConfig.h">
@@ -1618,9 +1615,6 @@
16181615
</ClInclude>
16191616
<ClInclude Include="..\..\src\ripple\beast\core\LexicalCast.h">
16201617
</ClInclude>
1621-
<ClCompile Include="..\..\src\ripple\beast\core\linux_SystemStats.cpp">
1622-
<ExcludedFromBuild>True</ExcludedFromBuild>
1623-
</ClCompile>
16241618
<ClInclude Include="..\..\src\ripple\beast\core\List.h">
16251619
</ClInclude>
16261620
<ClInclude Include="..\..\src\ripple\beast\core\LockFreeStack.h">
@@ -1646,16 +1640,11 @@
16461640
</ClInclude>
16471641
<ClInclude Include="..\..\src\ripple\beast\core\StandardIncludes.h">
16481642
</ClInclude>
1649-
<ClInclude Include="..\..\src\ripple\beast\core\SystemStats.h">
1650-
</ClInclude>
16511643
<ClCompile Include="..\..\src\ripple\beast\core\WaitableEvent.cpp">
16521644
<ExcludedFromBuild>True</ExcludedFromBuild>
16531645
</ClCompile>
16541646
<ClInclude Include="..\..\src\ripple\beast\core\WaitableEvent.h">
16551647
</ClInclude>
1656-
<ClCompile Include="..\..\src\ripple\beast\core\win32_SystemStats.cpp">
1657-
<ExcludedFromBuild>True</ExcludedFromBuild>
1658-
</ClCompile>
16591648
<ClInclude Include="..\..\src\ripple\beast\crypto\detail\mac_facade.h">
16601649
</ClInclude>
16611650
<ClInclude Include="..\..\src\ripple\beast\crypto\detail\ripemd_context.h">

‎Builds/VisualStudio2015/RippleD.vcxproj.filters‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,9 +2211,6 @@
22112211
<ClInclude Include="..\..\src\ripple\beast\core\BasicNativeHeaders.h">
22122212
<Filter>ripple\beast\core</Filter>
22132213
</ClInclude>
2214-
<ClCompile Include="..\..\src\ripple\beast\core\bsd_SystemStats.cpp">
2215-
<Filter>ripple\beast\core</Filter>
2216-
</ClCompile>
22172214
<ClInclude Include="..\..\src\ripple\beast\core\ByteOrder.h">
22182215
<Filter>ripple\beast\core</Filter>
22192216
</ClInclude>
@@ -2238,9 +2235,6 @@
22382235
<ClInclude Include="..\..\src\ripple\beast\core\LexicalCast.h">
22392236
<Filter>ripple\beast\core</Filter>
22402237
</ClInclude>
2241-
<ClCompile Include="..\..\src\ripple\beast\core\linux_SystemStats.cpp">
2242-
<Filter>ripple\beast\core</Filter>
2243-
</ClCompile>
22442238
<ClInclude Include="..\..\src\ripple\beast\core\List.h">
22452239
<Filter>ripple\beast\core</Filter>
22462240
</ClInclude>
@@ -2277,18 +2271,12 @@
22772271
<ClInclude Include="..\..\src\ripple\beast\core\StandardIncludes.h">
22782272
<Filter>ripple\beast\core</Filter>
22792273
</ClInclude>
2280-
<ClInclude Include="..\..\src\ripple\beast\core\SystemStats.h">
2281-
<Filter>ripple\beast\core</Filter>
2282-
</ClInclude>
22832274
<ClCompile Include="..\..\src\ripple\beast\core\WaitableEvent.cpp">
22842275
<Filter>ripple\beast\core</Filter>
22852276
</ClCompile>
22862277
<ClInclude Include="..\..\src\ripple\beast\core\WaitableEvent.h">
22872278
<Filter>ripple\beast\core</Filter>
22882279
</ClInclude>
2289-
<ClCompile Include="..\..\src\ripple\beast\core\win32_SystemStats.cpp">
2290-
<Filter>ripple\beast\core</Filter>
2291-
</ClCompile>
22922280
<ClInclude Include="..\..\src\ripple\beast\crypto\detail\mac_facade.h">
22932281
<Filter>ripple\beast\crypto\detail</Filter>
22942282
</ClInclude>

‎src/ripple/app/misc/NetworkOPs.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
#include <ripple/resource/ResourceManager.h>
5454
#include <ripple/beast/rfc2616.h>
5555
#include <ripple/beast/core/LexicalCast.h>
56-
#include <ripple/beast/core/SystemStats.h>
5756
#include <ripple/beast/utility/rngfill.h>
5857
#include <ripple/basics/make_lock.h>
5958
#include <beast/core/detail/base64.hpp>
6059
#include <boost/asio/steady_timer.hpp>
60+
#include <boost/asio/ip/host_name.hpp>
6161

6262
namespace ripple {
6363

@@ -627,8 +627,10 @@ NetworkOPsImp::StateAccounting::states_ = {{
627627
std::string
628628
NetworkOPsImp::getHostId (bool forAdmin)
629629
{
630+
static std::string const hostname = boost::asio::ip::host_name();
631+
630632
if (forAdmin)
631-
return beast::getComputerName ();
633+
return hostname;
632634

633635
// For non-admin uses hash the node public key into a
634636
// single RFC1751 word:

‎src/ripple/beast/core/CurrentThreadName.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
//==============================================================================
2323

2424
#include <ripple/beast/core/CurrentThreadName.h>
25+
#include <ripple/beast/core/Config.h>
2526
#include <boost/thread/tss.hpp>
2627

2728
namespace beast {
@@ -101,10 +102,8 @@ void setCurrentThreadNameImpl (std::string const& name)
101102
#include <Foundation/NSThread.h>
102103
#include <Foundation/NSString.h>
103104
#import <objc/message.h>
104-
namespace beast{
105105
#include <ripple/beast/core/osx_ObjCHelpers.h>
106-
}
107-
106+
#include <ripple/beast/core/Memory.h>
108107
#else
109108
#include <sys/prctl.h>
110109

‎src/ripple/beast/core/SystemStats.h‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/ripple/beast/core/bsd_SystemStats.cpp‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/ripple/beast/core/core.unity.cpp‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353

5454
#include <ripple/beast/core/LexicalCast.h>
5555

56-
#include <ripple/beast/core/SystemStats.h>
5756
#include <ripple/beast/core/SemanticVersion.h>
5857

5958
#if BEAST_MSVC
@@ -166,28 +165,8 @@
166165
#include <ripple/beast/core/osx_ObjCHelpers.h>
167166
#endif
168167

169-
#if BEAST_ANDROID
170-
#include "native/android_JNIHelpers.h"
171-
#endif
172-
173168
#if BEAST_MAC || BEAST_IOS
174169
#include <ripple/beast/core/mac_SystemStats.mm>
175-
176-
#elif BEAST_WINDOWS
177-
#include <ripple/beast/core/win32_SystemStats.cpp>
178-
179-
#elif BEAST_LINUX
180-
#include <ripple/beast/core/linux_SystemStats.cpp>
181-
182-
#elif BEAST_BSD
183-
#include <ripple/beast/core/bsd_SystemStats.cpp>
184-
185-
#elif BEAST_ANDROID
186-
#include "native/android_Files.cpp"
187-
#include "native/android_Misc.cpp"
188-
#include "native/android_SystemStats.cpp"
189-
#include "native/android_Threads.cpp"
190-
191170
#endif
192171

193172
#include <ripple/beast/core/CurrentThreadName.cpp>

‎src/ripple/beast/core/linux_SystemStats.cpp‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/ripple/beast/core/mac_SystemStats.mm‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2121
*/
2222
//==============================================================================
23+
#include <ripple/beast/core/Memory.h>
2324

2425
namespace beast
2526
{
@@ -34,43 +35,4 @@
3435
[((NSAutoreleasePool*) pool) release];
3536
}
3637

37-
//==============================================================================
38-
void outputDebugString (std::string const& text)
39-
{
40-
// Would prefer to use std::cerr here, but avoiding it for
41-
// the moment, due to clang JIT linkage problems.
42-
fputs (text.c_str (), stderr);
43-
fputs ("\n", stderr);
44-
fflush (stderr);
45-
}
46-
47-
//==============================================================================
48-
49-
#if BEAST_MAC
50-
struct RLimitInitialiser
51-
{
52-
RLimitInitialiser()
53-
{
54-
rlimit lim;
55-
getrlimit (RLIMIT_NOFILE, &lim);
56-
lim.rlim_cur = lim.rlim_max = RLIM_INFINITY;
57-
setrlimit (RLIMIT_NOFILE, &lim);
58-
}
59-
};
60-
61-
static RLimitInitialiser rLimitInitialiser;
62-
#endif
63-
64-
//==============================================================================
65-
std::string getComputerName()
66-
{
67-
// FIXME: Remove ".local" from the name
68-
char name [256] = { 0 };
69-
70-
if (gethostname (name, sizeof (name) - 1) == 0)
71-
return name;
72-
73-
return std::string{};
74-
}
75-
7638
} // beast

‎src/ripple/beast/core/win32_SystemStats.cpp‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)