Skip to content
Snippets Groups Projects
Commit 2a3c41cd authored by Mathieu Valois's avatar Mathieu Valois
Browse files

Implement OpenMP for loop

parent 191c5e82
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 3
− 4
View file @ 2a3c41cd
# Version de cmake demandée.
cmake_minimum_required(VERSION 2.8)
find_package(Threads REQUIRED)
find_package(OpenMP)
# Chemin des répertoires contenant les fichiers entêtes.
include_directories(include)
......@@ -10,8 +10,7 @@ include_directories(include)
set(EXECUTABLE_OUTPUT_PATH bin/${CMAKE_BUILD_TYPE})
# Option du compilateur pour supporter C 2011.
set(CMAKE_CXX_FLAGS "-pedantic -Wall -std=c++11 -Wextra -O3")
set(CMAKE_LD_FLAGS "-lpthread")
set(CMAKE_CXX_FLAGS "-pedantic -Wall -std=c++11 -Wextra -O3 -fopenmp")
add_executable(cppack
src/core/Statsgen.cpp
......
include/MainWindow.h
+ 3
− 10
View file @ 2a3c41cd
......@@ -26,21 +26,14 @@ class ProgressThread : public QThread
{
Q_OBJECT
void run() {
unsigned int progress = 0;
uint64_t processed = 0;
const std::vector<ThreadData>& td = _s.getThreadsData();
int progress = 0;
while(!_s.allStarted()){
msleep(500);
}
const uint64_t nblines = td.back().lineEnd;
const uint64_t nblines = _s.getNbLines();
while(!_s.allFinished()){
processed = 0;
for(ThreadData t : td){
processed += t.total_counter;
}
progress = (int) percentage(processed, nblines);
progress = (int) percentage(_s.getProcessed(), nblines);
_qpb.setValue(progress);
msleep(500);
}
......
include/Statsgen.h
+ 14
− 29
View file @ 2a3c41cd
......@@ -17,13 +17,15 @@
#include <string>
#include <iostream>
#include <thread>
#include "Policy.h"
#include "SecurityRules.h"
#include "ThreadData.h"
#pragma omp declare reduction(dataSum: ThreadData : omp_out += omp_in ) initializer(omp_priv(omp_orig))
struct PasswordStats {
int pass_length = 0;
std::string advancedmask_string = "";
......@@ -86,14 +88,7 @@ public:
* @brief Number of threads the user wants to use
* @param nb: number of usable threads
*/
inline void setNbThread(const int& nb) {
int max = std::thread::hardware_concurrency();
if (nb > max) {
nbThread = max;
} else {
nbThread = nb;
}
}
inline void setNbThread(const int& nb) { nbThread = nb; }
void configureThread(ThreadData& td) const;
......@@ -128,35 +123,21 @@ public:
*/
void print_stats();
inline uint64_t getTotalCounter() const { return td[0].total_counter; }
inline uint64_t getTotalFilter() const { return td[0].total_filter; }
inline uint64_t getNbSecurePasswords() const { return td[0].sr.nbSecurePassword; }
inline int getNbThreads() const { return nbThread; }
inline const IntOccurrence& getStatsLength() const { return td[0].length; }
inline const StringOccurrence& getStatsCharsets() const { return td[0].charactersets; }
inline const StringOccurrence& getStatsSimple() const { return td[0].simplemasks; }
inline const StringOccurrence& getStatsAdvanced() const { return td[0].advancedmasks; }
inline const std::vector<ThreadData>& getThreadsData() const { return td; }
inline bool allFinished() const { return finished == nbThread; }
inline uint64_t getNbLines() const { return nblines; }
inline uint64_t getProcessed() const { return processed; }
inline const ThreadData& getResults() const { return results; }
inline bool allFinished() const { return finished; }
inline bool allStarted() const { return started; }
bool operator==(const Statsgen& other) const;
/**
* @brief Given parameters in threadarg, compute statistics on partition of the file
* @param threadarg : parameters and result storage
*/
static void* generate_stats_thread(void * threadarg);
void handle_password(const std::string& password, const uint64_t& nbPasswords, ThreadData& td) const;
private:
std::string filename;
// results of the computation
ThreadData results;
// Data computed from within a thread, for read-accessibility
std::vector<ThreadData> td;
// Filters
int hiderare = 0; // Hide low statistics
int top = 10; // Show only a top of statistics
std::regex current_regex; // Regex for the interesting passwords
......@@ -171,8 +152,12 @@ private:
// Security policy
SecurityRules _sr = { 0, 8, 0, 1, 1, 1 };
// threads which have finished
uint finished = 0;
// nb lines processed
uint64_t nblines = 0;
// nb lines processed
uint64_t processed = 0;
// all threads have finished
uint finished = false;
// all threads have been started
bool started = false;
};
......
src/core/Statsgen.cpp
+ 24
− 81
View file @ 2a3c41cd
......@@ -14,7 +14,7 @@
#include <fstream>
#include <iomanip>
#include <algorithm>
#include <thread>
#include <omp.h>
#include "Statsgen.h"
......@@ -58,62 +58,36 @@ void Statsgen::configureThread(ThreadData& td) const {
}
int Statsgen::generate_stats() {
td = vector<ThreadData>(nbThread);
processed = 0;
finished = false;
results = ThreadData();
finished = 0;
started = false;
uint64_t nbline = 0;
nbline = nbline_file(filename);
if (!nbline){ // error reading the file
configureThread(results);
omp_set_num_threads(nbThread);
nblines = nbline_file(filename);
if (!nblines){ // error reading the file
cerr << "[ERROR] Empty file or not existing file" << endl;
return 0;
}
started = true;
#pragma omp parallel
{
#pragma omp single
{
nbThread = omp_get_num_threads();
}
ifstream inputfile(filename);
string line;
for(uint numline = 0; numline < nbline; ++numline){
#pragma omp for schedule(dynamic) private(line) reduction(dataSum:results)
for(uint numline = 0; numline < nblines; ++numline){
getline(inputfile, line);
handle_password(line, 1, results);
#pragma omp atomic
++processed;
}
}
// vector<pthread_t> threads(nbThread);
// for(uint i = 0; i < nbThread; i++ ) {
// td[i].thread_id = i + 1;
// configureThread(td[i]);
// if(i == 0){
// td[i].lineBegin = 0;
// }
// else{
// td[i].lineBegin = td[i-1].lineEnd + 1;
// }
// td[i].lineEnd = (i+1)*nbline/nbThread;
// if(debug_enabled){
// cerr << "[DEBUG] " << "Thread " << td[i].thread_id << " analyse : " << td[i].lineBegin << " --> " << td[i].lineEnd << endl;
// }
// int rc = pthread_create(&threads[i], NULL, generate_stats_thread, (void *)&td[i] );
// if (rc) {
// cerr << "[ERROR] unable to create thread," << rc << endl;
// exit(-1);
// }
// }
// started = true;
// void *status;
// for(uint i = 0; i < nbThread; i++ ) {
// int rc = pthread_join(threads[i], &status);
// if (rc) {
// cerr << "[ERROR] unable to join," << rc << endl;
// exit(-1);
// }
// results += td[i];
// finished++;
// }
finished = true;
if (!results.total_counter) {
cerr << "[ERROR] Empty file or not existing file" << endl;
......@@ -267,37 +241,6 @@ void Statsgen::handle_password(const string& password, const uint64_t& nbPasswor
my_data.minMaxValue.updateMinMax(c.pol);
}
// void* Statsgen::generate_stats_thread(void* threadarg) {
// ThreadData* my_data = (ThreadData *) threadarg;
// ifstream readfile(my_data->filename);
// uint64_t nbline = 0;
// string line;
// string password;
// uint64_t nbPasswords;
// while(getline(readfile, line)){
// ++nbline;
// if (nbline < my_data->lineBegin){ continue; }
// if (nbline > my_data->lineEnd){ break; }
// if (line.size() == 0){ continue; }
// if (my_data->withcount) {
// istringstream is(line);
// is >> nbPasswords;
// is >> password;
// }
// else {
// nbPasswords = 1;
// password = line;
// }
// handle_password(password, nbPasswords, my_data);
// }
// readfile.close();
// pthread_exit(NULL);
// }
bool Statsgen::operator==(const Statsgen& o) const {
return results == o.results;
}
......
src/gui/MainWindow.cpp
+ 11
− 10
View file @ 2a3c41cd
......@@ -156,13 +156,14 @@ void MainWindow::disableWithCount()
}
double MainWindow::initGraphicalStats(QBarSeries * barLength, QPieSeries * pieCharset, QPieSeries* pieSimple, QPieSeries* pieAdvanced, double & percentageTotal, double & percentageSecurity) {
double total = stats.getTotalCounter();
double filter = stats.getTotalFilter();
const ThreadData& results = stats.getResults();
double total = results.total_counter;
double filter = results.total_filter;
percentageTotal = percentage(filter, total);
percentageSecurity = percentage(stats.getNbSecurePasswords(), total);
percentageSecurity = percentage(results.sr.nbSecurePassword, total);
/* LENGTH HISTOGRAM */
map<uint64_t, int, greater<uint64_t>> reverseL = flip_map<int>(stats.getStatsLength());
map<uint64_t, int, greater<uint64_t>> reverseL = flip_map<int>(results.length);
double percentageL;
double maxPercLength = 0;
uint64_t nbHideL = 0;
......@@ -187,7 +188,7 @@ double MainWindow::initGraphicalStats(QBarSeries * barLength, QPieSeries * pieCh
/* CHARSET PIECHART */
map<uint64_t, string, greater<uint64_t>> reverseC = flip_map(stats.getStatsCharsets());
map<uint64_t, string, greater<uint64_t>> reverseC = flip_map(results.charactersets);
uint64_t top = 0;
uint64_t nbHideC = 0;
pieCharset->clear();
......@@ -203,7 +204,7 @@ double MainWindow::initGraphicalStats(QBarSeries * barLength, QPieSeries * pieCh
pieCharset->append("Other charsets", nbHideC);
/* SIMPLE PIECHART */
map<uint64_t, string, greater<uint64_t>> reverseS = flip_map(stats.getStatsSimple());
map<uint64_t, string, greater<uint64_t>> reverseS = flip_map(results.simplemasks);
uint64_t top_simple = 0;
uint64_t nbHideS = 0;
pieSimple->clear();
......@@ -219,7 +220,7 @@ double MainWindow::initGraphicalStats(QBarSeries * barLength, QPieSeries * pieCh
pieSimple->append("Other Masks", nbHideS);
/* ADVANCED PIECHART */
map<uint64_t, string, greater<uint64_t>> reverseA = flip_map(stats.getStatsAdvanced());
map<uint64_t, string, greater<uint64_t>> reverseA = flip_map(results.advancedmasks);
uint64_t top_advanced = 0;
uint64_t nbHideA = 0;
pieAdvanced->clear();
......@@ -261,7 +262,7 @@ QVBoxLayout* MainWindow::drawPieChart(QPieSeries* qps, QVBoxLayout* layout, cons
void MainWindow::handleResults()
{
const ThreadData& results = stats.getResults();
progressThread->terminate();
progressThread->wait();
ui->progressBar->setValue(100);
......@@ -313,9 +314,9 @@ void MainWindow::handleResults()
/* LABELS */
ui->AnalyzedLabel->setText("Number of analyzed passwords: "
+ QString::number(stats.getTotalFilter(), 'g', 2)
+ QString::number(results.total_filter, 'g', 2)
+ " on a total of "
+ QString::number(stats.getTotalFilter(), 'g', 2)
+ QString::number(results.total_counter, 'g', 2)
+ " passwords (" + QString::number(percentageTotal) + "%)");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment