eosswedenorg/antelope-keygen
1
0
Fork 0
mirror of https://github.com/eosswedenorg/antelope-keygen synced 2026-07-03 11:53:41 +02:00
Code Issues Releases Activity

src/main.cpp: remove thread code and use key_search_nt()

Browse source
This commit is contained in:
Henrik Hautakoski 2020-01-10 10:30:42 +01:00
parent 7e37f1ef8b
commit 1c3d503369
1 changed files with 23 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/main.cpp
View file

@ -21,6 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
#ifdef HAVE_THREADS
#include <thread>
#endif /* HAVE_THREADS */
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>
@ -31,58 +34,27 @@
#include "key_search.h" #include "key_search.h"
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
#include <thread> #define n_thread_decl int n_threads = std::thread::hardware_concurrency()
#include <vector> #define n_thread_argv \
if (argc > 2) { \
// Minium number of threads. n_threads = atoi(argv[2]); \
#define MIN_THREADS 2 if (n_threads < 2) { \
n_threads = 2; \
// Number of threads to use. } \
static int n_threads = std::thread::hardware_concurrency();
#define search_func thread_search
static void thread_search(const strlist_t& words, int n) {
std::vector<std::thread> t;
int d, m;
// We can use all threads
if (n >= n_threads) {
// create n_threads - 1 as we use main process also.
t.resize(n_threads - 1);
// divide the number of results for all threads.
d = n / n_threads;
// Also calculate the reminder (will be assigned to the main thread)
m = n % n_threads;
}
// not enough results to use all threads.
else {
t.resize(n);
d = 1;
m = 0;
}
// Launch threads.
for(int i = 0; i < t.size(); i++) {
t[i] = std::thread(key_search_n, words, d);
}
// Use main thread for 1 search
key_search_n(words, d + m);
// Wait for all threads to compelete.
for(int i = 0; i < t.size(); i++) {
t[i].join();
}
} }
#define n_thread_outp << ", Using: " << n_threads << " threads"
#define call_search key_search_nt(words, n, n_threads)
#else #else
#define search_func key_search_n #define n_thread_decl
#endif #define n_thread_argv
#define n_thread_outp
#define call_search key_search_n(words, n)
#endif /* HAVE_THREADS */
void cmd_search(int argc, char **argv) { void cmd_search(int argc, char **argv) {
int n = 100; int n = 100;
n_thread_decl;
std::string search(argv[0]); std::string search(argv[0]);
strlist_t words = strsplitwords(strtolower(search)); strlist_t words = strsplitwords(strtolower(search));
@ -93,24 +65,14 @@ void cmd_search(int argc, char **argv) {
} }
} }
#ifdef HAVE_THREADS n_thread_argv;
if (argc > 2) {
n_threads = atoi(argv[2]);
// Make sure we never go under min threads.
if (n_threads < MIN_THREADS) {
n_threads = MIN_THREADS;
}
}
# endif /* HAVE_THREADS */
std::cout << "Searching for " << n std::cout << "Searching for " << n
<< " keys containing: " << search << " keys containing: " << search
#ifdef HAVE_THREADS n_thread_outp
<< ", Using: " << n_threads << " threads"
#endif /* HAVE_THREADS */
<< std::endl; << std::endl;
search_func(words, n); call_search;
} }
void usage(const char *name) { void usage(const char *name) {