Skip to content

Move the LogType check inside WriteStats #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tueda merged 1 commit into from
Mar 15, 2024
Merged

Move the LogType check inside WriteStats #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sources/declare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ extern WORD WriteExpression(WORD *,LONG);
extern WORD WriteInnerTerm(WORD *,WORD);
extern VOID WriteLists(VOID);
extern VOID WriteSetup(VOID);
extern VOID WriteStats(POSITION *,WORD);
extern VOID WriteStats(POSITION *,WORD,WORD);
extern WORD WriteSubTerm(WORD *,WORD);
extern WORD WriteTerm(WORD *,WORD *,WORD,WORD,WORD);
extern WORD execarg(PHEAD WORD *,WORD);
Expand Down
12 changes: 12 additions & 0 deletions sources/ftypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,18 @@ typedef int (*TFUN1)();
#define SORTPOWERFIRST 2
#define SORTANTIPOWER 3

/* These control the output of WriteStats. The different sort
* types have differently formatted stats. These variables should
* not have arbitrary values since they are also used as array
* indices by WriteStats. */
#define STATSSPLITMERGE 0
#define STATSMERGETOFILE 1
#define STATSPOSTSORT 2
/* CHECKLOGTYPE implies that statistics will not be printed in
* the log file if AM.LogType = 1 (when running with -ll or -F). */
#define NOCHECKLOGTYPE 0
#define CHECKLOGTYPE 1

#define NMIN4SHIFT 4
/*
The next are the main codes.
Expand Down
2 changes: 1 addition & 1 deletion sources/parallel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ int PF_Processor(EXPRESSIONS e, WORD i, WORD LastExpression)
genterms += PF_stats[k][3];
}
AT.SS->GenTerms = genterms;
WriteStats(&PF_exprsize, 2);
WriteStats(&PF_exprsize, STATSPOSTSORT, NOCHECKLOGTYPE);
Expressions[AR.CurExpr].size = PF_exprsize;
}
PF_Statistics(PF_stats,0);
Expand Down
88 changes: 45 additions & 43 deletions sources/sort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ LONG numcompares;
/*
#] Includes :
#[ SortUtilities :
#[ WriteStats : VOID WriteStats(lspace,par)
#[ WriteStats : VOID WriteStats(lspace,par,checkLogType)
*/

char *toterms[] = { " ", " >>", "-->" };
Expand All @@ -81,16 +81,18 @@ char *toterms[] = { " ", " >>", "-->" };
*
* @param plspace The size in bytes currently occupied
* @param par
* par = 0 after a splitmerge.
* par = 1 after merge to sortfile.
* par = 2 after the sort
* par = 0 = STATSSPLITMERGE after a splitmerge.
* par = 1 = STATSMERGETOFILE after merge to sortfile.
* par = 2 = STATSPOSTSORT after the sort
* @param checkLogType == CHECKLOGTYPE: The output should not
* go to the log file if AM.LogType is 1.
*
* current expression is to be found in AR.CurExpr.
* terms are in S->TermsLeft.
* S->GenTerms.
*/

