From a65a59a2a973b995163cb1d7b67bf76a36e8c445 Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Thu, 31 Dec 2015 10:41:50 +0100 Subject: [PATCH] all: re-concat broken string constants --- kernel/brick_mem.c | 21 ++------- kernel/mars_light/light_strategy.c | 8 +--- kernel/mars_light/mars_light.c | 5 +-- kernel/mars_light/mars_proc.c | 3 +- kernel/xio_bricks/unused/xio_aio_user.c | 24 +--------- kernel/xio_bricks/xio_bio.c | 12 +---- kernel/xio_bricks/xio_client.c | 5 +-- kernel/xio_bricks/xio_copy.c | 15 +------ kernel/xio_bricks/xio_if.c | 13 +----- kernel/xio_bricks/xio_server.c | 4 +- kernel/xio_bricks/xio_sio.c | 4 +- kernel/xio_bricks/xio_trans_logger.c | 59 +------------------------ 12 files changed, 15 insertions(+), 158 deletions(-) diff --git a/kernel/brick_mem.c b/kernel/brick_mem.c index 3bec5f9f..06d957ff 100644 --- a/kernel/brick_mem.c +++ b/kernel/brick_mem.c @@ -968,14 +968,7 @@ void brick_mem_statistics(bool final) BRICK_INF("======== page allocation:\n"); #ifdef CONFIG_MARS_MEM_PREALLOC for (i = 0; i <= BRICK_MAX_ORDER; i++) { - BRICK_INF("pages order = %2d " - "operations = %9d " - "freelist_count = %4d / %3d " - "raw_count = %5d " - "alloc_count = %5d " - "alloc_len = %5d " - "line = %5d " - "max_count = %5d\n", + BRICK_INF("pages order = %2d operations = %9d freelist_count = %4d / %3d raw_count = %5d alloc_count = %5d alloc_len = %5d line = %5d max_count = %5d\n", i, atomic_read(&op_count[i]), atomic_read(&freelist_count[i]), @@ -993,9 +986,7 @@ void brick_mem_statistics(bool final) if (val) { count += val; places++; - BRICK_INF("line %4d: " - "%6d allocated " - "(last size = %4d, freed = %6d)\n", + BRICK_INF("line %4d: %6d allocated (last size = %4d, freed = %6d)\n", i, val, block_len[i], @@ -1016,9 +1007,7 @@ void brick_mem_statistics(bool final) if (val) { count += val; places++; - BRICK_INF("line %4d: " - "%6d allocated " - "(last size = %4d, freed = %6d)\n", + BRICK_INF("line %4d: %6d allocated (last size = %4d, freed = %6d)\n", i, val, mem_len[i], @@ -1041,9 +1030,7 @@ void brick_mem_statistics(bool final) if (val) { count += val; places++; - BRICK_INF("line %4d: " - "%6d allocated " - "(freed = %6d)\n", + BRICK_INF("line %4d: %6d allocated (freed = %6d)\n", i, val, atomic_read(&string_free[i])); diff --git a/kernel/mars_light/light_strategy.c b/kernel/mars_light/light_strategy.c index 72fb35d1..b7ee3cfe 100644 --- a/kernel/mars_light/light_strategy.c +++ b/kernel/mars_light/light_strategy.c @@ -1993,13 +1993,7 @@ void _show_one(struct xio_brick *test, int *brick_count) if (*brick_count) XIO_DBG("---------\n"); - XIO_DBG("BRICK type = %s path = '%s' name = '%s' " - "size_hint=%d " - "aios_alloc = %d " - "aios_apsect_alloc = %d " - "total_aios_alloc = %d " - "total_aios_aspects = %d " - "button = %d off = %d on = %d\n", + XIO_DBG("BRICK type = %s path = '%s' name = '%s' size_hint=%d aios_alloc = %d aios_apsect_alloc = %d total_aios_alloc = %d total_aios_aspects = %d button = %d off = %d on = %d\n", test->type->type_name, test->brick_path, test->brick_name, diff --git a/kernel/mars_light/mars_light.c b/kernel/mars_light/mars_light.c index 1ce6f484..24b1649b 100644 --- a/kernel/mars_light/mars_light.c +++ b/kernel/mars_light/mars_light.c @@ -1497,10 +1497,7 @@ int __make_copy( copy->show_status = _show_brick_status; make_msg(msg_pair, - "from = '%s' to = '%s'" - " on = %d start_pos = %lld end_pos = %lld" - " actual_pos = %lld actual_stamp = %ld.%09ld" - " rate = %d read_fly = %d write_fly = %d error_code = %d nr_errors = %d", + "from = '%s' to = '%s' on = %d start_pos = %lld end_pos = %lld actual_pos = %lld actual_stamp = %ld.%09ld rate = %d read_fly = %d write_fly = %d error_code = %d nr_errors = %d", argv[0], argv[1], _copy->power.on_led, diff --git a/kernel/mars_light/mars_proc.c b/kernel/mars_light/mars_proc.c index 47db1f7f..dd30ee32 100644 --- a/kernel/mars_light/mars_proc.c +++ b/kernel/mars_light/mars_proc.c @@ -128,8 +128,7 @@ int lamport_sysctl_handler( get_lamport(&lnow); res = scnprintf(tmp, my_len, - "CURRENT_TIME=%ld.%09ld\n" - "lamport_now=%ld.%09ld\n", + "CURRENT_TIME=%ld.%09ld\nlamport_now=%ld.%09ld\n", know.tv_sec, know.tv_nsec, lnow.tv_sec, lnow.tv_nsec ); diff --git a/kernel/xio_bricks/unused/xio_aio_user.c b/kernel/xio_bricks/unused/xio_aio_user.c index 9239de07..a567acab 100644 --- a/kernel/xio_bricks/unused/xio_aio_user.c +++ b/kernel/xio_bricks/unused/xio_aio_user.c @@ -1026,29 +1026,7 @@ char *aio_statistics(struct aio_brick *brick, int verbose) pos += report_timing(&timings[2], res + pos, 4096 - pos); snprintf(res + pos, 4096 - pos, - "total " - "reads = %d " - "writes = %d " - "allocs = %d " - "submits = %d " - "again = %d " - "delays = %d " - "msleeps = %d " - "fdsyncs = %d " - "fdsync_waits = %d " - "map_free = %d | " - "flying reads = %d " - "writes = %d " - "allocs = %d " - "submits = %d " - "q0 = %d " - "q1 = %d " - "q2 = %d " - "| total " - "q0 = %d " - "q1 = %d " - "q2 = %d " - "%s\n", + "total reads = %d writes = %d allocs = %d submits = %d again = %d delays = %d msleeps = %d fdsyncs = %d fdsync_waits = %d map_free = %d | flying reads = %d writes = %d allocs = %d submits = %d q0 = %d q1 = %d q2 = %d | total q0 = %d q1 = %d q2 = %d %s\n", atomic_read(&output->total_read_count), atomic_read(&output->total_write_count), atomic_read(&output->total_alloc_count), diff --git a/kernel/xio_bricks/xio_bio.c b/kernel/xio_bricks/xio_bio.c index d276d8a1..1236135f 100644 --- a/kernel/xio_bricks/xio_bio.c +++ b/kernel/xio_bricks/xio_bio.c @@ -709,17 +709,7 @@ char *bio_statistics(struct bio_brick *brick, int verbose) pos += report_timing(&timings[1], res + pos, 4096 - pos); snprintf(res + pos, 4096 - pos, - "total " - "completed[0] = %d " - "completed[1] = %d " - "completed[2] = %d | " - "queued[0] = %d " - "queued[1] = %d " - "queued[2] = %d " - "flying[0] = %d " - "flying[1] = %d " - "flying[2] = %d " - "completing = %d\n", + "total completed[0] = %d completed[1] = %d completed[2] = %d | queued[0] = %d queued[1] = %d queued[2] = %d flying[0] = %d flying[1] = %d flying[2] = %d completing = %d\n", atomic_read(&brick->total_completed_count[0]), atomic_read(&brick->total_completed_count[1]), atomic_read(&brick->total_completed_count[2]), diff --git a/kernel/xio_bricks/xio_client.c b/kernel/xio_bricks/xio_client.c index 2a0203f2..be177c52 100644 --- a/kernel/xio_bricks/xio_client.c +++ b/kernel/xio_bricks/xio_client.c @@ -905,10 +905,7 @@ char *client_statistics(struct client_brick *brick, int verbose) char *res = brick_string_alloc(1024); snprintf(res, 1024, - "max_flying = %d " - "io_timeout = %d | " - "timeout_count = %d " - "fly_count = %d\n", + "max_flying = %d io_timeout = %d | timeout_count = %d fly_count = %d\n", brick->max_flying, brick->power.io_timeout, atomic_read(&output->timeout_count), diff --git a/kernel/xio_bricks/xio_copy.c b/kernel/xio_bricks/xio_copy.c index c316c0ec..507af457 100644 --- a/kernel/xio_bricks/xio_copy.c +++ b/kernel/xio_bricks/xio_copy.c @@ -832,20 +832,7 @@ char *copy_statistics(struct copy_brick *brick, int verbose) char *res = brick_string_alloc(1024); snprintf(res, 1024, - "copy_start = %lld " - "copy_last = %lld " - "copy_end = %lld " - "copy_error = %d " - "copy_error_count = %d " - "verify_ok_count = %d " - "verify_error_count = %d " - "low_dirty = %d " - "is_aborting = %d " - "clash = %lu | " - "total clash_count = %d | " - "io_flight = %d " - "copy_read_flight = %d " - "copy_write_flight = %d\n", + "copy_start = %lld copy_last = %lld copy_end = %lld copy_error = %d copy_error_count = %d verify_ok_count = %d verify_error_count = %d low_dirty = %d is_aborting = %d clash = %lu | total clash_count = %d | io_flight = %d copy_read_flight = %d copy_write_flight = %d\n", brick->copy_start, brick->copy_last, brick->copy_end, diff --git a/kernel/xio_bricks/xio_if.c b/kernel/xio_bricks/xio_if.c index e08a75cf..8916ec31 100644 --- a/kernel/xio_bricks/xio_if.c +++ b/kernel/xio_bricks/xio_if.c @@ -780,18 +780,7 @@ char *if_statistics(struct if_brick *brick, int verbose) int tmp4 = atomic_read(&input->total_aio_write_count); snprintf(res, 512, - "total reada = %d " - "reads = %d " - "aio_reads = %d (%d%%) " - "writes = %d " - "aio_writes = %d (%d%%) " - "empty = %d " - "fired = %d " - "skip_sync = %d " - "| " - "plugged = %d " - "flying = %d " - "(reads = %d writes = %d)\n", + "total reada = %d reads = %d aio_reads = %d (%d%%) writes = %d aio_writes = %d (%d%%) empty = %d fired = %d skip_sync = %d | plugged = %d flying = %d (reads = %d writes = %d)\n", tmp0, tmp1, tmp2, diff --git a/kernel/xio_bricks/xio_server.c b/kernel/xio_bricks/xio_server.c index 1769264a..c909a10b 100644 --- a/kernel/xio_bricks/xio_server.c +++ b/kernel/xio_bricks/xio_server.c @@ -311,9 +311,7 @@ char *server_statistics(struct server_brick *brick, int verbose) char *res = brick_string_alloc(1024); snprintf(res, 1024, - "cb_running = %d " - "handler_running = %d " - "in_flight = %d\n", + "cb_running = %d handler_running = %d in_flight = %d\n", brick->cb_running, brick->handler_running, atomic_read(&brick->in_flight)); diff --git a/kernel/xio_bricks/xio_sio.c b/kernel/xio_bricks/xio_sio.c index 045e4b54..fa1c7a29 100644 --- a/kernel/xio_bricks/xio_sio.c +++ b/kernel/xio_bricks/xio_sio.c @@ -363,9 +363,7 @@ char *sio_statistics(struct sio_brick *brick, int verbose) } snprintf(res, 1024, - "queued read = %d write = %d " - "flying read = %d write = %d " - "total read = %d write = %d\n", + "queued read = %d write = %d flying read = %d write = %d total read = %d write = %d\n", queue_sum, atomic_read(&output->tinfo[0].queue_count), fly_sum, atomic_read(&output->tinfo[0].fly_count), total_sum, atomic_read(&output->tinfo[0].total_count) diff --git a/kernel/xio_bricks/xio_trans_logger.c b/kernel/xio_bricks/xio_trans_logger.c index 7e45ec09..ddc08f00 100644 --- a/kernel/xio_bricks/xio_trans_logger.c +++ b/kernel/xio_bricks/xio_trans_logger.c @@ -2982,64 +2982,7 @@ char *trans_logger_statistics(struct trans_logger_brick *brick, int verbose) char *res = brick_string_alloc(1024); snprintf(res, 1023, - "mode replay=%d " - "continuous=%d " - "replay_code=%d " - "disk_io_error=%d " - "log_reads=%d | " - "cease_logging=%d " - "stopped_logging=%d " - "congested=%d | " - "replay_start_pos = %lld " - "replay_end_pos = %lld | " - "new_input_nr = %d " - "log_input_nr = %d " - "(old = %d) " - "inf_min_pos1 = %lld " - "inf_max_pos1 = %lld " - "inf_min_pos2 = %lld " - "inf_max_pos2 = %lld | " - "total hash_insert=%d " - "hash_find=%d " - "hash_extend=%d " - "replay=%d " - "replay_conflict=%d (%d%%) " - "callbacks=%d " - "reads=%d " - "writes=%d " - "flushes=%d (%d%%) " - "wb_clusters=%d " - "writebacks=%d (%d%%) " - "shortcut=%d (%d%%) " - "mshadow=%d " - "sshadow=%d " - "mshadow_buffered=%d sshadow_buffered=%d " - "rounds=%d " - "restarts=%d " - "delays=%d " - "phase0=%d " - "phase1=%d " - "phase2=%d " - "phase3=%d | " - "current #aios = %d " - "shadow_mem_used=%ld/%lld " - "replay_count=%d " - "mshadow=%d/%d " - "sshadow=%d " - "hash_count=%d " - "balance=%d/%d/%d/%d " - "pos_count1=%d " - "pos_count2=%d " - "log_aios1=%d " - "log_aios2=%d " - "any_fly=%d " - "log_fly=%d " - "aio_flying1=%d " - "aio_flying2=%d " - "phase0=%d+%d <%d/%d> " - "phase1=%d+%d <%d/%d> " - "phase2=%d+%d <%d/%d> " - "phase3=%d+%d <%d/%d>\n", + "mode replay=%d continuous=%d replay_code=%d disk_io_error=%d log_reads=%d | cease_logging=%d stopped_logging=%d congested=%d | replay_start_pos = %lld replay_end_pos = %lld | new_input_nr = %d log_input_nr = %d (old = %d) inf_min_pos1 = %lld inf_max_pos1 = %lld inf_min_pos2 = %lld inf_max_pos2 = %lld | total hash_insert=%d hash_find=%d hash_extend=%d replay=%d replay_conflict=%d (%d%%) callbacks=%d reads=%d writes=%d flushes=%d (%d%%) wb_clusters=%d writebacks=%d (%d%%) shortcut=%d (%d%%) mshadow=%d sshadow=%d mshadow_buffered=%d sshadow_buffered=%d rounds=%d restarts=%d delays=%d phase0=%d phase1=%d phase2=%d phase3=%d | current #aios = %d shadow_mem_used=%ld/%lld replay_count=%d mshadow=%d/%d sshadow=%d hash_count=%d balance=%d/%d/%d/%d pos_count1=%d pos_count2=%d log_aios1=%d log_aios2=%d any_fly=%d log_fly=%d aio_flying1=%d aio_flying2=%d phase0=%d+%d <%d/%d> phase1=%d+%d <%d/%d> phase2=%d+%d <%d/%d> phase3=%d+%d <%d/%d>\n", brick->replay_mode, brick->continuous_replay_mode, brick->replay_code,