diff options
author | Maciej Żenczykowski <maze@google.com> | 2023-04-17 22:37:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-17 22:37:37 +0000 |
commit | 7d96bf02a135f6edcdad90c695515a5d5d1ee119 (patch) | |
tree | 710ed2f70d2d8b2fec91cb1e2e4c44daf13eaf62 | |
parent | c169096459affc02569aa73ebbb1093a99ea9b5d (diff) | |
parent | 9c05f75eaa7d8e04c8f67c2cf6840ec9f79940d0 (diff) | |
download | android-clat-7d96bf02a135f6edcdad90c695515a5d5d1ee119.tar.gz |
clatd: only wait 15s for SIGTERM during shutdown am: 9c05f75eaa
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/2535679
Change-Id: I3321fcc0215afb2ddd9a5bb5764cbb05796408a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | main.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -194,8 +194,12 @@ int main(int argc, char **argv) { if (running) { logmsg(ANDROID_LOG_INFO, "Clatd on %s waiting for SIGTERM", uplink_interface); - while (running) sleep(60); - logmsg(ANDROID_LOG_INFO, "Clatd on %s received SIGTERM", uplink_interface); + // let's give higher level java code 15 seconds to kill us, + // but eventually terminate anyway, in case system server forgets about us... + // sleep() should be interrupted by SIGTERM, the handler should clear running + sleep(15); + logmsg(ANDROID_LOG_INFO, "Clatd on %s %s SIGTERM", uplink_interface, + running ? "timed out waiting for" : "received"); } else { logmsg(ANDROID_LOG_INFO, "Clatd on %s already received SIGTERM", uplink_interface); } |