diff --git a/checkin_notes b/checkin_notes index dc31aaff6d..4f8a8d8b34 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3945,3 +3945,12 @@ David 7 July 2011 lib/ coproc.cpp + +David 7 July 2011 + - client: fix typo that caused a lot of spurious + "project has XXXXXX deadline misses" messages + - fix compile warnings + + client/ + sandbox.cpp + rr_sim.cpp diff --git a/client/rr_sim.cpp b/client/rr_sim.cpp index c99080430d..c6da4c946c 100644 --- a/client/rr_sim.cpp +++ b/client/rr_sim.cpp @@ -236,11 +236,11 @@ void CLIENT_STATE::print_deadline_misses() { for (i=0; irsc_pwf[i].deadlines_missed) { + if (p->rsc_pwf[j].deadlines_missed) { msg_printf(p, MSG_INFO, "[cpu_sched] Project has %d projected %s deadline misses", - p->rsc_pwf[i].deadlines_missed, - rsc_name(i) + p->rsc_pwf[j].deadlines_missed, + rsc_name(j) ); } } diff --git a/client/sandbox.cpp b/client/sandbox.cpp index caa8b986ad..d8115505d7 100644 --- a/client/sandbox.cpp +++ b/client/sandbox.cpp @@ -96,8 +96,8 @@ int switcher_exec(const char *util_filename, const char* cmdline) { char util_path[1024]; sprintf(util_path, "%s/%s", SWITCHER_DIR, util_filename); - argv[0] = (char*)util_filename; - parse_command_line((char*)cmdline, argv+1); + argv[0] = const_cast(util_filename); + parse_command_line(const_cast(cmdline), argv+1); int pid = fork(); if (pid == -1) { perror("fork() failed in switcher_exec");