From 412c0bac7a13dc2ad97c690d6246facb4627b32c Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Tue, 13 Oct 2015 19:13:07 +0800 Subject: api: sysinfo: move CPU model API to cpu.h The legacy odp_sys_cpu_model_str() is moved to cpu.h then accordingly renamed to odp_cpu_model_str(), and all the calling functions are also updated at same time. Signed-off-by: Hongbo Zhang Reviewed-by: Petri Savolainen Signed-off-by: Maxim Uvarov Conflicts: test/validation/system/system.c --- test/performance/odp_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/performance/odp_atomic.c') diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c index 054f653b7..ce9f2ebb2 100644 --- a/test/performance/odp_atomic.c +++ b/test/performance/odp_atomic.c @@ -337,7 +337,7 @@ void odp_print_system_info(void) printf("ODP system info\n"); printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); - printf("CPU model: %s\n", odp_sys_cpu_model_str()); + printf("CPU model: %s\n", odp_cpu_model_str()); printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("CPU count: %i\n", odp_cpu_count()); -- cgit v1.2.3 From bd4a6b79eb24f80e4022cefba377846d6a449a3e Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Tue, 13 Oct 2015 19:13:08 +0800 Subject: api: sysinfo: move CPU Hz API to cpu.h The legacy odp_sys_cpu_hz() is moved to cpu.h then accordingly renamed to odp_cpu_hz(), and all the calling functions are also updated. Signed-off-by: Hongbo Zhang Reviewed-by: Petri Savolainen Signed-off-by: Maxim Uvarov Conflicts: platform/linux-generic/odp_time.c test/performance/odp_scheduling.c test/validation/system/system.c test/validation/system/system.h --- test/performance/odp_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/performance/odp_atomic.c') diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c index ce9f2ebb2..23f1d59f7 100644 --- a/test/performance/odp_atomic.c +++ b/test/performance/odp_atomic.c @@ -338,7 +338,7 @@ void odp_print_system_info(void) printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); printf("CPU model: %s\n", odp_cpu_model_str()); - printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); + printf("CPU freq (hz): %"PRIu64"\n", odp_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("CPU count: %i\n", odp_cpu_count()); printf("CPU mask: %s\n", str); -- cgit v1.2.3 From c8b756741425645d0f30390352b9e7abbfb7a2c3 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Tue, 13 Oct 2015 19:13:18 +0800 Subject: test: update CPU Hz calling functions The previous odp_sys_cpu_hz() is moved to cpu.h and then renamed to odp_cpu_hz(), but all the calling function of odp{_sys}_cpu_hz() want to show maximun CPU capacity in fact, so they should be updated to use the newly added odp_cpu_hz_max() instead of odp_cpu_hz(). This patch updates the test codes. Signed-off-by: Hongbo Zhang Reviewed-by: Petri Savolainen Signed-off-by: Maxim Uvarov Conflicts: test/performance/odp_scheduling.c --- test/performance/odp_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/performance/odp_atomic.c') diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c index 23f1d59f7..067329bdc 100644 --- a/test/performance/odp_atomic.c +++ b/test/performance/odp_atomic.c @@ -338,7 +338,7 @@ void odp_print_system_info(void) printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); printf("CPU model: %s\n", odp_cpu_model_str()); - printf("CPU freq (hz): %"PRIu64"\n", odp_cpu_hz()); + printf("CPU freq (hz): %"PRIu64"\n", odp_cpu_hz_max()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("CPU count: %i\n", odp_cpu_count()); printf("CPU mask: %s\n", str); -- cgit v1.2.3