]> granicus.if.org Git - strace/commitdiff
Implement and use new parsers of io_getevents syscall
authorDmitry V. Levin <ldv@altlinux.org>
Sun, 12 May 2019 22:45:45 +0000 (22:45 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 12 May 2019 22:45:45 +0000 (22:45 +0000)
* aio.c (SYS_FUNC(io_getevents)): Remove.
[HAVE_ARCH_TIME32_SYSCALLS] (SYS_FUNC(io_getevents_time32)): New
function.
[HAVE_ARCH_OLD_TIME64_SYSCALLS] (SYS_FUNC(io_getevents_time64)):
Likewise.
* linux/64/syscallent.h: Replace SEN(io_getevents) with
SEN(io_getevents_time64).
* linux/alpha/syscallent.h: Likewise.
* linux/ia64/syscallent.h: Likewise.
* linux/mips/syscallent-n64.h: Likewise.
* linux/powerpc64/syscallent.h: Likewise.
* linux/s390x/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* linux/sparc64/syscallent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/syscallent.h: Likewise.
* linux/32/syscallent.h: Replace SEN(io_getevents) with
SEN(io_getevents_time32).
* linux/arm/syscallent.h: Likewise.
* linux/avr32/syscallent.h: Likewise.
* linux/bfin/syscallent.h: Likewise.
* linux/hppa/syscallent.h: Likewise.
* linux/i386/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/mips/syscallent-n32.h: Likewise.
* linux/mips/syscallent-o32.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/s390/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.
* linux/xtensa/syscallent.h: Likewise.

26 files changed:
aio.c
linux/32/syscallent.h
linux/64/syscallent.h
linux/alpha/syscallent.h
linux/arm/syscallent.h
linux/avr32/syscallent.h
linux/bfin/syscallent.h
linux/hppa/syscallent.h
linux/i386/syscallent.h
linux/ia64/syscallent.h
linux/m68k/syscallent.h
linux/microblaze/syscallent.h
linux/mips/syscallent-n32.h
linux/mips/syscallent-n64.h
linux/mips/syscallent-o32.h
linux/powerpc/syscallent.h
linux/powerpc64/syscallent.h
linux/s390/syscallent.h
linux/s390x/syscallent.h
linux/sh/syscallent.h
linux/sh64/syscallent.h
linux/sparc/syscallent.h
linux/sparc64/syscallent.h
linux/x32/syscallent.h
linux/x86_64/syscallent.h
linux/xtensa/syscallent.h

diff --git a/aio.c b/aio.c
index 7cc5f2194c96f266de51ff341f09432966b79983..cc16b531f723a45ce8614d5b65867f685a26793f 100644 (file)
--- a/aio.c
+++ b/aio.c
@@ -246,10 +246,19 @@ print_io_getevents(struct tcb *const tcp, const print_obj_by_addr_fn print_ts,
        return 0;
 }
 
-SYS_FUNC(io_getevents)
+#if HAVE_ARCH_TIME32_SYSCALLS
+SYS_FUNC(io_getevents_time32)
 {
-       return print_io_getevents(tcp, print_timespec, false);
+       return print_io_getevents(tcp, print_timespec32, false);
 }
+#endif
+
+#if HAVE_ARCH_OLD_TIME64_SYSCALLS
+SYS_FUNC(io_getevents_time64)
+{
+       return print_io_getevents(tcp, print_timespec64, false);
+}
+#endif
 
 SYS_FUNC(io_pgetevents)
 {
index 04370f5bc69325dfffe25d3fde9963f37e7c3680..511a0024c2c8ac349a96be55768b83ee29249a7d 100644 (file)
@@ -12,7 +12,7 @@
 [  1] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
 [  2] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [  3] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
-[  4] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[  4] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [  5] = { 5,   TF,             SEN(setxattr),                  "setxattr"              },
 [  6] = { 5,   TF,             SEN(setxattr),                  "lsetxattr"             },
 [  7] = { 5,   TD,             SEN(fsetxattr),                 "fsetxattr"             },
index f56821ef20a2755d15d5f1da6af0862a57a3c75b..b89d28e984e77b80356e7fc4044fcca27ed584f6 100644 (file)
@@ -9,7 +9,7 @@
 [  1] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
 [  2] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [  3] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
-[  4] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[  4] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [  5] = { 5,   TF,             SEN(setxattr),                  "setxattr"              },
 [  6] = { 5,   TF,             SEN(setxattr),                  "lsetxattr"             },
 [  7] = { 5,   TD,             SEN(fsetxattr),                 "fsetxattr"             },
index 2ced0b989d00e3b20608617ed836a84c325f0a6d..5fe0635e04f587399d3d7e865492c4d0e5667ef6 100644 (file)
 [397] = { 5,   0,              SEN(tuxcall),                   "tuxcall"               }, /* not implemented */
 [398] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [399] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[400] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[400] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [401] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [402] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [403 ... 404] = { },
index 32562bc2f307c9edaf613ab844b326ad713c1069..5e13ff267e527ac472457a3e804a7e9f085477bd 100644 (file)
 [242] = { 3,   0,              SEN(sched_getaffinity),         "sched_getaffinity"     },
 [243] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [244] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[245] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[245] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [246] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [247] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [248] = { 1,   TP|SE,          SEN(exit),                      "exit_group"            },
index 10ba93a9324e1a54780063a695e7595ae9a6a23b..c22697723285cc36066d0a85b8aa20581d60c1b1 100644 (file)
 [196] = { 2,   0,              SEN(capset),                    "capset"                },
 [197] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [198] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[199] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[199] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [200] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [201] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [202] = { 5,   TD,             SEN(fadvise64),                 "fadvise64"             },
index 9ef73a862460b2aae0fc47f58f91c333761d5600..5a1032988f47aac0a218f04eeb1a4b6be56993b5 100644 (file)
 [244] = { 1,   0,              SEN(get_thread_area),           "get_thread_area"       },
 [245] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [246] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[247] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[247] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [248] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [249] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [250] = { 5,   0,              SEN(printargs),                 "alloc_hugepages"       },
index f2ff13aeebeaeaf5716b1a7b3694a63f76017b55..263341fc7c7b1c92628f72bbd5a35fc58fdcc0fd 100644 (file)
 [214] = { 5,   0,              SEN(printargs),                 "get_thread_area"       },
 [215] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [216] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[217] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[217] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [218] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [219] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [220] = { 5,   0,              SEN(printargs),                 "alloc_hugepages"       },
index a142c3d4bb16b12e8755832e716fdd2dff6f73f6..3cd8854700d65e6dacd499a2c1414cfe3178f92d 100644 (file)
 [244] = { 1,   0,              SEN(get_thread_area),           "get_thread_area"       },
 [245] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [246] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[247] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[247] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [248] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [249] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [250] = { 5,   TD,             SEN(fadvise64),                 "fadvise64"             },
index 1d3f5eaba31269056d429509016bb0c75fb2494e..046fafbb411b6d05a45057cae43a50cacd05c327 100644 (file)
 [1024 + 213] = { 3,    0,              SEN(lookup_dcookie),            "lookup_dcookie"        },
 [1024 + 214] = { 2,    TM,             SEN(io_setup),                  "io_setup"              },
 [1024 + 215] = { 1,    TM,             SEN(io_destroy),                "io_destroy"            },
-[1024 + 216] = { 5,    0,              SEN(io_getevents),              "io_getevents"          },
+[1024 + 216] = { 5,    0,              SEN(io_getevents_time64),       "io_getevents"          },
 [1024 + 217] = { 3,    0,              SEN(io_submit),                 "io_submit"             },
 [1024 + 218] = { 3,    0,              SEN(io_cancel),                 "io_cancel"             },
 [1024 + 219] = { 1,    TD,             SEN(epoll_create),              "epoll_create"          },
index b24c8748f138237a60fcab6557e65c50f99834d9..d0e0053453c15cc495cbe4b78f685900d89b89f7 100644 (file)
 [240] = { 4,   TD,             SEN(readahead),                 "readahead"             },
 [241] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [242] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[243] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[243] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [244] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [245] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [246] = { 5,   TD,             SEN(fadvise64),                 "fadvise64"             },
index 36373aa54c099f512074b024b872d2752d0c3d15..8f5ec503b57fa15126a2b7f9413b8b98bcadd5fe 100644 (file)
 [244] = { 1,   0,              SEN(get_thread_area),           "get_thread_area"       },
 [245] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [246] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[247] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[247] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [248] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [249] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [250] = { 5,   TD,             SEN(fadvise64),                 "fadvise64"             },
index 300629334845b4f99d133bcea3b246c065419353..00fb20510338964b532bc01427420182e4eb05bc 100644 (file)
 [6199] = { 4,  0,              SEN(sysmips),                   "sysmips"               },
 [6200] = { 2,  TM,             SEN(io_setup),                  "io_setup"              },
 [6201] = { 1,  TM,             SEN(io_destroy),                "io_destroy"            },
-[6202] = { 5,  0,              SEN(io_getevents),              "io_getevents"          },
+[6202] = { 5,  0,              SEN(io_getevents_time32),       "io_getevents"          },
 [6203] = { 3,  0,              SEN(io_submit),                 "io_submit"             },
 [6204] = { 3,  0,              SEN(io_cancel),                 "io_cancel"             },
 [6205] = { 1,  TP|SE,          SEN(exit),                      "exit_group"            },
index c429ae5a4d5d6f8d3256026cfa7527985d0aebb3..4f950d6c6538794e6352591d308857a07c42cf07 100644 (file)
 [5199] = { 4,  0,              SEN(sysmips),                   "sysmips"               },
 [5200] = { 2,  TM,             SEN(io_setup),                  "io_setup"              },
 [5201] = { 1,  TM,             SEN(io_destroy),                "io_destroy"            },
-[5202] = { 5,  0,              SEN(io_getevents),              "io_getevents"          },
+[5202] = { 5,  0,              SEN(io_getevents_time64),       "io_getevents"          },
 [5203] = { 3,  0,              SEN(io_submit),                 "io_submit"             },
 [5204] = { 3,  0,              SEN(io_cancel),                 "io_cancel"             },
 [5205] = { 1,  TP|SE,          SEN(exit),                      "exit_group"            },
index 249d1bedbb0b3075cd5215e7463c28cf6965d53b..f2476985879e700fb827b9dd92149b1dc3d6d22c 100644 (file)
 [4240] = { 3,  0,              SEN(sched_getaffinity),         "sched_getaffinity"     },
 [4241] = { 2,  TM,             SEN(io_setup),                  "io_setup"              },
 [4242] = { 1,  TM,             SEN(io_destroy),                "io_destroy"            },
-[4243] = { 5,  0,              SEN(io_getevents),              "io_getevents"          },
+[4243] = { 5,  0,              SEN(io_getevents_time32),       "io_getevents"          },
 [4244] = { 3,  0,              SEN(io_submit),                 "io_submit"             },
 [4245] = { 3,  0,              SEN(io_cancel),                 "io_cancel"             },
 [4246] = { 1,  TP|SE,          SEN(exit),                      "exit_group"            },
index c1f187a08f804184370fff6a1f9cb54a6ff5c673..2e8fa1eada3a8766b2a3fb19694ddc99bfde57f8 100644 (file)
 [226] = { 4,   TD|TN,          SEN(sendfile64),                "sendfile64"            },
 [227] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [228] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[229] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[229] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [230] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [231] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [232] = { 1,   0,              SEN(set_tid_address),           "set_tid_address"       },
index 3c61331335d3bdf7906bfe435407e36bc898de84..62e125eb0ff728b3b86f6566b347269a54031ce6 100644 (file)
 [226] = { },
 [227] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [228] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[229] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[229] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [230] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [231] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [232] = { 1,   0,              SEN(set_tid_address),           "set_tid_address"       },
index 49c56c42294abeb1c7ef58003ee94e03c67d0cdd..c5e01d01cff034b19bc91c0b8d7ab654d76fb37e 100644 (file)
 [242] = { },
 [243] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [244] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[245] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[245] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [246] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [247] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [248] = { 1,   TP|SE,          SEN(exit),                      "exit_group"            },
index b587574309f836f9ffeeab419249d42b20acfab5..b7d20c7f45cff9e39bcaa4e9f8e9a252402a0eef 100644 (file)
 [242] = { },
 [243] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [244] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[245] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[245] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [246] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [247] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [248] = { 1,   TP|SE,          SEN(exit),                      "exit_group"            },
index 2d88da22cc0c6beeb74532064cab5bd1a7c57bf3..d626c9e9d366971b08248c360e41390a16830063 100644 (file)
 [243 ... 244] = { },
 [245] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [246] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[247] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[247] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [248] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [249] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [250] = { 5,   TD,             SEN(fadvise64),                 "fadvise64"             },
index 7ce2c408f774f68444e85efced7b8fa64e7d902a..ea75d14ac8ec31a28ab379c8cf3b4797a47b406b 100644 (file)
 [271 ... 272] = { },
 [273] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [274] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[275] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[275] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [276] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [277] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [278] = { 4,   TD,             SEN(fadvise64),                 "fadvise64"             },
index 1669f62f70ac7e588264df63b02d1146f7e41867..4f98dbca1c7f4687479a52bceef593fe28c27c9d 100644 (file)
 [269] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
 [270] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [271] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
-[272] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[272] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [273] = { 4,   TD,             SEN(mq_open),                   "mq_open"               },
 [274] = { 1,   0,              SEN(mq_unlink),                 "mq_unlink"             },
 [275] = { 5,   TD,             SEN(mq_timedsend),              "mq_timedsend"          },
index 2836380ebe94cc7221ddb6ba42da930ac093e03b..3ac74c5582e601508a2526e591c851307eacf69f 100644 (file)
 [269] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
 [270] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [271] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
-[272] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[272] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [273] = { 4,   TD,             SEN(mq_open),                   "mq_open"               },
 [274] = { 1,   0,              SEN(mq_unlink),                 "mq_unlink"             },
 [275] = { 5,   TD,             SEN(mq_timedsend),              "mq_timedsend"          },
index 5f44c082cdbb8e0f1b4eeb346cfd90d576d01bd4..bca6ca110c33088cf2eee2adf9817bb787d5ab26 100644 (file)
 [205] = { 1,   0,              SEN(printargs),                 "set_thread_area#64"    },
 [206] = { 2,   TM,             SEN(printargs),                 "io_setup#64"           },
 [207] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[208] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[208] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [209] = { 3,   0,              SEN(printargs),                 "io_submit#64"          },
 [210] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [211] = { 1,   0,              SEN(printargs),                 "get_thread_area#64"    },
index 1e4f25e7ae95ea7a4e683cec61158c4e0478d7e5..2d0568d71e9c255135d2a7a23fa2a0d3c7e94161 100644 (file)
 [205] = { 1,   0,              SEN(set_thread_area),           "set_thread_area"       },
 [206] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [207] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
-[208] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[208] = { 5,   0,              SEN(io_getevents_time64),       "io_getevents"          },
 [209] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [210] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [211] = { 1,   0,              SEN(get_thread_area),           "get_thread_area"       },
index 18ee0219ce009d9b4ccc64db59ef3d0af32de929..9f2034cea78f5f27149385f05e716613da562c24 100644 (file)
 [239] = { 2,   TM,             SEN(io_setup),                  "io_setup"              },
 [240] = { 1,   TM,             SEN(io_destroy),                "io_destroy"            },
 [241] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
-[242] = { 5,   0,              SEN(io_getevents),              "io_getevents"          },
+[242] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [243] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
 [244] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
 [245] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },