Implement and use new parsers of timerfd_gettime and timerfd_settime syscalls

* time.c (SYS_FUNC(timerfd_gettime), SYS_FUNC(timerfd_settime)): Remove.
[HAVE_ARCH_TIME32_SYSCALLS] (SYS_FUNC(timerfd_gettime32),
SYS_FUNC(timerfd_settime32)): New functions.
* pathtrace.c (pathtrace_match_set): Replace SEN_timerfd_gettime and
SEN_timerfd_settime with SEN_timerfd_gettime32 and
SEN_timerfd_settime32, respectively.
* linux/64/syscallent.h: Replace SEN(timerfd_gettime) and
SEN(timerfd_settime) with SEN(timerfd_gettime64) and
SEN(timerfd_settime64), respectively.
* 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(timerfd_gettime) and
SEN(timerfd_settime) with SEN(timerfd_gettime32) and
SEN(timerfd_settime32), respectively.
* 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.

diff --git a/linux/32/syscallent.h b/linux/32/syscallent.h
index 3034e7f6b983d1e18d385bc5c0bf64dbbe2f04b5..bbcbf92c42020db1e113446426b2a88a1865594e 100644 (file)
--- a/linux/32/syscallent.h
+++ b/linux/32/syscallent.h
@@ -98,8 +98,8 @@
 [ 84] = { 6,   TD,             SEN(sync_file_range),           "sync_file_range"       },
 #endif
 [ 85] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
-[ 86] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[ 87] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[ 86] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[ 87] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [ 88] = { 4,   TD|TF,          SEN(utimensat),                 "utimensat"             },
 [ 89] = { 1,   TF,             SEN(acct),                      "acct"                  },
 [ 90] = { 2,   0,              SEN(capget),                    "capget"                },

diff --git a/linux/64/syscallent.h b/linux/64/syscallent.h
index e9a72cfb6bcc3c2ab0f111157a22f78f8d8a0d5c..1778272be6574e1e48f9ac8949cd9055e669a585 100644 (file)
--- a/linux/64/syscallent.h
+++ b/linux/64/syscallent.h
@@ -91,8 +91,8 @@
 [ 83] = { 1,   TD,             SEN(fdatasync),                 "fdatasync"             },
 [ 84] = { 4,   TD,             SEN(sync_file_range),           "sync_file_range"       },
 [ 85] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
-[ 86] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[ 87] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[ 86] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[ 87] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [ 88] = { 4,   TD|TF,          SEN(utimensat),                 "utimensat"             },
 [ 89] = { 1,   TF,             SEN(acct),                      "acct"                  },
 [ 90] = { 2,   0,              SEN(capget),                    "capget"                },

diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h
index 9d18ab8d827ea8d243cb2b191180ed9f437b03ce..b027bdcb48476e382e58a4e3ac41d17edba8588d 100644 (file)
--- a/linux/alpha/syscallent.h
+++ b/linux/alpha/syscallent.h
@@ -425,8 +425,8 @@
 [479] = { 5,   TN,             SEN(recvmmsg_time64),           "recvmmsg"              },
 [480] = { 4,   TD,             SEN(fallocate),                 "fallocate"             },
 [481] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
-[482] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[483] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[482] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[483] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [484] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [485] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [486] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
index 5e6c79f9d8f9a65f4b7884281a5fef481220d181..cd7b1576a374864e1effa6784e847dd775ee9f6a 100644 (file)
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -360,8 +360,8 @@
 [350] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [351] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [352] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
-[353] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[354] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[353] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[354] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [355] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [356] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [357] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h
index a5f1efa3c58f83f63f2c8457b01df27adba64d0e..d4608029efefb8760ca2ddeea22afbbc11c75906 100644 (file)
--- a/linux/avr32/syscallent.h
+++ b/linux/avr32/syscallent.h
@@ -294,8 +294,8 @@
 [285] = { 5,   TD,             SEN(pwrite),                    "pwrite64"              },
 [286] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [287] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
-[288] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[289] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[288] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[289] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [290] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [291] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [292] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h
index 0bbfeaa50a8a6f8bfdad02961a1207438fdd6cf3..f97ae05875b32dd8b3ea10d3728769e47d2fdbd1 100644 (file)
--- a/linux/bfin/syscallent.h
+++ b/linux/bfin/syscallent.h
@@ -364,8 +364,8 @@
 [355] = { 3,   0,              SEN(get_robust_list),           "get_robust_list"       },
 [356] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
 [357] = { 4,   TI,             SEN(semtimedop_time32),         "semtimedop"            },
-[358] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[359] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[358] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[359] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [360] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [361] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [362] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h
index 656c36eabca762984bdfc4ad21223bbf8a841d9d..dd4448fd0627474a9cab3fbc49d0d9cd90033a93 100644 (file)
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@@ -310,8 +310,8 @@
 [304] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [305] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
 [306] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
