From b8d4ff1a588133cec26a2522f0c54cf6d703a77c Mon Sep 17 00:00:00 2001 From: Charlie Noyce Root Date: Fri, 17 Jan 2014 02:17:41 +0100 Subject: [PATCH] Revert "Multi-thread grades generation" This reverts commit 2e5b2af4d830d36c278983f3e80721e6d7c93c5e. --- process/files/intradata_get.pl | 36 +++------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/process/files/intradata_get.pl b/process/files/intradata_get.pl index 6ca8ca3..e68f333 100644 --- a/process/files/intradata_get.pl +++ b/process/files/intradata_get.pl @@ -2,7 +2,6 @@ use v5.10.1; use strict; -use threads; use warnings; use Carp; use Pod::Usage; @@ -99,38 +98,7 @@ sub grades_generate my @trace_dirs = grep { ( ! /^\./ ) && -d "$basedir/$year/$project_id/traces/$_" } readdir($dh); closedir $dh; - my @ths; - my $max_ths = 4; - my $login_by_threads = @logins / $max_ths; - - for (my $i = 0; $i < $max_ths; $i++) - { - my @partlogin = @logins[($i*$login_by_threads) .. (($i+1)*$login_by_threads - 1)]; - push @ths, threads->create(\&do_grade_generation, $grading, $year, $project_id, $groups, \@trace_dirs, @partlogin); - } - - if ($login_by_threads * $max_ths < @logins) - { - my @partlogin = @logins[$login_by_threads * $max_ths .. $#logins]; - push @ths, threads->create(\&do_grade_generation, $grading, $year, $project_id, $groups, \@trace_dirs, @partlogin); - } - - for my $th (@ths) { - $th->join(); - } - - return 1; -} - -sub do_grade_generation -{ - my $grading = shift; - my $year = shift; - my $project_id = shift; - my $groups = shift; - my @trace_dirs = @{ shift() }; - - for my $login (@_) + for my $login (@logins) { my @files; @@ -189,6 +157,8 @@ sub do_grade_generation $grading->reset(); } + + return 1; } sub grades_new_bonus