[med-svn] [SCM] aghermann branch, master, updated. 3b87b4f8039ed683022537a0599b7dea069974d2

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 3f09d57c85e2737f1edf525b076f9e4e4a0b936f
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Sep 30 21:24:26 2012 +0300

    run report fun before op fun in for_all_*

diff --git a/src/expdesign/primaries.cc b/src/expdesign/primaries.cc
index 49dc385..a507c11 100644
--- a/src/expdesign/primaries.cc
+++ b/src/expdesign/primaries.cc
@@ -128,12 +128,12 @@ for_all_subjects( const TSubjectOpFun& F, const TSubjectReportFun& report, const
 	size_t global_i = 0;
 #pragma omp parallel for
 	for ( size_t i = 0; i < v.size(); ++i ) {
-		F( *get<1>(v[i]));
 #pragma omp critical
 		{
 			report( *get<0>(v[i]), *get<1>(v[i]),
 				++global_i, v.size());
 		}
+		F( *get<1>(v[i]));
 	}
 }
 
@@ -155,12 +155,12 @@ for_all_episodes( const TEpisodeOpFun& F, const TEpisodeReportFun& report, const
 	size_t global_i = 0;
 #pragma omp parallel for
 	for ( size_t i = 0; i < v.size(); ++i ) {
-		F( *get<3>(v[i]));
 #pragma omp critical
 		{
 			report( *get<0>(v[i]), *get<1>(v[i]), *get<2>(v[i]), *get<3>(v[i]),
 				++global_i, v.size());
 		}
+		F( *get<3>(v[i]));
 	}
 }
 
@@ -184,12 +184,13 @@ for_all_recordings( const TRecordingOpFun& F, const TRecordingReportFun& report,
 	size_t global_i = 0;
 #pragma omp parallel for
 	for ( size_t i = 0; i < v.size(); ++i ) {
-		F( *get<4>(v[i]));
 #pragma omp critical
 		{
 			report( *get<0>(v[i]), *get<1>(v[i]), *get<2>(v[i]), *get<3>(v[i]), *get<4>(v[i]),
 				++global_i, v.size());
 		}
+		F( *get<4>(v[i]));
+	}
 }
 
 void
diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index dc21072..e3fed0a 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -113,7 +113,7 @@ const char version_string[8]  = {'0',' ',' ',' ', ' ',' ',' ',' '};
 }
 
 sigfile::CEDFFile::
-CEDFFile( const char *fname_, int flags_)
+CEDFFile (const char *fname_, int flags_)
       : CSource_base (fname_, flags_)
 {
 	{
@@ -214,7 +214,7 @@ CEDFFile( const char *fname_, int flags_)
 
 
 sigfile::CEDFFile::
-CEDFFile( const char *fname_, int flags_,
+CEDFFile (const char *fname_, int flags_,
 	  const list<pair<string, size_t>>& channels_,
 	  size_t data_record_size_,
 	  size_t n_data_records_)
@@ -346,7 +346,7 @@ resize( size_t new_records)
 
 
 sigfile::CEDFFile::
-CEDFFile( CEDFFile&& rv)
+CEDFFile (CEDFFile&& rv)
       : CSource_base (move(rv))
 {
 	header = rv.header; // no need to re-layout as we don't mremap
@@ -375,7 +375,7 @@ CEDFFile( CEDFFile&& rv)
 
 
 sigfile::CEDFFile::
-~CEDFFile()
+~CEDFFile ()
 {
 	if ( _mmapping != (void*)-1 ) {
 		munmap( _mmapping, _fsize);

-- 
Sleep experiment manager