-[307] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[308] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[307] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[308] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [309] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [310] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [311] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
index 58eaf028260e18f66276dce8e58e6a946370211e..faa70b022e3b64e6eb03b10338cb334136adb4ee 100644 (file)
--- a/linux/i386/syscallent.h
+++ b/linux/i386/syscallent.h
@@ -331,8 +331,8 @@
 [322] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [323] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [324] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
-[325] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[326] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[325] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[326] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [327] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [328] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [329] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h
index d862577dd2a411e81317afdc0c934dff47acbd81..a59ceaab04f3e55e504661d6e7bd7a29c1834962 100644 (file)
--- a/linux/ia64/syscallent.h
+++ b/linux/ia64/syscallent.h
@@ -294,8 +294,8 @@
 [1024 + 284] = { 4,    TD,             SEN(timerfd),                   "timerfd"               },
 [1024 + 285] = { 1,    TD,             SEN(eventfd),                   "eventfd"               },
 [1024 + 286] = { 2,    TD,             SEN(timerfd_create),            "timerfd_create"        },
-[1024 + 287] = { 4,    TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[1024 + 288] = { 2,    TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[1024 + 287] = { 4,    TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[1024 + 288] = { 2,    TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [1024 + 289] = { 4,    TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [1024 + 290] = { 2,    TD,             SEN(eventfd2),                  "eventfd2"              },
 [1024 + 291] = { 1,    TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index dee14139291a21d8a8b4525a4a862c8bac348206..1f2b3db463cefa8e3d03f9188ad52607b12cebe9 100644 (file)
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -327,8 +327,8 @@
 [318] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [319] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [320] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
-[321] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[322] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[321] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[322] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [323] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [324] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [325] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h
index 5d1b176f4fe1c08233b5d6ad2f8c7dbfcab158f7..1389854f120a66e9456bc449737f8ab59df25f9f 100644 (file)
--- a/linux/microblaze/syscallent.h
+++ b/linux/microblaze/syscallent.h
@@ -332,8 +332,8 @@
 [323] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [324] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
 [325] = { 4,   TI,             SEN(semtimedop_time32),         "semtimedop"            },
-[326] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[327] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[326] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[327] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [328] = { 4,   TI,             SEN(semctl),                    "semctl"                },
 [329] = { 3,   TI,             SEN(semget),                    "semget"                },
 [330] = { 3,   TI,             SEN(semop),                     "semop"                 },

diff --git a/linux/mips/syscallent-n32.h b/linux/mips/syscallent-n32.h
index 4f0fd8fc49731fa07965470565c637b128b2c4f9..736da779c03aada3f4f3c82174069ec0d4301957 100644 (file)
--- a/linux/mips/syscallent-n32.h
+++ b/linux/mips/syscallent-n32.h
@@ -292,8 +292,8 @@
 [6282] = { 1,  TD,             SEN(eventfd),                   "eventfd"               },
 [6283] = { 4,  TD,             SEN(fallocate),                 "fallocate"             },
 [6284] = { 2,  TD,             SEN(timerfd_create),            "timerfd_create"        },
-[6285] = { 2,  TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
-[6286] = { 4,  TD,             SEN(timerfd_settime),           "timerfd_settime"       },
+[6285] = { 2,  TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
+[6286] = { 4,  TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
 [6287] = { 4,  TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [6288] = { 2,  TD,             SEN(eventfd2),                  "eventfd2"              },
 [6289] = { 1,  TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/mips/syscallent-n64.h b/linux/mips/syscallent-n64.h
index fb183be5019e664f5d3755ea6e0b7101467a015b..d4df7a0118b2b8d5eaa90ddf9d7298e8d5fae9c6 100644 (file)
--- a/linux/mips/syscallent-n64.h
+++ b/linux/mips/syscallent-n64.h
@@ -288,8 +288,8 @@
 [5278] = { 1,  TD,             SEN(eventfd),                   "eventfd"               },
 [5279] = { 4,  TD,             SEN(fallocate),                 "fallocate"             },
 [5280] = { 2,  TD,             SEN(timerfd_create),            "timerfd_create"        },
-[5281] = { 2,  TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
-[5282] = { 4,  TD,             SEN(timerfd_settime),           "timerfd_settime"       },
+[5281] = { 2,  TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
+[5282] = { 4,  TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
 [5283] = { 4,  TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [5284] = { 2,  TD,             SEN(eventfd2),                  "eventfd2"              },
 [5285] = { 1,  TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h
index cd68a2c6021a5e211eb5ec2133f4c646aefa8480..539d1f8cc10c89d7d4c1f34bc336952bf0cf11b7 100644 (file)
--- a/linux/mips/syscallent-o32.h
+++ b/linux/mips/syscallent-o32.h
@@ -330,8 +330,8 @@
 [4319] = { 1,  TD,             SEN(eventfd),                   "eventfd"               },
 [4320] = { 6,  TD,             SEN(fallocate),                 "fallocate"             },
 [4321] = { 2,  TD,             SEN(timerfd_create),            "timerfd_create"        },
-[4322] = { 2,  TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
-[4323] = { 4,  TD,             SEN(timerfd_settime),           "timerfd_settime"       },
+[4322] = { 2,  TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
+[4323] = { 4,  TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
 [4324] = { 4,  TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [4325] = { 2,  TD,             SEN(eventfd2),                  "eventfd2"              },
 [4326] = { 1,  TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
index 72850cc5939dc3902c9ed65fd12552b20b5c79e7..628c717c23fb50b8d6f4d43e0c5a2ff3b575209e 100644 (file)
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@@ -318,8 +318,8 @@
 [308] = { 6,   TD,             SEN(sync_file_range2),          "sync_file_range2"      },
 [309] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
 [310] = { 3,   0,              SEN(subpage_prot),              "subpage_prot"          },
-[311] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[312] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[311] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[312] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [313] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [314] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [315] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h
index 694a2bdf6d4427eff3925106192e88d7d1d4dcf6..0d3296ae0c9a2f5ad5e5e6f7158f301a2ee3e476 100644 (file)
--- a/linux/powerpc64/syscallent.h
+++ b/linux/powerpc64/syscallent.h
@@ -313,8 +313,8 @@
 [308] = { 4,   TD,             SEN(sync_file_range2),          "sync_file_range2"      },
 [309] = { 4,   TD,             SEN(fallocate),                 "fallocate"             },
 [310] = { 3,   0,              SEN(subpage_prot),              "subpage_prot"          },
-[311] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[312] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[311] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[312] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [313] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [314] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [315] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h
index 785f773ea7ad611f984298d586a455f78d9f58ab..a0992e3bc817fde9a8678f02e0bc061ee7b5d4bf 100644 (file)
--- a/linux/s390/syscallent.h
+++ b/linux/s390/syscallent.h
@@ -329,8 +329,8 @@
 [317] = { 4,   TD,             SEN(timerfd),                   "timerfd"               },
 [318] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [319] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
-[320] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[321] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[320] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[321] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [322] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [323] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [324] = { 1,   TD,             SEN(inotify_init1),             "inotify_init1"         },

diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h
index a7d89b358d388f323353c4df22f023073b435432..98c70540c72be4d8e736d60e90f18af2e6ea0a47 100644 (file)
--- a/linux/s390x/syscallent.h
+++ b/linux/s390x/syscallent.h
@@ -313,8 +313,8 @@
 [317] = { 4,   TD,             SEN(timerfd),                   "timerfd"               },
 [318] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [319] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
-[320] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[321] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[320] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[321] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [322] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [323] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [324] = { 1,   TD,             SEN(inotify_init1),             "inotify_init1"         },

diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index ec80694314a2aa86a60653bb19334ce012629faa..4523c0a4b10572a385d1bb6b3d85b488ead148d1 100644 (file)
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -331,8 +331,8 @@
 [322] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [323] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [324] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
-[325] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[326] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[325] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[326] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [327] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [328] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [329] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
index bf01043335f8ca983e7700a3aee49c20d6f21d55..4b92128394103783e2d86973921750ddccafeddb 100644 (file)
--- a/linux/sh64/syscallent.h
+++ b/linux/sh64/syscallent.h
@@ -357,8 +357,8 @@
 [350] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [351] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [352] = { 4,   TD,             SEN(fallocate),                 "fallocate"             },
-[353] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[354] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[353] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[354] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [355] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [356] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [357] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
index 887ed1a0a89779711eee35e01fec69ff92d7a054..d4365ce6053a984f0defa8ca6add3d02aaea876d 100644 (file)
--- a/linux/sparc/syscallent.h
+++ b/linux/sparc/syscallent.h
@@ -320,8 +320,8 @@
 [312] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [313] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [314] = { 6,   TD,             SEN(fallocate),                 "fallocate"             },
-[315] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[316] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[315] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[316] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [317] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [318] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [319] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h
index 0f82ee1f981c93194ae4e964943b25113a58fa0e..805d42f1764589835a146445305fcbbe29596308 100644 (file)
--- a/linux/sparc64/syscallent.h
+++ b/linux/sparc64/syscallent.h
@@ -318,8 +318,8 @@
 [312] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [313] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [314] = { 4,   TD,             SEN(fallocate),                 "fallocate"             },
-[315] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[316] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[315] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[316] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [317] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [318] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [319] = { 1,   TD,             SEN(epoll_create1),             "epoll_create1"         },

diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h
index e53665dc9be5337b2aeb8fe3e2690ebb97c579f6..4b64c3c67e10d65cdd4b72e689a71bcb6756ec05 100644 (file)
--- a/linux/x32/syscallent.h
+++ b/linux/x32/syscallent.h
@@ -291,8 +291,8 @@
 [283] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [284] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [285] = { 4,   TD,             SEN(fallocate),                 "fallocate"             },
-[286] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[287] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[286] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[287] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [288] = { 4,   TN,             SEN(accept4),                   "accept4"               },
 [289] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [290] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },

diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h
index 941cdcd68dacfa12c2bd0827a0c2410b74a49c24..89f2ad41697a399747cafdfbd80fe8948b869a8e 100644 (file)
--- a/linux/x86_64/syscallent.h
+++ b/linux/x86_64/syscallent.h
@@ -291,8 +291,8 @@
 [283] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
 [284] = { 1,   TD,             SEN(eventfd),                   "eventfd"               },
 [285] = { 4,   TD,             SEN(fallocate),                 "fallocate"             },
-[286] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[287] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[286] = { 4,   TD,             SEN(timerfd_settime64),         "timerfd_settime"       },
+[287] = { 2,   TD,             SEN(timerfd_gettime64),         "timerfd_gettime"       },
 [288] = { 4,   TN,             SEN(accept4),                   "accept4"               },
 [289] = { 4,   TD|TS,          SEN(signalfd4),                 "signalfd4"             },
 [290] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },

diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h
index e61ba9600140c70eecae8e85ed3fb535975807e7..93acedbd5a2fce3e5f9312b8c70c087c5d409be4 100644 (file)
--- a/linux/xtensa/syscallent.h
+++ b/linux/xtensa/syscallent.h
@@ -308,8 +308,8 @@
 [310] = { 3,   TD,             SEN(dup3),                      "dup3"                  },
 [311] = { 2,   TD,             SEN(pipe2),                     "pipe2"                 },
 [312] = { 2,   TD,             SEN(timerfd_create),            "timerfd_create"        },
-[313] = { 4,   TD,             SEN(timerfd_settime),           "timerfd_settime"       },
-[314] = { 2,   TD,             SEN(timerfd_gettime),           "timerfd_gettime"       },
+[313] = { 4,   TD,             SEN(timerfd_settime32),         "timerfd_settime"       },
+[314] = { 2,   TD,             SEN(timerfd_gettime32),         "timerfd_gettime"       },
 [315] = { },
 [316] = { 2,   TD,             SEN(eventfd2),                  "eventfd2"              },
 [317] = { 5,   TD,             SEN(preadv),                    "preadv"                },

diff --git a/pathtrace.c b/pathtrace.c
index 9758ba55186b045e98bb86101f32941096acd717..2e83c5c45e343b0921d19a1e789cadde4a2a832d 100644 (file)
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -343,9 +343,9 @@ pathtrace_match_set(struct tcb *tcp, struct path_set *set)
        case SEN_socket:
        case SEN_socketpair:
        case SEN_timerfd_create:
-       case SEN_timerfd_gettime:
+       case SEN_timerfd_gettime32:
        case SEN_timerfd_gettime64:
-       case SEN_timerfd_settime:
+       case SEN_timerfd_settime32:
        case SEN_timerfd_settime64:
        case SEN_userfaultfd:
                /*

diff --git a/time.c b/time.c
index c278aa98df186225bfcef58038e77acd47107bdf..68fbc89d5a2d5d9468425e471c01c181654aaa08 100644 (file)
--- a/time.c
+++ b/time.c
@@ -444,10 +444,12 @@ do_timerfd_settime(struct tcb *const tcp, const print_obj_by_addr_fn print_its)
        return 0;
 }
 
-SYS_FUNC(timerfd_settime)
+#if HAVE_ARCH_TIME32_SYSCALLS
+SYS_FUNC(timerfd_settime32)
 {
-       return do_timerfd_settime(tcp, print_itimerspec);
+       return do_timerfd_settime(tcp, print_itimerspec32);
 }
+#endif
 
 SYS_FUNC(timerfd_settime64)
 {
@@ -466,10 +468,12 @@ do_timerfd_gettime(struct tcb *const tcp, const print_obj_by_addr_fn print_its)
        return 0;
 }
 
-SYS_FUNC(timerfd_gettime)
+#if HAVE_ARCH_TIME32_SYSCALLS
+SYS_FUNC(timerfd_gettime32)
 {
-       return do_timerfd_gettime(tcp, print_itimerspec);
+       return do_timerfd_gettime(tcp, print_itimerspec32);
 }
+#endif
 
 SYS_FUNC(timerfd_gettime64)
 {