[igt-dev] [PATCH i-g-t 08/36] i915/gem_pread: Nuke custom main function
Petri Latvala
petri.latvala at intel.com
Thu May 23 12:26:59 UTC 2019
The object size parameter, previously gotten from argv[1], is now the
parameter -s.
Signed-off-by: Petri Latvala <petri.latvala at intel.com>
---
tests/i915/gem_pread.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/tests/i915/gem_pread.c b/tests/i915/gem_pread.c
index 83d878ee..c6478765 100644
--- a/tests/i915/gem_pread.c
+++ b/tests/i915/gem_pread.c
@@ -114,10 +114,25 @@ uint32_t *src, dst;
uint32_t *dst_user, src_stolen, large_stolen;
uint32_t *stolen_pf_user, *stolen_nopf_user;
int fd, count;
+int object_size = 0;
-int main(int argc, char **argv)
+static int opt_handler(int opt, int opt_index, void *data)
+{
+ switch (opt) {
+ case 's':
+ object_size = atoi(optarg);
+ break;
+ default:
+ return IGT_OPT_HANDLER_ERROR;
+ }
+
+ return IGT_OPT_HANDLER_SUCCESS;
+}
+
+const char *help_str = " -s\tObject size in bytes\n";
+
+igt_main_args("s:", NULL, help_str, opt_handler, NULL)
{
- int object_size = 0;
double usecs;
char buf[100];
const char* bps;
@@ -131,10 +146,6 @@ int main(int argc, char **argv)
{ -1 },
}, *c;
- igt_subtest_init(argc, argv);
-
- if (argc > 1 && atoi(argv[1]))
- object_size = atoi(argv[1]);
if (object_size == 0)
object_size = OBJECT_SIZE;
object_size = (object_size + 3) & -4;
@@ -278,6 +289,4 @@ int main(int argc, char **argv)
close(fd);
}
-
- igt_exit();
}
--
2.19.1
More information about the igt-dev
mailing list