Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9ffe4a8

Browse files
committed
Make getrusage() output a little more readable
Reviewed-by: Robert Haas <robertmhaas@gmail.com>Reviewed-by: Peter Geoghegan <pg@heroku.com>
1 parente5a9bcb commit9ffe4a8

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎doc/src/sgml/ref/vacuum.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,27 +253,27 @@ INFO: vacuuming "public.onek"
253253
INFO: index "onek_unique1" now contains 1000 tuples in 14 pages
254254
DETAIL: 3000 index tuples were removed.
255255
0 index pages have been deleted, 0 are currently reusable.
256-
CPU 0.01s/0.08u sec elapsed 0.18sec.
256+
CPU: user: 0.08 s, system: 0.01 s, elapsed: 0.18s.
257257
INFO: index "onek_unique2" now contains 1000 tuples in 16 pages
258258
DETAIL: 3000 index tuples were removed.
259259
0 index pages have been deleted, 0 are currently reusable.
260-
CPU 0.00s/0.07u sec elapsed 0.23sec.
260+
CPU: user: 0.07 s, system: 0.00 s, elapsed: 0.23s.
261261
INFO: index "onek_hundred" now contains 1000 tuples in 13 pages
262262
DETAIL: 3000 index tuples were removed.
263263
0 index pages have been deleted, 0 are currently reusable.
264-
CPU 0.01s/0.08u sec elapsed 0.17sec.
264+
CPU: user: 0.08 s, system: 0.01 s, elapsed: 0.17s.
265265
INFO: index "onek_stringu1" now contains 1000 tuples in 48 pages
266266
DETAIL: 3000 index tuples were removed.
267267
0 index pages have been deleted, 0 are currently reusable.
268-
CPU 0.01s/0.09u sec elapsed 0.59sec.
268+
CPU: user: 0.09 s, system: 0.01 s, elapsed: 0.59s.
269269
INFO: "onek": removed 3000 tuples in 108 pages
270-
DETAIL: CPU 0.01s/0.06u sec elapsed 0.07sec.
270+
DETAIL: CPU: user: 0.06 s, system: 0.01 s, elapsed: 0.07s.
271271
INFO: "onek": found 3000 removable, 1000 nonremovable tuples in 143 pages
272272
DETAIL: 0 dead tuples cannot be removed yet.
273273
There were 0 unused item pointers.
274274
Skipped 0 pages due to buffer pins.
275275
0 pages are entirely empty.
276-
CPU 0.07s/0.39u sec elapsed 1.56sec.
276+
CPU: user: 0.39 s, system: 0.07 s, elapsed: 1.56s.
277277
INFO: analyzing "public.onek"
278278
INFO: "onek": 36 pages, 1000 rows sampled, 1000 estimated total rows
279279
VACUUM

‎src/backend/tcop/postgres.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4422,15 +4422,15 @@ ShowUsage(const char *title)
44224422

44234423
appendStringInfoString(&str,"! system usage stats:\n");
44244424
appendStringInfo(&str,
4425-
"!\t%ld.%06ld elapsed %ld.%06ld user %ld.%06ld system sec\n",
4426-
(long) (elapse_t.tv_sec-Save_t.tv_sec),
4427-
(long) (elapse_t.tv_usec-Save_t.tv_usec),
4425+
"!\t%ld.%06ld s user, %ld.%06ld s system, %ld.%06ld s elapsed\n",
44284426
(long) (r.ru_utime.tv_sec-Save_r.ru_utime.tv_sec),
44294427
(long) (r.ru_utime.tv_usec-Save_r.ru_utime.tv_usec),
44304428
(long) (r.ru_stime.tv_sec-Save_r.ru_stime.tv_sec),
4431-
(long) (r.ru_stime.tv_usec-Save_r.ru_stime.tv_usec));
4429+
(long) (r.ru_stime.tv_usec-Save_r.ru_stime.tv_usec),
4430+
(long) (elapse_t.tv_sec-Save_t.tv_sec),
4431+
(long) (elapse_t.tv_usec-Save_t.tv_usec));
44324432
appendStringInfo(&str,
4433-
"!\t[%ld.%06ld user %ld.%06ldsys total]\n",
4433+
"!\t[%ld.%06ldsuser, %ld.%06lds system total]\n",
44344434
(long)user.tv_sec,
44354435
(long)user.tv_usec,
44364436
(long)sys.tv_sec,

‎src/backend/utils/misc/pg_rusage.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ pg_rusage_show(const PGRUsage *ru0)
6161
}
6262

6363
snprintf(result,sizeof(result),
64-
"CPU %d.%02ds/%d.%02du sec elapsed %d.%02d sec",
65-
(int) (ru1.ru.ru_stime.tv_sec-ru0->ru.ru_stime.tv_sec),
66-
(int) (ru1.ru.ru_stime.tv_usec-ru0->ru.ru_stime.tv_usec) /10000,
64+
"CPU: user: %d.%02d s, system: %d.%02d s, elapsed: %d.%02d s",
6765
(int) (ru1.ru.ru_utime.tv_sec-ru0->ru.ru_utime.tv_sec),
6866
(int) (ru1.ru.ru_utime.tv_usec-ru0->ru.ru_utime.tv_usec) /10000,
67+
(int) (ru1.ru.ru_stime.tv_sec-ru0->ru.ru_stime.tv_sec),
68+
(int) (ru1.ru.ru_stime.tv_usec-ru0->ru.ru_stime.tv_usec) /10000,
6969
(int) (ru1.tv.tv_sec-ru0->tv.tv_sec),
7070
(int) (ru1.tv.tv_usec-ru0->tv.tv_usec) /10000);
7171

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp