summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyude <lyude@redhat.com>2016-11-04 16:27:12 -0400
committerLyude <lyude@redhat.com>2017-01-26 11:21:26 -0500
commitc2ddb81c460f95e0074c43687e4bb45fe893198f (patch)
tree605063121b910694027f2b60f72901df7e1aae31
parent24bfa3e89da0e3cbd7f752ac0bfe4c47d006ded7 (diff)
igt_aux: Add igt_set_autoresume_delay()
The default autoresume delay is about 5 seconds. It's possible on a system that's not very fast this might not be a long enough time, since an asynchronous hotplug event we scheduled on the chamelium that was intended to happen during suspend could happen before we actually manage to suspend. So, add a function that allows us to increase the autoresume time to ensure this never happens during suspend/resume tests with the chamelium. Cc: Tomeu Vizoso <tomeu@tomeuvizoso.net> Signed-off-by: Lyude <lyude@redhat.com> Changes since v1: - Use igt_require, not assert
-rw-r--r--lib/igt_aux.c46
-rw-r--r--lib/igt_aux.h1
2 files changed, 47 insertions, 0 deletions
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index f323f6a2..763e997c 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -786,6 +786,52 @@ void igt_system_suspend_autoresume(enum igt_suspend_state state,
close(power_dir);
}
+static int original_autoresume_delay;
+
+static void igt_restore_autoresume_delay(int sig)
+{
+ int delay_fd;
+ char delay_str[10];
+
+ igt_require((delay_fd = open("/sys/module/suspend/parameters/pm_test_delay",
+ O_WRONLY)) >= 0);
+
+ snprintf(delay_str, sizeof(delay_str), "%d", original_autoresume_delay);
+ igt_require(write(delay_fd, delay_str, strlen(delay_str)));
+
+ close(delay_fd);
+}
+
+/**
+ * igt_set_autoresume_delay:
+ * @delay_secs: The delay in seconds before resuming the system
+ *
+ * Sets how long we wait to resume the system after suspending it, using the
+ * suspend.pm_test_delay variable. On exit, the original delay value is
+ * restored.
+ */
+void igt_set_autoresume_delay(int delay_secs)
+{
+ int delay_fd;
+ char delay_str[10];
+
+ igt_skip_on_simulation();
+
+ igt_require((delay_fd = open("/sys/module/suspend/parameters/pm_test_delay",
+ O_RDWR)) >= 0);
+
+ if (!original_autoresume_delay) {
+ igt_require(read(delay_fd, delay_str, sizeof(delay_str)));
+ original_autoresume_delay = atoi(delay_str);
+ igt_install_exit_handler(igt_restore_autoresume_delay);
+ }
+
+ snprintf(delay_str, sizeof(delay_str), "%d", delay_secs);
+ igt_require(write(delay_fd, delay_str, strlen(delay_str)));
+
+ close(delay_fd);
+}
+
/**
* igt_drop_root:
*
diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index 30f914b9..cb54ca5e 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -183,6 +183,7 @@ enum igt_suspend_test {
void igt_system_suspend_autoresume(enum igt_suspend_state state,
enum igt_suspend_test test);
+void igt_set_autoresume_delay(int delay_secs);
/* dropping priviledges */
void igt_drop_root(void);