From c4c53a68d61b8a8451b5a95f96839ce02247a300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 17 Apr 2017 12:52:08 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@384 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/console/piconsole.cpp | 2 +- src/console/piterminal.cpp | 2 +- src/core/piincludes.cpp | 5 +++++ src/core/piincludes.h | 2 ++ src/io/pibasetransfer.cpp | 3 +-- src/io/pifiletransfer.cpp | 2 +- src/io/pipeer.cpp | 4 ++-- src/math/pimathbase.cpp | 8 +------- src/math/pimathbase.h | 3 --- src/system/piintrospection.cpp | 3 +-- utils/system_daemon/daemon.cpp | 2 +- 11 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/console/piconsole.cpp b/src/console/piconsole.cpp index 138ecc12..b0b12781 100644 --- a/src/console/piconsole.cpp +++ b/src/console/piconsole.cpp @@ -908,7 +908,7 @@ void PIConsole::listenServers() { server_mode = false; server_name.clear(); randomize(); - peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(rand())); + peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(randomi())); CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived); peer_timer->start(100.); } diff --git a/src/console/piterminal.cpp b/src/console/piterminal.cpp index 5933ec02..76c1037d 100644 --- a/src/console/piterminal.cpp +++ b/src/console/piterminal.cpp @@ -747,7 +747,7 @@ bool PITerminal::initialize() { memset(&PRIVATE->pi, 0, sizeof(PRIVATE->pi)); - PIString shmh = PIString::fromNumber(rand() % 10000); + PIString shmh = PIString::fromNumber(randomi() % 10000); PIString pname = "\\\\.\\pipe\\piterm" + shmh; PIString cmd = "piterminal \"" + shmh + "\" \"" + pname + "\""; if(!CreateProcessA(0, (LPSTR)cmd.dataAscii(), 0, 0, false, CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP, 0, 0, &PRIVATE->si, &PRIVATE->pi)) { diff --git a/src/core/piincludes.cpp b/src/core/piincludes.cpp index 8af9afcb..5beeec50 100755 --- a/src/core/piincludes.cpp +++ b/src/core/piincludes.cpp @@ -252,3 +252,8 @@ int main(int argc, char * argv[]) { void piqsort(void * base, size_t num, size_t size, int (*compar)(const void *, const void *)) { qsort(base, num, size, compar); } + + +int randomi() { + return rand(); +} diff --git a/src/core/piincludes.h b/src/core/piincludes.h index 461c9297..a3ef6131 100755 --- a/src/core/piincludes.h +++ b/src/core/piincludes.h @@ -48,6 +48,8 @@ void errorClear(); void piqsort(void* base, size_t num, size_t size, int (*compar)(const void*,const void*)); +int randomi(); + /// Return readable version of PIP PIString PIPVersion(); diff --git a/src/io/pibasetransfer.cpp b/src/io/pibasetransfer.cpp index af1c73de..24dfa5f5 100644 --- a/src/io/pibasetransfer.cpp +++ b/src/io/pibasetransfer.cpp @@ -1,5 +1,4 @@ #include "pibasetransfer.h" -#include "piincludes_p.h" const uint PIBaseTransfer::signature = 0x54424950; @@ -352,7 +351,7 @@ void PIBaseTransfer::buildSession(PIVector parts) { mutex_header.lock(); state_string = "calculating parts ... "; session.clear(); - header.session_id = rand(); + header.session_id = randomi(); bytes_all = 0; Part fi; int fi_index, fi_prts; diff --git a/src/io/pifiletransfer.cpp b/src/io/pifiletransfer.cpp index f5a3adbd..dbc22275 100644 --- a/src/io/pifiletransfer.cpp +++ b/src/io/pifiletransfer.cpp @@ -79,7 +79,7 @@ bool PIFileTransfer::sendFiles(const PIVector &files) { // piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name(); } randomize(); - pftheader.session_id = rand(); + pftheader.session_id = randomi(); sendFilesStarted(); cur_file_string = "build session"; desc.clear(); diff --git a/src/io/pipeer.cpp b/src/io/pipeer.cpp index 7be359a3..0f48b1d3 100755 --- a/src/io/pipeer.cpp +++ b/src/io/pipeer.cpp @@ -149,7 +149,7 @@ PIPeer::PIPeer(const PIString & n): PIIODevice(), inited__(false), eth_tcp_srv(P self_info.time = PISystemTime::current(); //joinMulticastGroup("239.240.241.242"); randomize(); - //id_ = self_info.name + "_" + PIString::fromNumber(rand()); + //id_ = self_info.name + "_" + PIString::fromNumber(randomi()); CONNECTU(&sync_timer, tickEvent, this, timerEvent); prev_ifaces = PIEthernet::interfaces(); no_timer = false; @@ -912,7 +912,7 @@ void PIPeer::reinit() { void PIPeer::changeName(const PIString &new_name) { PIString name_ = new_name; - if (name_.isEmpty()) name_ = "rnd_" + PIString::fromNumber(random() % 1000); + if (name_.isEmpty()) name_ = "rnd_" + PIString::fromNumber(randomi() % 1000); setName(name_); self_info.name = name_; diag_d.setName(name_+"_data"); diff --git a/src/math/pimathbase.cpp b/src/math/pimathbase.cpp index 89fa212f..cc501b64 100644 --- a/src/math/pimathbase.cpp +++ b/src/math/pimathbase.cpp @@ -476,11 +476,5 @@ double randomn(double dv, double sv) { double randomd() { - return (double) -#ifdef QNX - rand() -#else - random() -#endif - / RAND_MAX * 2. - 1.; + return (double) randomi() / RAND_MAX * 2. - 1.; } diff --git a/src/math/pimathbase.h b/src/math/pimathbase.h index a6c5c9fe..735f4f1d 100644 --- a/src/math/pimathbase.h +++ b/src/math/pimathbase.h @@ -89,9 +89,6 @@ #ifndef M_GRAVITY_CONST # define M_GRAVITY_CONST 398600.4418e9; #endif -#ifdef WINDOWS - inline int random() {return rand();} -#endif using std::complex; diff --git a/src/system/piintrospection.cpp b/src/system/piintrospection.cpp index af4481c3..6257966c 100644 --- a/src/system/piintrospection.cpp +++ b/src/system/piintrospection.cpp @@ -19,7 +19,6 @@ #include "piintrospection.h" #include "pisysteminfo.h" -#include PIIntrospectionContainers::PIIntrospectionContainers() { @@ -105,7 +104,7 @@ PIIntrospectionServer::PIIntrospectionServer(): PIPeer(genName()) { PIString PIIntrospectionServer::genName() { randomize(); - return "__introspection__server_" + PIString::fromNumber(rand() % 1000); + return "__introspection__server_" + PIString::fromNumber(randomi() % 1000); } diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp index 328890fb..13b2cc6a 100644 --- a/utils/system_daemon/daemon.cpp +++ b/utils/system_daemon/daemon.cpp @@ -254,7 +254,7 @@ void Daemon::TileFileProgress::tileEvent(PIScreenTile * t, TileEvent e) { -Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)) { +Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(randomi() % 100)) { // setName("Daemon"); dtimer.setName("__S__Daemon_timer"); mode = rmNone;