diff options
author | Milosz Wasilewski <milosz.wasilewski@hackbox.linaro.org> | 2014-10-02 10:16:33 +0100 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@hackbox.linaro.org> | 2014-10-02 10:16:33 +0100 |
commit | 24689e01d37605141ce768d94a94f0be3421049d (patch) | |
tree | b2ac61c7572a4bbb49aa5c871fe6f3fd68436db1 /mqueue/mq_perf_tests.c | |
parent | e14eb051ff73ab8692770762adf44045ba092398 (diff) |
Update to 83d460a640af052ee4a6b8ef5104022ffd6d6a3b from repo http://git.linaro.org/kernel/linux-linaro-stable.git branch linux-linaro-lsk-v3.14eff6a902ff6b8a42f768c4b78fc63b9b8d0a41d9a779989fd4ccf6a58237ab3932559d8e60e157b6a47897538c3e1f71c35691a1f73e73dd9149977ca0d6a47ed69978c84ba8859c3cdbbbd04e79eb2d9347e87f7cd66d6ca96ba7d0b4b1cacebea4d09683d460a640af052ee4a6b8ef5104022ffd6d6a3b7adf3d9a27e4838d0af9250c53ad5744b84886ce7368857a8eed5144e56e65713970764ef0f2f0b8667ea3959654ae48ef303df13f2635fd07766cb45b9be6d71758967d5f24c91903ef3a1b22252a365210951a4876a42856434546d2789838d3e35f3447bbd44e18034d3277a29459d1f0c45e8d1c8d3e3af2dae32ca1108e47a435eaeec276a1c8289a362dad587ec1dddf02a00d3b54156337a6dc79a752297e25caff999eeccf24b19e62388450763af15d250e8659c56d94320b877f659be45b8de130fa3121d7f14b70fed254222a24e124e8771e1437be4c0d590a1ecd1ad44b2dae2bcdc5a6cb24a7080489linux-linaro-stable-3.14
Diffstat (limited to 'mqueue/mq_perf_tests.c')
-rw-r--r-- | mqueue/mq_perf_tests.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/mqueue/mq_perf_tests.c b/mqueue/mq_perf_tests.c index 94dae65..2fadd4b 100644 --- a/mqueue/mq_perf_tests.c +++ b/mqueue/mq_perf_tests.c @@ -296,9 +296,9 @@ static inline void open_queue(struct mq_attr *attr) printf("\n\tQueue %s created:\n", queue_path); printf("\t\tmq_flags:\t\t\t%s\n", result.mq_flags & O_NONBLOCK ? "O_NONBLOCK" : "(null)"); - printf("\t\tmq_maxmsg:\t\t\t%lu\n", result.mq_maxmsg); - printf("\t\tmq_msgsize:\t\t\t%lu\n", result.mq_msgsize); - printf("\t\tmq_curmsgs:\t\t\t%lu\n", result.mq_curmsgs); + printf("\t\tmq_maxmsg:\t\t\t%d\n", result.mq_maxmsg); + printf("\t\tmq_msgsize:\t\t\t%d\n", result.mq_msgsize); + printf("\t\tmq_curmsgs:\t\t\t%d\n", result.mq_curmsgs); } void *fake_cont_thread(void *arg) @@ -440,7 +440,7 @@ void *perf_test_thread(void *arg) shutdown(2, "clock_getres()", __LINE__); printf("\t\tMax priorities:\t\t\t%d\n", mq_prio_max); - printf("\t\tClock resolution:\t\t%lu nsec%s\n", res.tv_nsec, + printf("\t\tClock resolution:\t\t%d nsec%s\n", res.tv_nsec, res.tv_nsec > 1 ? "s" : ""); @@ -454,20 +454,20 @@ void *perf_test_thread(void *arg) recv_total.tv_nsec = 0; for (i = 0; i < TEST1_LOOPS; i++) do_send_recv(); - printf("\t\tSend msg:\t\t\t%ld.%lus total time\n", + printf("\t\tSend msg:\t\t\t%d.%ds total time\n", send_total.tv_sec, send_total.tv_nsec); nsec = ((unsigned long long)send_total.tv_sec * 1000000000 + send_total.tv_nsec) / TEST1_LOOPS; - printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec); - printf("\t\tRecv msg:\t\t\t%ld.%lus total time\n", + printf("\t\t\t\t\t\t%d nsec/msg\n", nsec); + printf("\t\tRecv msg:\t\t\t%d.%ds total time\n", recv_total.tv_sec, recv_total.tv_nsec); nsec = ((unsigned long long)recv_total.tv_sec * 1000000000 + recv_total.tv_nsec) / TEST1_LOOPS; - printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec); + printf("\t\t\t\t\t\t%d nsec/msg\n", nsec); for (cur_test = test2; cur_test->desc != NULL; cur_test++) { - printf("%s:\n", cur_test->desc); + printf(cur_test->desc); printf("\t\t(%d iterations)\n", TEST2_LOOPS); prio_out = 0; send_total.tv_sec = 0; @@ -493,16 +493,16 @@ void *perf_test_thread(void *arg) cur_test->func(&prio_out); } printf("done.\n"); - printf("\t\tSend msg:\t\t\t%ld.%lus total time\n", + printf("\t\tSend msg:\t\t\t%d.%ds total time\n", send_total.tv_sec, send_total.tv_nsec); nsec = ((unsigned long long)send_total.tv_sec * 1000000000 + send_total.tv_nsec) / TEST2_LOOPS; - printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec); - printf("\t\tRecv msg:\t\t\t%ld.%lus total time\n", + printf("\t\t\t\t\t\t%d nsec/msg\n", nsec); + printf("\t\tRecv msg:\t\t\t%d.%ds total time\n", recv_total.tv_sec, recv_total.tv_nsec); nsec = ((unsigned long long)recv_total.tv_sec * 1000000000 + recv_total.tv_nsec) / TEST2_LOOPS; - printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec); + printf("\t\t\t\t\t\t%d nsec/msg\n", nsec); printf("\t\tDraining queue..."); fflush(stdout); clock_gettime(clock, &start); @@ -653,10 +653,8 @@ int main(int argc, char *argv[]) /* Tell the user our initial state */ printf("\nInitial system state:\n"); printf("\tUsing queue path:\t\t\t%s\n", queue_path); - printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%ld\n", - (long) saved_limits.rlim_cur); - printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%ld\n", - (long) saved_limits.rlim_max); + printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%d\n", saved_limits.rlim_cur); + printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%d\n", saved_limits.rlim_max); printf("\tMaximum Message Size:\t\t\t%d\n", saved_max_msgsize); printf("\tMaximum Queue Size:\t\t\t%d\n", saved_max_msgs); printf("\tNice value:\t\t\t\t%d\n", cur_nice); @@ -669,10 +667,10 @@ int main(int argc, char *argv[]) printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t(unlimited)\n"); printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t(unlimited)\n"); } else { - printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%ld\n", - (long) cur_limits.rlim_cur); - printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%ld\n", - (long) cur_limits.rlim_max); + printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%d\n", + cur_limits.rlim_cur); + printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%d\n", + cur_limits.rlim_max); } printf("\tMaximum Message Size:\t\t\t%d\n", cur_max_msgsize); printf("\tMaximum Queue Size:\t\t\t%d\n", cur_max_msgs); |