From: John L. <mov...@us...> - 2003-07-21 00:20:52
|
Update of /cvsroot/oprofile/oprofile/gui In directory sc8-pr-cvs1:/tmp/cvs-serv1187/gui Modified Files: oprof_start.cpp oprof_start_util.cpp oprof_start_util.h Log Message: remove the uptime pretty printing from the GUI Index: oprof_start.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -u -p -d -r1.92 -r1.93 --- oprof_start.cpp 21 Jul 2003 00:07:32 -0000 1.92 +++ oprof_start.cpp 21 Jul 2003 00:20:47 -0000 1.93 @@ -349,8 +349,7 @@ void oprof_start::timerEvent(QTimerEvent } ostringstream ss; - ss << "Profiler running "; - ss << dstat.runtime; + ss << "Profiler running:"; time_t curr = time(0); total_nr_interrupts += dstat.nr_interrupts; Index: oprof_start_util.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_util.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -d -r1.32 -r1.33 --- oprof_start_util.cpp 15 Jul 2003 20:51:54 -0000 1.32 +++ oprof_start_util.cpp 21 Jul 2003 00:20:47 -0000 1.33 @@ -101,37 +101,9 @@ daemon_status::daemon_status() exit(EXIT_FAILURE); } - runtime.erase(); if (daemon_pid.empty()) return; - ifstream ifs((string("/proc/") + daemon_pid + "/stat").c_str()); - if (!ifs) - return; - - long dummy; - - ifs >> dummy; // pid - while (!isdigit(ifs.get())) - ; - ifs.ignore(); // state - for (uint i = 0; i < 17; ++i) - ifs >> dummy; - - ulong starttime; - - ifs >> starttime; - - ifstream ifs2("/proc/uptime"); - if (!ifs2) - return; - - double uptimef; - ifs2 >> uptimef; - int uptime = int(uptimef); - - uint diff_mins = (uptime - starttime / HZ) / 60; - nr_interrupts = 0; switch (op_get_interface()) { @@ -168,9 +140,6 @@ daemon_status::daemon_status() default: break; } - - runtime = tostr(diff_mins / 60) + " hours, " + - tostr(diff_mins % 60) + " mins"; } Index: oprof_start_util.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_util.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -d -r1.13 -r1.14 --- oprof_start_util.h 31 May 2003 18:21:40 -0000 1.13 +++ oprof_start_util.h 21 Jul 2003 00:20:47 -0000 1.14 @@ -22,7 +22,6 @@ struct daemon_status { /// fill various data member according to the current daemon status daemon_status(); bool running; ///< true if daemon is running - std::string runtime; ///< running time of daemon unsigned int nr_interrupts; ///< nr_interrupts from profiling start }; |