VOID WriteStats(POSITION *plspace, WORD par)
VOID WriteStats(POSITION *plspace, WORD par, WORD checkLogType)
{
GETIDENTITY
LONG millitime, y = 0x7FFFFFFFL >> 1;
Expand All @@ -107,15 +109,25 @@ VOID WriteStats(POSITION *plspace, WORD par)
#endif
if ( Expressions == 0 ) return;

if ( par == 0 ) {
if ( par == STATSSPLITMERGE ) {
if ( AC.ShortStatsMax == 0 ) return;
AR.ShortSortCount++;
if ( AR.ShortSortCount < AC.ShortStatsMax ) return;
}
AR.ShortSortCount = 0;

S = AT.SS;

MLOCK(ErrorMessageLock);

/* If the statistics should not go to the log file, temporarily hide the
* LogHandle. This must be done within the ErrorMessageLock region to
* avoid a data race between threads. */
const WORD oldLogHandle = AC.LogHandle;
if ( checkLogType && AM.LogType ) {
AC.LogHandle = -1;
}

if ( AC.ShortStats ) {}
else {
#ifdef WITHPTHREADS
Expand Down Expand Up @@ -160,7 +172,7 @@ VOID WriteStats(POSITION *plspace, WORD par)
if ( PF.me != MASTER ) {
const int identity = PF.me;
#endif
if ( par == 0 || par == 2 ) {
if ( par == STATSSPLITMERGE || par == STATSPOSTSORT ) {
SETBASEPOSITION(pp,y);
if ( ISLESSPOS(*plspace,pp) ) {
MesPrint("%d: %7l.%2is %8l>%10l%3s%10l:%10p %s %s",identity,
Expand Down Expand Up @@ -227,7 +239,7 @@ VOID WriteStats(POSITION *plspace, WORD par)
}
}
}
else if ( par == 1 ) {
else if ( par == STATSMERGETOFILE ) {
SETBASEPOSITION(pp,y);
if ( ISLESSPOS(*plspace,pp) ) {
MesPrint("%d: %7l.%2is %10l:%10p",identity,millitime,timepart,
Expand Down Expand Up @@ -283,7 +295,7 @@ VOID WriteStats(POSITION *plspace, WORD par)
} } else
#endif
{
if ( par == 0 || par == 2 ) {
if ( par == STATSSPLITMERGE || par == STATSPOSTSORT ) {
SETBASEPOSITION(pp,y);
if ( ISLESSPOS(*plspace,pp) ) {
MesPrint("%7l.%2is %8l>%10l%3s%10l:%10p %s %s",
Expand Down Expand Up @@ -350,7 +362,7 @@ VOID WriteStats(POSITION *plspace, WORD par)
}
}
}
else if ( par == 1 ) {
else if ( par == STATSMERGETOFILE ) {
SETBASEPOSITION(pp,y);
if ( ISLESSPOS(*plspace,pp) ) {
MesPrint("%7l.%2is %10l:%10p",millitime,timepart,
Expand Down Expand Up @@ -406,7 +418,7 @@ VOID WriteStats(POSITION *plspace, WORD par)
}
} }
else {
if ( par == 1 ) {
if ( par == STATSMERGETOFILE ) {
if ( use_wtime ) {
MesPrint("WTime = %7l.%2i sec",millitime,timepart);
}
Expand Down Expand Up @@ -448,7 +460,7 @@ VOID WriteStats(POSITION *plspace, WORD par)
#endif
}
#if ( BITSINLONG > 32 )
if ( par == 0 )
if ( par == STATSSPLITMERGE )
if ( S->TermsLeft >= 10000000000L ) {
MesPrint("%16s%8l Terms %s = %16l",EXPRNAME(AR.CurExpr),
AN.ninterms,FG.swmes[par],S->TermsLeft);
Expand All @@ -460,13 +472,13 @@ VOID WriteStats(POSITION *plspace, WORD par)
else {
if ( S->TermsLeft >= 10000000000L ) {
#ifdef WITHPTHREADS
if ( identity > 0 && par == 2 ) {
if ( identity > 0 && par == STATSPOSTSORT ) {
MesPrint("%16s Terms in thread = %16l",
EXPRNAME(AR.CurExpr),S->TermsLeft);
}
else
#elif defined(WITHMPI)
if ( PF.me != MASTER && par == 2 ) {
if ( PF.me != MASTER && par == STATSPOSTSORT ) {
MesPrint("%16s Terms in process= %16l",
EXPRNAME(AR.CurExpr),S->TermsLeft);
}
Expand All @@ -479,13 +491,13 @@ VOID WriteStats(POSITION *plspace, WORD par)
}
else {
#ifdef WITHPTHREADS
if ( identity > 0 && par == 2 ) {
if ( identity > 0 && par == STATSPOSTSORT ) {
MesPrint("%16s Terms in thread = %10l",
EXPRNAME(AR.CurExpr),S->TermsLeft);
}
else
#elif defined(WITHMPI)
if ( PF.me != MASTER && par == 2 ) {
if ( PF.me != MASTER && par == STATSPOSTSORT ) {
MesPrint("%16s Terms in process= %10l",
EXPRNAME(AR.CurExpr),S->TermsLeft);
}
Expand All @@ -498,18 +510,18 @@ VOID WriteStats(POSITION *plspace, WORD par)
}
}
#else
if ( par == 0 )
if ( par == STATSSPLITMERGE )
MesPrint("%16s%8l Terms %s = %10l",EXPRNAME(AR.CurExpr),
AN.ninterms,FG.swmes[par],S->TermsLeft);
else {
#ifdef WITHPTHREADS
if ( identity > 0 && par == 2 ) {
if ( identity > 0 && par == STATSPOSTSORT ) {
MesPrint("%16s Terms in thread = %10l",
EXPRNAME(AR.CurExpr),S->TermsLeft);
}
else
#elif defined(WITHMPI)
if ( PF.me != MASTER && par == 2 ) {
if ( PF.me != MASTER && par == STATSPOSTSORT ) {
MesPrint("%16s Terms in process= %10l",
EXPRNAME(AR.CurExpr),S->TermsLeft);
}
Expand Down Expand Up @@ -571,6 +583,10 @@ VOID WriteStats(POSITION *plspace, WORD par)
MesPrint("Total number of mallocs: %l, frees: %l"
,nummallocs,numfrees);
#endif
/* Put back the original LogHandle, it was changed if the statistics were
* not printed in the log file. */
AC.LogHandle = oldLogHandle;

MUNLOCK(ErrorMessageLock);
}
}
Expand Down Expand Up @@ -829,7 +845,7 @@ LONG EndSort(PHEAD WORD *buffer, int par)
#endif
DIFPOS(oldpos,position,oldpos);
S->SpaceLeft = BASEPOSITION(oldpos);
WriteStats(&oldpos,(WORD)2);
WriteStats(&oldpos,STATSPOSTSORT,NOCHECKLOGTYPE);
pp = oldpos;
goto RetRetval;
}
Expand All @@ -845,11 +861,9 @@ LONG EndSort(PHEAD WORD *buffer, int par)
ADD2POS(pp,S->fPatches[S->fPatchN]);
}
if ( S == AT.S0 ) {
WORD oldLogHandle = AC.LogHandle;
if ( AC.LogHandle >= 0 && AM.LogType && ( ( S->lPatch > 0 )
|| S->file.handle >= 0 ) ) AC.LogHandle = -1;
if ( S->lPatch > 0 || S->file.handle >= 0 ) { WriteStats(&pp,0); }
AC.LogHandle = oldLogHandle;
if ( S->lPatch > 0 || S->file.handle >= 0 ) {
WriteStats(&pp,STATSSPLITMERGE,CHECKLOGTYPE);
}
}
if ( par == 2 ) { AR.outfile = newout = AllocFileHandle(0,(char *)0); }
if ( S->lPatch > 0 ) {
Expand Down Expand Up @@ -878,15 +892,12 @@ LONG EndSort(PHEAD WORD *buffer, int par)
if ( S == AT.S0 )
#endif
{
WORD oldLogHandle = AC.LogHandle;
POSITION pppp;
SETBASEPOSITION(pppp,0);
SeekFile(S->file.handle,&pppp,SEEK_CUR);
SeekFile(S->file.handle,&pp,SEEK_END);
SeekFile(S->file.handle,&pppp,SEEK_SET);
if ( AC.LogHandle >= 0 && AM.LogType ) AC.LogHandle = -1;
WriteStats(&pp,(WORD)1);
AC.LogHandle = oldLogHandle;
WriteStats(&pp,STATSMERGETOFILE,CHECKLOGTYPE);
UpdateMaxSize();
}
}
Expand Down Expand Up @@ -916,7 +927,7 @@ LONG EndSort(PHEAD WORD *buffer, int par)
#ifdef WITHPTHREADS
if ( AS.MasterSort && ( fout == AR.outfile ) ) goto RetRetval;
#endif
WriteStats(&pp,2);
WriteStats(&pp,STATSPOSTSORT,NOCHECKLOGTYPE);
UpdateMaxSize();
}
else {
Expand Down Expand Up @@ -996,15 +1007,12 @@ LONG EndSort(PHEAD WORD *buffer, int par)
if ( S == AT.S0 )
#endif
{
WORD oldLogHandle = AC.LogHandle;
POSITION pppp;
SETBASEPOSITION(pppp,0);
SeekFile(S->file.handle,&pppp,SEEK_CUR);
SeekFile(S->file.handle,&pp,SEEK_END);
SeekFile(S->file.handle,&pppp,SEEK_SET);
if ( AC.LogHandle >= 0 && AM.LogType ) AC.LogHandle = -1;
WriteStats(&pp,(WORD)1);
AC.LogHandle = oldLogHandle;
WriteStats(&pp,STATSMERGETOFILE,CHECKLOGTYPE);
}
#ifdef WITHERRORXXX
if ( S != AT.S0 ) {
Expand Down Expand Up @@ -1085,7 +1093,7 @@ LONG EndSort(PHEAD WORD *buffer, int par)
#endif
pp = S->SizeInFile[0];
MULPOS(pp,sizeof(WORD));
WriteStats(&pp,2);
WriteStats(&pp,STATSPOSTSORT,NOCHECKLOGTYPE);
UpdateMaxSize();
}
RetRetval:
Expand Down Expand Up @@ -4438,10 +4446,7 @@ WORD StoreTerm(PHEAD WORD *term)
ADD2POS(pp,S->fPatches[S->fPatchN]);
}
if ( S == AT.S0 ) { /* Only statistics at ground level */
WORD oldLogHandle = AC.LogHandle;
if ( AC.LogHandle >= 0 && AM.LogType ) AC.LogHandle = -1;
WriteStats(&pp,(WORD)0);
AC.LogHandle = oldLogHandle;
WriteStats(&pp,STATSSPLITMERGE,CHECKLOGTYPE);
}
if ( ( S->lPatch >= S->MaxPatches ) ||
( ( (WORD *)(((UBYTE *)(S->lFill + sSpace)) + 2*AM.MaxTer ) ) >= S->lTop ) ) {
Expand All @@ -4459,10 +4464,7 @@ WORD StoreTerm(PHEAD WORD *term)
ADD2POS(pp,S->fPatches[S->fPatchN]);

if ( S == AT.S0 ) { /* Only statistics at ground level */
WORD oldLogHandle = AC.LogHandle;
if ( AC.LogHandle >= 0 && AM.LogType ) AC.LogHandle = -1;
WriteStats(&pp,(WORD)1);
AC.LogHandle = oldLogHandle;
WriteStats(&pp,STATSMERGETOFILE,CHECKLOGTYPE);
}
S->lPatch = 0;
S->lFill = S->lBuffer;
Expand Down
4 changes: 2 additions & 2 deletions sources/threads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4010,7 +4010,7 @@ int MasterMerge(VOID)
for ( j = 1; j <= numberofworkers; j++ ) {
S->GenTerms += AB[j]->T.SS->GenTerms;
}
WriteStats(&position,2);
WriteStats(&position,STATSPOSTSORT,NOCHECKLOGTYPE);
Expressions[AR0.CurExpr].counter = S->TermsLeft;
Expressions[AR0.CurExpr].size = position;
/*
Expand Down Expand Up @@ -4152,7 +4152,7 @@ int SortBotMasterMerge(VOID)
S->GenTerms += AB[j]->T.SS->GenTerms;
}
S->TermsLeft = numberofterms;
WriteStats(&position,2);
WriteStats(&position,STATSPOSTSORT,NOCHECKLOGTYPE);
Expressions[AR.CurExpr].counter = S->TermsLeft;
Expressions[AR.CurExpr].size = position;
AS.MasterSort = 0;
Expand Down