Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Moving lib source files in to lib directory and moving work in to lib project.

Browse source
This commit is contained in:
clemahieu 2017-12-21 15:49:59 -06:00
commit 7baff45552
28 changed files with 88 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

35
CMakeLists.txt
View file

@ -175,18 +175,22 @@ add_library (blake2
${BLAKE2_IMPLEMENTATION})
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set (PLATFORM_SECURE_SOURCE rai/plat/osx/working.mm rai/plat/default/priority.cpp)
set (PLATFORM_LIB_SOURCE rai/plat/default/priority.cpp)
set (PLATFORM_SECURE_SOURCE rai/plat/osx/working.mm)
set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set (PLATFORM_SECURE_SOURCE rai/plat/windows/working.cpp rai/plat/windows/priority.cpp)
set (PLATFORM_LIB_SOURCE rai/plat/windows/priority.cpp)
set (PLATFORM_SECURE_SOURCE rai/plat/windows/working.cpp)
set (PLATFORM_NODE_SOURCE rai/plat/windows/openclapi.cpp)
set (PLATFORM_WALLET_SOURCE rai/plat/windows/icon.cpp RaiBlocks.rc)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp rai/plat/linux/priority.cpp)
set (PLATFORM_LIB_SOURCE rai/plat/linux/priority.cpp)
set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp)
set (PLATFORM_NODE_SOURCE rai/plat/posix/openclapi.cpp)
set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp rai/plat/default/priority.cpp)
set (PLATFORM_LIB_SOURCE rai/plat/default/priority.cpp)
set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp)
set (PLATFORM_NODE_SOURCE rai/plat/posix/openclapi.cpp)
set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp)
else ()
@ -198,18 +202,23 @@ add_library (secure
rai/config.hpp
rai/secure.cpp
rai/secure.hpp
rai/utility.cpp
rai/utility.hpp
rai/node/utility.cpp
rai/node/utility.hpp
rai/versioning.hpp
rai/versioning.cpp)
add_library (rai_lib SHARED
rai/blocks.cpp
rai/blocks.hpp
rai/interface.cpp
rai/interface.h
rai/numbers.cpp
rai/numbers.hpp)
${PLATFORM_LIB_SOURCE}
rai/lib/blocks.cpp
rai/lib/blocks.hpp
rai/lib/interface.cpp
rai/lib/interface.h
rai/lib/numbers.cpp
rai/lib/numbers.hpp
rai/lib/utility.cpp
rai/lib/utility.hpp
rai/lib/work.hpp
rai/lib/work.cpp)
add_library (node
${PLATFORM_NODE_SOURCE}
@ -227,8 +236,6 @@ add_library (node
rai/node/testing.cpp
rai/node/wallet.hpp
rai/node/wallet.cpp
rai/node/work.hpp
rai/node/work.cpp
rai/node/working.hpp
rai/node/xorshift.hpp)

2
rai/core_test/block.cpp
View file

@ -4,7 +4,7 @@
#include <gtest/gtest.h>
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <rai/node/common.hpp>
#include <rai/node/node.hpp>

6
rai/core_test/interface.cpp
View file

@ -2,9 +2,9 @@
#include <memory>
#include <rai/blocks.hpp>
#include <rai/numbers.hpp>
#include <rai/interface.h>
#include <rai/lib/blocks.hpp>
#include <rai/lib/numbers.hpp>
#include <rai/lib/interface.h>
TEST (interface, xrb_uint256_to_string)
{

2
rai/core_test/uint256_union.cpp
View file

@ -1,6 +1,6 @@
#include <gtest/gtest.h>
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <rai/secure.hpp>
#include <ed25519-donna/ed25519.h>

2
rai/blocks.cpp → rai/lib/blocks.cpp
View file

@ -1,4 +1,4 @@
#include <rai/blocks.hpp>
#include <rai/lib/blocks.hpp>
std::string rai::to_string_hex (uint64_t value_a)
{

2
rai/blocks.hpp → rai/lib/blocks.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include <rai/numbers.hpp>
#include <rai/lib/numbers.hpp>
#include <assert.h>
#include <blake2/blake2.h>

6
rai/interface.cpp → rai/lib/interface.cpp
View file

@ -1,4 +1,4 @@
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <xxhash/xxhash.h>
@ -8,8 +8,8 @@
#include <boost/property_tree/json_parser.hpp>
#include <rai/blocks.hpp>
#include <rai/numbers.hpp>
#include <rai/lib/blocks.hpp>
#include <rai/lib/numbers.hpp>
#include <cstring>

0
rai/interface.h → rai/lib/interface.h
View file

2
rai/numbers.cpp → rai/lib/numbers.cpp
View file

@ -1,4 +1,4 @@
#include <rai/numbers.hpp>
#include <rai/lib/numbers.hpp>
#include <ed25519-donna/ed25519.h>

0
rai/numbers.hpp → rai/lib/numbers.hpp
View file

0
rai/lib/utility.cpp Normal file
View file

31
rai/lib/utility.hpp Normal file
View file

@ -0,0 +1,31 @@
#pragma once
#include <functional>
#include <thread>
#include <vector>
namespace rai
{
// Lower priority of calling work generating thread
void work_thread_reprioritize ();
template <typename ... T>
class observer_set
{
public:
void add (std::function <void (T...)> const & observer_a)
{
std::lock_guard <std::mutex> lock (mutex);
observers.push_back (observer_a);
}
void operator () (T ... args)
{
std::lock_guard <std::mutex> lock (mutex);
for (auto & i: observers)
{
i (args...);
}
}
std::mutex mutex;
std::vector <std::function <void (T...)>> observers;
};
}

3
rai/node/work.cpp → rai/lib/work.cpp
View file

@ -1,5 +1,6 @@
#include <rai/node/work.hpp>
#include <rai/lib/work.hpp>
#include <rai/lib/blocks.hpp>
#include <rai/node/xorshift.hpp>
#include <future>

7
rai/node/work.hpp → rai/lib/work.hpp
View file

@ -1,8 +1,9 @@
#pragma once
#include <boost/optional.hpp>
#include <rai/node/common.hpp>
#include <rai/numbers.hpp>
#include <rai/config.hpp>
#include <rai/lib/numbers.hpp>
#include <rai/lib/utility.hpp>
#include <atomic>
#include <memory>
@ -10,10 +11,10 @@
namespace rai
{
class block;
bool work_validate (rai::block_hash const &, uint64_t);
bool work_validate (rai::block const &);
uint64_t work_value (rai::block_hash const &, uint64_t);
class block;
class opencl_work;
class work_pool
{

2
rai/node/common.cpp
View file

@ -1,7 +1,7 @@
#include <rai/node/common.hpp>
#include <rai/node/wallet.hpp>
#include <rai/node/work.hpp>
#include <rai/lib/work.hpp>
std::array <uint8_t, 2> constexpr rai::message::magic_number;
size_t constexpr rai::message::ipv4_only_position;

22
rai/node/common.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <rai/secure.hpp>
#include <boost/asio.hpp>
@ -221,24 +221,4 @@ public:
virtual void bulk_push (rai::bulk_push const &) = 0;
virtual void frontier_req (rai::frontier_req const &) = 0;
};
template <typename ... T>
class observer_set
{
public:
void add (std::function <void (T...)> const & observer_a)
{
std::lock_guard <std::mutex> lock (mutex);
observers.push_back (observer_a);
}
void operator () (T ... args)
{
std::lock_guard <std::mutex> lock (mutex);
for (auto & i: observers)
{
i (args...);
}
}
std::mutex mutex;
std::vector <std::function <void (T...)>> observers;
};
}

2
rai/node/node.cpp
View file

@ -1,6 +1,6 @@
#include <rai/node/node.hpp>
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <rai/node/common.hpp>
#include <rai/node/rpc.hpp>

2
rai/node/node.hpp
View file

@ -1,8 +1,8 @@
#pragma once
#include <rai/lib/work.hpp>
#include <rai/node/bootstrap.hpp>
#include <rai/node/wallet.hpp>
#include <rai/node/work.hpp>
#include <unordered_set>
#include <memory>

2
rai/node/openclwork.cpp
View file

@ -1,6 +1,6 @@
#include <rai/node/openclwork.hpp>
#include <rai/utility.hpp>
#include <rai/lib/utility.hpp>
#include <rai/node/node.hpp>
#include <rai/node/wallet.hpp>

2
rai/node/rpc.cpp
View file

@ -2,7 +2,7 @@
#include <boost/algorithm/string.hpp>
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <rai/node/node.hpp>
#include <ed25519-donna/ed25519.h>

2
rai/node/rpc.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include <rai/utility.hpp>
#include <rai/node/utility.hpp>
//#include <boost/beast/http.hpp>
//#include <boost/beast/core/flat_buffer.hpp>

4
rai/utility.cpp → rai/node/utility.cpp
View file

@ -1,6 +1,6 @@
#include <rai/utility.hpp>
#include <rai/node/utility.hpp>
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <lmdb/libraries/liblmdb/lmdb.h>

6
rai/utility.hpp → rai/node/utility.hpp
View file

@ -15,8 +15,8 @@
#include <lmdb/libraries/liblmdb/lmdb.h>
#include <rai/config.hpp>
#include <rai/interface.h>
#include <rai/numbers.hpp>
#include <rai/lib/interface.h>
#include <rai/lib/numbers.hpp>
namespace rai
{
@ -26,8 +26,6 @@ using vectorstream = boost::iostreams::stream_buffer <boost::iostreams::back_ins
boost::filesystem::path working_path ();
// Get a unique path within the home directory, used for testing
boost::filesystem::path unique_path ();
// Lower priority of calling work generating thread
void work_thread_reprioritize ();
// C++ stream are absolutely horrible so I need this helper function to do the most basic operation of creating a file if it doesn't exist or truntacing it.
void open_or_create (std::fstream &, std::string const &);
// Reads a json object from the stream and if was changed, write the object back to the stream

2
rai/node/wallet.cpp
View file

@ -1,6 +1,6 @@
#include <rai/node/wallet.hpp>
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <rai/node/node.hpp>
#include <rai/node/xorshift.hpp>

4
rai/plat/default/priority.cpp
View file

@ -1,5 +1,5 @@
#include <rai/utility.hpp>
#include <rai/lib/utility.hpp>
void rai::work_thread_reprioritize ()
{
}
}

2
rai/secure.cpp
View file

@ -1,6 +1,6 @@
#include <rai/secure.hpp>
#include <rai/interface.h>
#include <rai/lib/interface.h>
#include <rai/node/working.hpp>
#include <rai/versioning.hpp>

4
rai/secure.hpp
View file

@ -1,7 +1,7 @@
#pragma once
#include <rai/blocks.hpp>
#include <rai/utility.hpp>
#include <rai/lib/blocks.hpp>
#include <rai/node/utility.hpp>
#include <boost/property_tree/ptree.hpp>

4
rai/versioning.hpp
View file

@ -1,7 +1,7 @@
#pragma once
#include <rai/blocks.hpp>
#include <rai/utility.hpp>
#include <rai/lib/blocks.hpp>
#include <rai/node/utility.hpp>
namespace rai
{