From: Randy Dunlap <[email protected]>
Documentation/laptop-mode.txt:
Expose example and tool source files in the Documentation/ directory in
their own files instead of being buried (almost hidden) in readme/txt files.
This will make them more visible/usable to users who may need
to use them, to developers who may need to test with them, and
to janitors who would update them if they were more visible.
Also, if any of these possibly should not be in the kernel tree at
all, it will be clearer that they are here and we can discuss if
they should be removed.
Signed-off-by: Randy Dunlap <[email protected]>
---
Documentation/dslm.c | 166 +++++++++++++++++++++++++++++++++++++++++
Documentation/laptop-mode.txt | 170 ------------------------------------------
2 files changed, 167 insertions(+), 169 deletions(-)
--- /dev/null
+++ linux-2617-rc4g9-docsrc-split/Documentation/dslm.c
@@ -0,0 +1,166 @@
+/*
+ * dslm.c
+ * Simple Disk Sleep Monitor
+ * by Bartek Kania
+ * Licenced under the GPL
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <time.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <linux/hdreg.h>
+
+#ifdef DEBUG
+#define D(x) x
+#else
+#define D(x)
+#endif
+
+int endit = 0;
+
+/* Check if the disk is in powersave-mode
+ * Most of the code is stolen from hdparm.
+ * 1 = active, 0 = standby/sleep, -1 = unknown */
+int check_powermode(int fd)
+{
+ unsigned char args[4] = {WIN_CHECKPOWERMODE1,0,0,0};
+ int state;
+
+ if (ioctl(fd, HDIO_DRIVE_CMD, &args)
+ && (args[0] = WIN_CHECKPOWERMODE2) /* try again with 0x98 */
+ && ioctl(fd, HDIO_DRIVE_CMD, &args)) {
+ if (errno != EIO || args[0] != 0 || args[1] != 0) {
+ state = -1; /* "unknown"; */
+ } else
+ state = 0; /* "sleeping"; */
+ } else {
+ state = (args[2] == 255) ? 1 : 0;
+ }
+ D(printf(" drive state is: %d\n", state));
+
+ return state;
+}
+
+char *state_name(int i)
+{
+ if (i == -1) return "unknown";
+ if (i == 0) return "sleeping";
+ if (i == 1) return "active";
+
+ return "internal error";
+}
+
+char *myctime(time_t time)
+{
+ char *ts = ctime(&time);
+ ts[strlen(ts) - 1] = 0;
+
+ return ts;
+}
+
+void measure(int fd)
+{
+ time_t start_time;
+ int last_state;
+ time_t last_time;
+ int curr_state;
+ time_t curr_time = 0;
+ time_t time_diff;
+ time_t active_time = 0;
+ time_t sleep_time = 0;
+ time_t unknown_time = 0;
+ time_t total_time = 0;
+ int changes = 0;
+ float tmp;
+
+ printf("Starting measurements\n");
+
+ last_state = check_powermode(fd);
+ start_time = last_time = time(0);
+ printf(" System is in state %s\n\n", state_name(last_state));
+
+ while(!endit) {
+ sleep(1);
+ curr_state = check_powermode(fd);
+
+ if (curr_state != last_state || endit) {
+ changes++;
+ curr_time = time(0);
+ time_diff = curr_time - last_time;
+
+ if (last_state == 1) active_time += time_diff;
+ else if (last_state == 0) sleep_time += time_diff;
+ else unknown_time += time_diff;
+
+ last_state = curr_state;
+ last_time = curr_time;
+
+ printf("%s: State-change to %s\n", myctime(curr_time),
+ state_name(curr_state));
+ }
+ }
+ changes--; /* Compensate for SIGINT */
+
+ total_time = time(0) - start_time;
+ printf("\nTotal running time: %lus\n", curr_time - start_time);
+ printf(" State changed %d times\n", changes);
+
+ tmp = (float)sleep_time / (float)total_time * 100;
+ printf(" Time in sleep state: %lus (%.2f%%)\n", sleep_time, tmp);
+ tmp = (float)active_time / (float)total_time * 100;
+ printf(" Time in active state: %lus (%.2f%%)\n", active_time, tmp);
+ tmp = (float)unknown_time / (float)total_time * 100;
+ printf(" Time in unknown state: %lus (%.2f%%)\n", unknown_time, tmp);
+}
+
+void ender(int s)
+{
+ endit = 1;
+}
+
+void usage()
+{
+ puts("usage: dslm [-w <time>] <disk>");
+ exit(0);
+}
+
+int main(int argc, char **argv)
+{
+ int fd;
+ char *disk = 0;
+ int settle_time = 60;
+
+ /* Parse the simple command-line */
+ if (argc == 2)
+ disk = argv[1];
+ else if (argc == 4) {
+ settle_time = atoi(argv[2]);
+ disk = argv[3];
+ } else
+ usage();
+
+ if (!(fd = open(disk, O_RDONLY|O_NONBLOCK))) {
+ printf("Can't open %s, because: %s\n", disk, strerror(errno));
+ exit(-1);
+ }
+
+ if (settle_time) {
+ printf("Waiting %d seconds for the system to settle down to "
+ "'normal'\n", settle_time);
+ sleep(settle_time);
+ } else
+ puts("Not waiting for system to settle down");
+
+ signal(SIGINT, ender);
+
+ measure(fd);
+
+ close(fd);
+
+ return 0;
+}
--- linux-2617-rc4g9-docsrc-split.orig/Documentation/laptop-mode.txt
+++ linux-2617-rc4g9-docsrc-split/Documentation/laptop-mode.txt
@@ -779,172 +779,4 @@ Monitoring tool
---------------
Bartek Kania submitted this, it can be used to measure how much time your disk
-spends spun up/down.
-
----------------------------dslm.c BEGIN-----------------------------------------
-/*
- * Simple Disk Sleep Monitor
- * by Bartek Kania
- * Licenced under the GPL
- */
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <linux/hdreg.h>
-
-#ifdef DEBUG
-#define D(x) x
-#else
-#define D(x)
-#endif
-
-int endit = 0;
-
-/* Check if the disk is in powersave-mode
- * Most of the code is stolen from hdparm.
- * 1 = active, 0 = standby/sleep, -1 = unknown */
-int check_powermode(int fd)
-{
- unsigned char args[4] = {WIN_CHECKPOWERMODE1,0,0,0};
- int state;
-
- if (ioctl(fd, HDIO_DRIVE_CMD, &args)
- && (args[0] = WIN_CHECKPOWERMODE2) /* try again with 0x98 */
- && ioctl(fd, HDIO_DRIVE_CMD, &args)) {
- if (errno != EIO || args[0] != 0 || args[1] != 0) {
- state = -1; /* "unknown"; */
- } else
- state = 0; /* "sleeping"; */
- } else {
- state = (args[2] == 255) ? 1 : 0;
- }
- D(printf(" drive state is: %d\n", state));
-
- return state;
-}
-
-char *state_name(int i)
-{
- if (i == -1) return "unknown";
- if (i == 0) return "sleeping";
- if (i == 1) return "active";
-
- return "internal error";
-}
-
-char *myctime(time_t time)
-{
- char *ts = ctime(&time);
- ts[strlen(ts) - 1] = 0;
-
- return ts;
-}
-
-void measure(int fd)
-{
- time_t start_time;
- int last_state;
- time_t last_time;
- int curr_state;
- time_t curr_time = 0;
- time_t time_diff;
- time_t active_time = 0;
- time_t sleep_time = 0;
- time_t unknown_time = 0;
- time_t total_time = 0;
- int changes = 0;
- float tmp;
-
- printf("Starting measurements\n");
-
- last_state = check_powermode(fd);
- start_time = last_time = time(0);
- printf(" System is in state %s\n\n", state_name(last_state));
-
- while(!endit) {
- sleep(1);
- curr_state = check_powermode(fd);
-
- if (curr_state != last_state || endit) {
- changes++;
- curr_time = time(0);
- time_diff = curr_time - last_time;
-
- if (last_state == 1) active_time += time_diff;
- else if (last_state == 0) sleep_time += time_diff;
- else unknown_time += time_diff;
-
- last_state = curr_state;
- last_time = curr_time;
-
- printf("%s: State-change to %s\n", myctime(curr_time),
- state_name(curr_state));
- }
- }
- changes--; /* Compensate for SIGINT */
-
- total_time = time(0) - start_time;
- printf("\nTotal running time: %lus\n", curr_time - start_time);
- printf(" State changed %d times\n", changes);
-
- tmp = (float)sleep_time / (float)total_time * 100;
- printf(" Time in sleep state: %lus (%.2f%%)\n", sleep_time, tmp);
- tmp = (float)active_time / (float)total_time * 100;
- printf(" Time in active state: %lus (%.2f%%)\n", active_time, tmp);
- tmp = (float)unknown_time / (float)total_time * 100;
- printf(" Time in unknown state: %lus (%.2f%%)\n", unknown_time, tmp);
-}
-
-void ender(int s)
-{
- endit = 1;
-}
-
-void usage()
-{
- puts("usage: dslm [-w <time>] <disk>");
- exit(0);
-}
-
-int main(int argc, char **argv)
-{
- int fd;
- char *disk = 0;
- int settle_time = 60;
-
- /* Parse the simple command-line */
- if (argc == 2)
- disk = argv[1];
- else if (argc == 4) {
- settle_time = atoi(argv[2]);
- disk = argv[3];
- } else
- usage();
-
- if (!(fd = open(disk, O_RDONLY|O_NONBLOCK))) {
- printf("Can't open %s, because: %s\n", disk, strerror(errno));
- exit(-1);
- }
-
- if (settle_time) {
- printf("Waiting %d seconds for the system to settle down to "
- "'normal'\n", settle_time);
- sleep(settle_time);
- } else
- puts("Not waiting for system to settle down");
-
- signal(SIGINT, ender);
-
- measure(fd);
-
- close(fd);
-
- return 0;
-}
----------------------------dslm.c END-------------------------------------------
+spends spun up/down. See Documentation/dslm.c
---
Randy.Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Documentation/laptop-mode.txt:
> Expose example and tool source files in the Documentation/ directory in
> their own files instead of being buried (almost hidden) in readme/txt files.
>
> This will make them more visible/usable to users who may need
> to use them, to developers who may need to test with them, and
> to janitors who would update them if they were more visible.
>
> Also, if any of these possibly should not be in the kernel tree at
> all, it will be clearer that they are here and we can discuss if
> they should be removed.
>
> Signed-off-by: Randy Dunlap <[email protected]>
> ---
> Documentation/dslm.c | 166 +++++++++++++++++++++++++++++++++++++++++
> Documentation/laptop-mode.txt | 170 ------------------------------------------
Arguably, dslm.c should be removed completely. It's something for which
everyone who knows how to compile a file named "dslm.c" can write a
usable replacement, using a couple of lines of shell scripting. If we
should include anything, it should be those lines of shell scripting, in
the docs, at most.
Point for discussion: should the laptop_mode script really still be in
laptop-mode.txt? AFAIK most distros use laptop-mode-tools or use their
own scripts to control this. Furthermore, the existing script is mostly
unmaintained, and it is full of bugs that were fixed long ago in
laptop-mode-tools (which was originally a fork of the script). I think
it would be better to replace it with a bit of documentation on which
things a laptop mode control script *should* tweak, *may want to* tweak,
etc., accompanied by an explanation why these tweaks are needed. I.e, an
"annotated spec", as one would expect to find in documentation. I'll
submit a patch to this effect when I find some time.
Cheers,
Bart
On Mon, 22 May 2006 07:23:13 +0200 Bart Samwel wrote:
> Randy.Dunlap wrote:
> > From: Randy Dunlap <[email protected]>
> >
> > Documentation/laptop-mode.txt:
> > Expose example and tool source files in the Documentation/ directory in
> > their own files instead of being buried (almost hidden) in readme/txt files.
> >
> > This will make them more visible/usable to users who may need
> > to use them, to developers who may need to test with them, and
> > to janitors who would update them if they were more visible.
> >
> > Also, if any of these possibly should not be in the kernel tree at
> > all, it will be clearer that they are here and we can discuss if
> > they should be removed.
> >
> > Signed-off-by: Randy Dunlap <[email protected]>
> > ---
> > Documentation/dslm.c | 166 +++++++++++++++++++++++++++++++++++++++++
> > Documentation/laptop-mode.txt | 170 ------------------------------------------
>
> Arguably, dslm.c should be removed completely. It's something for which
> everyone who knows how to compile a file named "dslm.c" can write a
> usable replacement, using a couple of lines of shell scripting. If we
> should include anything, it should be those lines of shell scripting, in
> the docs, at most.
OK, sounds good to me.
> Point for discussion: should the laptop_mode script really still be in
> laptop-mode.txt? AFAIK most distros use laptop-mode-tools or use their
> own scripts to control this. Furthermore, the existing script is mostly
> unmaintained, and it is full of bugs that were fixed long ago in
> laptop-mode-tools (which was originally a fork of the script). I think
> it would be better to replace it with a bit of documentation on which
> things a laptop mode control script *should* tweak, *may want to* tweak,
> etc., accompanied by an explanation why these tweaks are needed. I.e, an
> "annotated spec", as one would expect to find in documentation. I'll
> submit a patch to this effect when I find some time.
If it's really so unmaintained and mostly replaced, sounds like it should
be removed. OTOH, if you want to keep several source files and/or
scripts, I would prefer to see a laptop-mode subdirectory for them.
---
~Randy
Randy.Dunlap wrote:
> On Mon, 22 May 2006 07:23:13 +0200 Bart Samwel wrote:
>> Point for discussion: should the laptop_mode script really still be in
>> laptop-mode.txt? AFAIK most distros use laptop-mode-tools or use their
>> own scripts to control this. Furthermore, the existing script is mostly
>> unmaintained, and it is full of bugs that were fixed long ago in
>> laptop-mode-tools (which was originally a fork of the script). I think
>> it would be better to replace it with a bit of documentation on which
>> things a laptop mode control script *should* tweak, *may want to* tweak,
>> etc., accompanied by an explanation why these tweaks are needed. I.e, an
>> "annotated spec", as one would expect to find in documentation. I'll
>> submit a patch to this effect when I find some time.
>
> If it's really so unmaintained and mostly replaced, sounds like it should
> be removed. OTOH, if you want to keep several source files and/or
> scripts, I would prefer to see a laptop-mode subdirectory for them.
I'm all for completely removing the script, so no subdirectories needed
as far as I'm concerned. I'll submit a patch to replace the script by
some text explaining what such a script should do.
Cheers,
Bart