Add processor and gpu name detection

Author: sam-astro

README.md

@@ -12,9 +12,10 @@ If you want to learn more, please feel free to go to [the wiki.](https://github.
 
 ## Installation / Use:
 1. First, either clone with `git clone https://github.com/sam-astro/Distributed-Compute-Coin` or download it as a ZIP file, and extract it.
-2. All of the builds are packaged in this folder. They all follow the same directory map, and the binary is located at `dcc_client/out-linux/dcc_client/dcc_client`.
-3. A change from the C# version, is that all functionality is now combined into a single program, which can handle transactions, submitting programs, and mining. It is also currently a command-line only interface while in development. 
-4. **If you are interested in earning Aether, then you can use the Mining aspect of the client.** The miner verifies the blockchain network, and also run programs created by developers. The miner utilizes containers to keep any run programs separate from your own computer. It utilizes **Podman**, an open source, secure, and light-weight alternative to Docker. You can install Podman by going to the [Podman website](https://podman.io/) and following the instructions there, which should only take a few minutes. Just use the `--mine` command to start mining a single block. You can also specify how many blocks you want to mine after the command like: `--mine 10` will mine 10 blocks. Using `-1` will mine until you stop the program.
+2. Install requirements, which are: `inxi podman`
+3. All of the builds are packaged in this folder. They all follow the same directory map, and the binary is located at `dcc_client/out-linux/dcc_client/dcc_client`.
+4. A change from the C# version, is that all functionality is now combined into a single program, which can handle transactions, submitting programs, and mining. It is also currently a command-line only interface while in development. 
+5. **If you are interested in earning Aether, then you can use the Mining aspect of the client.** The miner verifies the blockchain network, and also run programs created by developers. The miner utilizes containers to keep any run programs separate from your own computer. It utilizes **Podman**, an open source, secure, and light-weight alternative to Docker. You can install Podman by going to the [Podman website](https://podman.io/) and following the instructions there, which should only take a few minutes. Just use the `--mine` command to start mining a single block. You can also specify how many blocks you want to mine after the command like: `--mine 10` will mine 10 blocks. Using `-1` will mine until you stop the program.
 ```
 Usage: aetherdaemon [options]
 		 OR (while in interactive mode)
@@ -176,4 +177,4 @@ Supercomputers are expensive to build, and equally as expensive for institutions
 <!----------------------------------[ Badges ]--------------------------------->
 
 [Badge License]: https://img.shields.io/badge/license-DCP--GPL-brightgreen
-[Button Discord]: https://img.shields.io/badge/Discord_Server-573f75.svg?style=social&logo=Discord
+[Button Discord]: https://img.shields.io/badge/Discord_Server-573f75.svg?style=social&logo=Discord

dcc_client/dcc_client/Main.cpp

@@ -43,6 +43,9 @@ std::string peerPort = "";
 
 unsigned long long flops = 0;
 
+std::string processorName;
+std::string gpuName;
+
 //int transactionNumber = 0;
 
 //Console console;
@@ -64,12 +67,19 @@ int main()
 	console::SystemPrint();
 	console::WriteLine("Benchmarking... ");
 	flops = benchmark();
+	processorName = TrimString(GetStdoutFromCommand("lscpu | grep 'Model name' | cut -f 2 -d \":\" | awk '{$1=$1}1'"));
+	gpuName = TrimString(GetStdoutFromCommand("inxi -G | grep -i 'opengl.*renderer' | sed -n 's/.*renderer:.*(\\(.*\\)).*/\\1/p'"));
+
 	std::cout << "                                                          \r";
 	console::SystemPrint();
 	console::Write("Benchmark results: ");
 	console::Write(truncateMetricNum(flops) + "Flops", console::cyanFGColor);
 	console::Write(" across ");
 	console::Write(std::to_string(processor_count) + " cores", console::cyanFGColor);
+	console::Write(" on ");
+	console::Write(processorName, console::cyanFGColor);
+	console::Write(", also with unmeasured ");
+	console::Write(gpuName, console::cyanFGColor);
 	console::WriteLine(" ok", console::greenFGColor);
 
 	if (WalletSettingValues::verbose >= 6) {

dcc_client/dcc_client/Session.vim

@@ -3,7 +3,7 @@ let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-
 let v:this_session=expand("<sfile>:p")
 silent only
 silent tabonly
-cd ~/Code/Distributed-Compute-Coin/dcc_client/dcc_client
+cd ~/Code/AetherGrid/dcc_client/dcc_client
 if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
   let s:wipebuf = bufnr('%')
 endif
@@ -29,6 +29,8 @@ badd +255 Console.cpp
 badd +1 strops.cpp
 badd +1 term://~/Code/Distributed-Compute-Coin/dcc_client/dcc_client//336272:/bin/bash
 badd +12 ~/Code/Distributed-Compute-Coin/dcc_client/out-linux/dcc_client/out.txt
+badd +28 System.cpp
+badd +12 System.h
 argglobal
 %argdel
 $argadd P2PClient.cpp
@@ -80,62 +82,44 @@ normal! zo
 normal! zo
 266
 normal! zo
-350
+436
 normal! zo
-351
+460
 normal! zo
-444
+480
 normal! zo
-464
+497
 normal! zo
-481
+499
 normal! zo
-483
-normal! zo
-501
-normal! zo
-524
-normal! zo
-528
-normal! zo
-536
-normal! zo
-570
-normal! zo
-576
-normal! zo
-583
-normal! zo
-604
-normal! zo
-639
+540
 normal! zo
-673
+586
 normal! zo
-681
+599
 normal! zo
-691
+632
 normal! zo
-760
+655
 normal! zo
-784
+689
 normal! zo
-788
+707
 normal! zo
-810
+776
 normal! zo
-821
+800
 normal! zo
-822
+826
 normal! zo
-1158
+837
 normal! zo
-let s:l = 523 - ((9 * winheight(0) + 28) / 56)
+let s:l = 524 - ((11 * winheight(0) + 28) / 56)
 if s:l < 1 | let s:l = 1 | endif
 keepjumps exe s:l
 normal! zt
-keepjumps 523
-normal! 051|
+keepjumps 524
+normal! 033|
 tabnext
 edit P2PClient.h
 argglobal
@@ -372,58 +356,33 @@ setlocal fdl=99
 setlocal fml=1
 setlocal fdn=20
 setlocal fen
-58
-normal! zo
-114
+61
 normal! zo
 124
 normal! zo
-205
+332
 normal! zo
-207
+343
 normal! zo
-322
+356
 normal! zo
-333
+425
 normal! zo
-346
+579
 normal! zo
-415
+742
 normal! zo
-423
+758
 normal! zo
-428
-normal! zo
-578
-normal! zo
-581
-normal! zo
-617
-normal! zo
-726
-normal! zo
-730
-normal! zo
-746
-normal! zo
-761
-normal! zo
-762
-normal! zo
-771
-normal! zo
-let s:l = 574 - ((24 * winheight(0) + 28) / 56)
+let s:l = 69 - ((27 * winheight(0) + 28) / 56)
 if s:l < 1 | let s:l = 1 | endif
 keepjumps exe s:l
 normal! zt
-keepjumps 574
-normal! 044|
+keepjumps 69
+normal! 013|
 tabnext
+edit term://~/Code/Distributed-Compute-Coin/dcc_client/dcc_client//336272:/bin/bash
 argglobal
-if bufexists(fnamemodify("term://~/Code/Distributed-Compute-Coin/dcc_client/dcc_client//336272:/bin/bash", ":p")) | buffer term://~/Code/Distributed-Compute-Coin/dcc_client/dcc_client//336272:/bin/bash | else | edit term://~/Code/Distributed-Compute-Coin/dcc_client/dcc_client//336272:/bin/bash | endif
-if &buftype ==# 'terminal'
-  silent file term://~/Code/Distributed-Compute-Coin/dcc_client/dcc_client//336272:/bin/bash
-endif
 balt Main.cpp
 setlocal fdm=manual
 setlocal fde=b:anyfold_ind_buffer[v:lnum-1]
@@ -433,11 +392,13 @@ setlocal fdl=99
 setlocal fml=1
 setlocal fdn=20
 setlocal fen
-let s:l = 56 - ((55 * winheight(0) + 28) / 56)
+silent! normal! zE
+let &fdl = &fdl
+let s:l = 1 - ((0 * winheight(0) + 28) / 56)
 if s:l < 1 | let s:l = 1 | endif
 keepjumps exe s:l
 normal! zt
-keepjumps 56
+keepjumps 1
 normal! 0
 tabnext
 edit SettingsConsts.h
@@ -456,7 +417,7 @@ keepjumps exe s:l
 normal! zt
 keepjumps 18
 normal! 05|
-tabnext 1
+tabnext 9
 set stal=1
 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
   silent exe 'bwipe ' . s:wipebuf

dcc_client/dcc_client/System.cpp

@@ -2,7 +2,6 @@
 #include "System.h"
 
 
-
 // Execute a command in the main thread and print the output
 std::string ExecuteCommand(const char* cmd, bool printout)
 {
@@ -15,8 +14,8 @@ std::string ExecuteCommand(const char* cmd, bool printout)
 	}
 	while (fgets(buffer.data(), (int)(buffer.size()), pipe.get()) != nullptr) {
 		result += buffer.data();
-		if(printout)
-		std::cout << buffer.data();
+		if (printout)
+			std::cout << buffer.data();
 	}
 #else
 	system(cmd);
@@ -26,17 +25,33 @@ std::string ExecuteCommand(const char* cmd, bool printout)
 	return "";
 }
 
+std::string GetStdoutFromCommand(std::string cmd)
+{
+	std::string data;
+	FILE* stream;
+	const int max_buffer = 256;
+	char buffer[max_buffer];
+	cmd.append(" 2>&1");
+	stream = popen(cmd.c_str(), "r");
+	if (stream) {
+		while (!feof(stream)) {
+			if (fgets(buffer, max_buffer, stream) != NULL)
+				data.append(buffer);
+		}
+		pclose(stream);
+	}
+	return data;
+}
+
 // Execute a process in an asynchronous background thread
 boost::process::child ExecuteAsync(std::string cmd, bool printOutput)
 {
-	try
-	{
+	try {
 		namespace bp = boost::process;
 		std::vector<std::string> splitCommand = SplitString(cmd, " ");
 		std::string command = splitCommand[0];
 		std::string args;
-		for (int i = 1; i < sizeof(splitCommand) / sizeof(splitCommand[0]); i++)
-		{
+		for (int i = 1; i < sizeof(splitCommand) / sizeof(splitCommand[0]); i++) {
 			args += splitCommand[i] + " ";
 		}
 
@@ -48,11 +63,9 @@ boost::process::child ExecuteAsync(std::string cmd, bool printOutput)
 
 		return c;
 	}
-	catch (const std::exception&)
-	{
+	catch (const std::exception&) {
 		return boost::process::child();
 	}
 
 	return boost::process::child();
 }
-

dcc_client/dcc_client/System.h

@@ -1,30 +1,31 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#include <string>
-#include <cctype>
-#include <locale>
 #include <array>
+#include <boost/process.hpp>
+#include <cctype>
+#include <cstdio>
 #include <iostream>
+#include <locale>
+#include <string>
 
-#include <boost/process.hpp>
 #if defined(_MSC_VER)
-#include <boost/process/windows.hpp>
+	#include <boost/process/windows.hpp>
 #endif
 
 #include "strops.h"
 
-std::string ExecuteCommand(const char* cmd, bool printout=true);
+std::string ExecuteCommand(const char* cmd, bool printout = true);
 boost::process::child ExecuteAsync(std::string cmd, bool printOutput);
+std::string GetStdoutFromCommand(std::string cmd);
 
-template <
+template<
 	class result_t = std::chrono::milliseconds,
 	class clock_t = std::chrono::steady_clock,
-	class duration_t = std::chrono::milliseconds
->
+	class duration_t = std::chrono::milliseconds>
 auto since(std::chrono::time_point<clock_t, duration_t> const& start)
 {
 	return std::chrono::duration_cast<result_t>(clock_t::now() - start);
 }
 
-#endif
+#endif