| Index: trunk/tools/slayerd/debian/changelog |
| — | — | @@ -1,3 +1,9 @@ |
| | 2 | +slayerd (1.5) unstable; urgency=low |
| | 3 | + |
| | 4 | + * "data" figure appears non-useful, go back to RSS. |
| | 5 | + |
| | 6 | + -- River Tarnell <river@wikimedia.org> Thu, 07 Jun 2007 02:31:47 +0000 |
| | 7 | + |
| 2 | 8 | slayerd (1.4) unstable; urgency=low |
| 3 | 9 | |
| 4 | 10 | * Very large processes would cause integer overflow, kill too many |
| Index: trunk/tools/slayerd/debian/slayerd.substvars |
| — | — | @@ -1 +1 @@ |
| 2 | | -shlibs:Depends=libboost-filesystem1.33.1, libc6 (>= 2.5-5), libgcc1 (>= 1:4.1.1-12), libstdc++6 (>= 4.1.1-12) |
| | 2 | +shlibs:Depends=libboost-filesystem1.33.1, libc6 (>= 2.5-5), libgcc1 (>= 1:4.2-20070516), libstdc++6 (>= 4.2-20070516) |
| Index: trunk/tools/slayerd/debian/files |
| — | — | @@ -1 +1 @@ |
| 2 | | -slayerd_1.4_amd64.deb admin extra |
| | 2 | +slayerd_1.5_amd64.deb admin extra |
| Index: trunk/tools/slayerd/slayerd.cc |
| — | — | @@ -595,7 +595,7 @@ |
| 596 | 596 | u = &users[n]; |
| 597 | 597 | } |
| 598 | 598 | |
| 599 | | - u->rss += p._mdata; |
| | 599 | + u->rss += p._mres; |
| 600 | 600 | u->processes.push_back(p); |
| 601 | 601 | } |
| 602 | 602 | |
| — | — | @@ -625,7 +625,7 @@ |
| 626 | 626 | % (bytes / 1024 / 1024) |
| 627 | 627 | % (config.limit / 1024 / 1024))); |
| 628 | 628 | |
| 629 | | - std::sort(u.processes.begin(), u.processes.end(), field_comparator<process, int, &process::_mdata>); |
| | 629 | + std::sort(u.processes.begin(), u.processes.end(), field_comparator<process, int, &process::_mres>); |
| 630 | 630 | |
| 631 | 631 | while (bytes >= config.thresh && !u.processes.empty()) { |
| 632 | 632 | process &p = u.processes[0]; |
| — | — | @@ -635,7 +635,7 @@ |
| 636 | 636 | if (!config.debug) |
| 637 | 637 | kill(p._pid, SIGKILL); |
| 638 | 638 | |
| 639 | | - std::size_t thissize = std::size_t(p._mdata) * pagesize; |
| | 639 | + std::size_t thissize = std::size_t(p._mres) * pagesize; |
| 640 | 640 | |
| 641 | 641 | log(str(boost::format(" killed process \"%s\" (pid %d) using %dM, usage now %dM") |
| 642 | 642 | % comm % p._pid |