Skip to content
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.

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

Increase field width in MessageLogger Summary #46241

Merged
merged 5 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions FWCore/MessageService/src/ELstatistics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -248,16 +248,16 @@ namespace edm {
//
if (n == 0) {
s << "\n";
s << " type category sev module "
"subroutine count total\n"
<< " ---- -------------------- -- ---------------- "
"---------------- ----- -----\n";
s << " type category sev module "
" subroutine count total\n"
<< " ---- -------------------- -- ------------------------- "
"--------------------- ----- -----\n";
}
// ----- Emit detailed message information:
//
s << right << std::setw(5) << ++n << ' ' << left << std::setw(20) << (*i).first.id.substr(0, 20) << ' ' << left
<< std::setw(2) << (*i).first.severity.getSymbol() << ' ' << left << std::setw(16)
<< (*i).first.module.substr(0, 16) << ' ' << left << std::setw(16) << (*i).first.subroutine.substr(0, 16)
<< std::setw(2) << (*i).first.severity.getSymbol() << ' ' << left << std::setw(25)
<< (*i).first.module.substr(0, 25) << ' ' << left << std::setw(21) << (*i).first.subroutine.substr(0, 21)
<< right << std::setw(7) << (*i).second.n << left << std::setw(1) << ((*i).second.ignoredFlag ? '*' : ' ')
<< right << std::setw(8) << (*i).second.aggregateN << '\n';
ftnote = ftnote || (*i).second.ignoredFlag;
Expand Down
12 changes: 6 additions & 6 deletions FWCore/MessageService/test/unit_test_outputs/infos.log
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ Test of std::setprecision(p): Pi with precision 12 is 3.14159265359

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 cat_B -i UnitTestClient_G 10* 10
2 FwkReport -f AfterSource 1 1
3 cat_A -w UnitTestClient_G 1 1
4 cat_C -w UnitTestClient_G 15* 15
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 cat_B -i UnitTestClient_G:sendSome 10* 10
2 FwkReport -f AfterSource 1 1
3 cat_A -w UnitTestClient_G:sendSome 1 1
4 cat_C -w UnitTestClient_G:sendSome 15* 15

* Some occurrences of this message were suppressed in all logs, due to limits.

Expand Down
8 changes: 4 additions & 4 deletions FWCore/MessageService/test/unit_test_outputs/u16_errors.mmlog
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ LogError was used to send this other message

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 cat_A -e UnitTestClient_A 2 2
2 cat_B -e UnitTestClient_A 2 2
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 cat_A -e UnitTestClient_Ad:sendSom 2 2
2 cat_B -e UnitTestClient_Ad:sendSom 2 2

type category Examples: run/evt run/evt run/evt
---- -------------------- ---------------- ---------------- ----------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 cat_A -w UnitTestClient_A 2 2
2 cat_B -w UnitTestClient_A 2 2
3 cat_A -e UnitTestClient_A 2 2
4 cat_B -e UnitTestClient_A 2 2
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 cat_A -w UnitTestClient_Ad:sendSom 2 2
2 cat_B -w UnitTestClient_Ad:sendSom 2 2
3 cat_A -e UnitTestClient_Ad:sendSom 2 2
4 cat_B -e UnitTestClient_Ad:sendSom 2 2

type category Examples: run/evt run/evt run/evt
---- -------------------- ---------------- ---------------- ----------------
Expand Down
10 changes: 5 additions & 5 deletions FWCore/MessageService/test/unit_test_outputs/u17_all.log
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ LogSystem: 9

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 FwkReport -f AfterSource 2 2
2 cat_P -w UnitTestClient_K 20* 20
3 cat_S -s UnitTestClient_K 20 20
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 FwkReport -f AfterSource 2 2
2 cat_P -w UnitTestClient_K:sendSome 20* 20
3 cat_S -s UnitTestClient_K:sendSome 20 20

* Some occurrences of this message were suppressed in all logs, due to limits.

Expand Down
8 changes: 4 additions & 4 deletions FWCore/MessageService/test/unit_test_outputs/u20_cerr.log
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ Test of std::setprecision(p): Pi with precision 12 is 3.14159265359

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 cat_A -w UnitTestClient_G 1 1
2 cat_C -w UnitTestClient_G 15 15
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 cat_A -w UnitTestClient_G:sendSome 1 1
2 cat_C -w UnitTestClient_G:sendSome 15 15

type category Examples: run/evt run/evt run/evt
---- -------------------- ---------------- ---------------- ----------------
Expand Down
18 changes: 9 additions & 9 deletions FWCore/MessageService/test/unit_test_outputs/u23_infos.log
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ Q2 trace with identifier 23

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 cat_A -i UTC_Q1:ssm_1a 1 1
2 cat_A -i UTC_Q1:ssm_1b 1 1
3 cat_A -i UTC_Q1:ssm_1c 1 1
4 cat_A -i UTC_Q2:ssm_2a 1 1
5 cat_A -i UTC_Q2:ssm_2b 1 1
6 cat_A -i UTC_Q2:ssm_2c 1 1
7 FwkReport -f AfterSource 1 1
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 cat_A -i UTC_Q1:ssm_1a 1 1
2 cat_A -i UTC_Q1:ssm_1b 1 1
3 cat_A -i UTC_Q1:ssm_1c 1 1
4 cat_A -i UTC_Q2:ssm_2a 1 1
5 cat_A -i UTC_Q2:ssm_2b 1 1
6 cat_A -i UTC_Q2:ssm_2c 1 1
7 FwkReport -f AfterSource 1 1
8 timer -i <Any Module> <Any Function> 6 6
9 trace -i <Any Module> <Any Function> 6 6

Expand Down
10 changes: 5 additions & 5 deletions FWCore/MessageService/test/unit_test_outputs/u25_only.log
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ B 6146

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 FwkReport -f AfterSource 1 1
2 cat_A -e UnitTestClient_R 10000* 10000
3 cat_B -e UnitTestClient_R 10000* 10000
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 FwkReport -f AfterSource 1 1
2 cat_A -e UnitTestClient_R:sendSome 10000* 10000
3 cat_B -e UnitTestClient_R:sendSome 10000* 10000

* Some occurrences of this message were suppressed in all logs, due to limits.

Expand Down
18 changes: 9 additions & 9 deletions FWCore/MessageService/test/unit_test_outputs/u27_infos.log
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ Q2 trace with identifier 23

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 cat_A -i UTC_Q1:ssm_1a 1 1
2 cat_A -i UTC_Q1:ssm_1b 1 1
3 cat_A -i UTC_Q1:ssm_1c 1 1
4 cat_A -i UTC_Q2:ssm_2a 1 1
5 cat_A -i UTC_Q2:ssm_2b 1 1
6 cat_A -i UTC_Q2:ssm_2c 1 1
7 FwkReport -f AfterSource 1 1
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 cat_A -i UTC_Q1:ssm_1a 1 1
2 cat_A -i UTC_Q1:ssm_1b 1 1
3 cat_A -i UTC_Q1:ssm_1c 1 1
4 cat_A -i UTC_Q2:ssm_2a 1 1
5 cat_A -i UTC_Q2:ssm_2b 1 1
6 cat_A -i UTC_Q2:ssm_2c 1 1
7 FwkReport -f AfterSource 1 1
8 timer -i <Any Module> <Any Function> 6 6
9 trace -i <Any Module> <Any Function> 6 6

Expand Down
12 changes: 6 additions & 6 deletions FWCore/MessageService/test/unit_test_outputs/u28_output.log
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ LogInfo was used to send this other message

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 cat_A -w UnitTestClient_A 3 3
2 cat_B -w UnitTestClient_A 3 3
3 cat_A -e UnitTestClient_A 3 3
4 cat_B -e UnitTestClient_A 3 3
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 cat_A -w UnitTestClient_A:sendSome 3 3
2 cat_B -w UnitTestClient_A:sendSome 3 3
3 cat_A -e UnitTestClient_A:sendSome 3 3
4 cat_B -e UnitTestClient_A:sendSome 3 3

type category Examples: run/evt run/evt run/evt
---- -------------------- ---------------- ---------------- ----------------
Expand Down
48 changes: 24 additions & 24 deletions FWCore/MessageService/test/unit_test_outputs/u31_infos.log
Original file line number Diff line number Diff line change
Expand Up @@ -979,30 +979,30 @@ Category timer Module UTC_T2:ssm_2c Severity Error Count 1

MessageLogger Summary

type category sev module subroutine count total
---- -------------------- -- ---------------- ---------------- ----- -----
1 summary -i UTC_T2:ssm_2a 4 4
2 summary -i UTC_T2:ssm_2b 4 4
3 summary -i UTC_T2:ssm_2c 4 4
4 FwkReport -f AfterSource 16 16
5 cat_A -w UTC_T1:ssm_1a 16 16
6 cat_A -w UTC_T1:ssm_1b 16 16
7 cat_A -w UTC_T1:ssm_1c 16 16
8 cat_A -w UTC_T2:ssm_2a 16 16
9 cat_A -w UTC_T2:ssm_2b 16 16
10 cat_A -w UTC_T2:ssm_2c 16 16
11 cat_A -e UTC_T1:ssm_1a 16 16
12 cat_A -e UTC_T1:ssm_1b 16 16
13 cat_A -e UTC_T1:ssm_1c 16 16
14 cat_A -e UTC_T2:ssm_2a 16 16
15 cat_A -e UTC_T2:ssm_2b 16 16
16 cat_A -e UTC_T2:ssm_2c 16 16
17 timer -e UTC_T1:ssm_1a 16 16
18 timer -e UTC_T1:ssm_1b 16 16
19 timer -e UTC_T1:ssm_1c 16 16
20 timer -e UTC_T2:ssm_2a 16 16
21 timer -e UTC_T2:ssm_2b 16 16
22 timer -e UTC_T2:ssm_2c 16 16
type category sev module subroutine count total
---- -------------------- -- ------------------------- --------------------- ----- -----
1 summary -i UTC_T2:ssm_2a 4 4
2 summary -i UTC_T2:ssm_2b 4 4
3 summary -i UTC_T2:ssm_2c 4 4
4 FwkReport -f AfterSource 16 16
5 cat_A -w UTC_T1:ssm_1a 16 16
6 cat_A -w UTC_T1:ssm_1b 16 16
7 cat_A -w UTC_T1:ssm_1c 16 16
8 cat_A -w UTC_T2:ssm_2a 16 16
9 cat_A -w UTC_T2:ssm_2b 16 16
10 cat_A -w UTC_T2:ssm_2c 16 16
11 cat_A -e UTC_T1:ssm_1a 16 16
12 cat_A -e UTC_T1:ssm_1b 16 16
13 cat_A -e UTC_T1:ssm_1c 16 16
14 cat_A -e UTC_T2:ssm_2a 16 16
15 cat_A -e UTC_T2:ssm_2b 16 16
16 cat_A -e UTC_T2:ssm_2c 16 16
17 timer -e UTC_T1:ssm_1a 16 16
18 timer -e UTC_T1:ssm_1b 16 16
19 timer -e UTC_T1:ssm_1c 16 16
20 timer -e UTC_T2:ssm_2a 16 16
21 timer -e UTC_T2:ssm_2b 16 16
22 timer -e UTC_T2:ssm_2c 16 16

type category Examples: run/evt run/evt run/evt
---- -------------------- ---------------- ---------------- ----------------
Expand Down
Loading