From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD4C8C433EF for ; Fri, 22 Apr 2022 22:36:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233828AbiDVWjO (ORCPT ); Fri, 22 Apr 2022 18:39:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234348AbiDVWiI (ORCPT ); Fri, 22 Apr 2022 18:38:08 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D32B41F9E23 for ; Fri, 22 Apr 2022 14:30:15 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id bv16so12723107wrb.9 for ; Fri, 22 Apr 2022 14:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Mv6D24bMSysj3hV8m09u6C4BPD9U2eW4vus0bJo6UBo=; b=DVDAOTbEJP/3lGQ8nhTuMvxuNFo3kkL0Ut8qFvKEj6tPNAayXc7KBUKTJbaJ3pG9UW IipehsHaJ5rI7QsIUdqgFSfD8fmL1JeI51ABByx8l2RLuwMm141xWcgyfSAxUqlHk8Gr eGiIE0wiueZbR1XrBzVVhZVUCuOabRnMfL5yS4KAZEI9FbCwC/4M6yGF2s9m/2ONdmvx jjCIPS4nOWI2U08VYgv/lPCeBf8N8ayxPYidhKgOgAVol1cJwpWq9NGs5ZVEBnnTHjEs mMWkhTjSHlB79YMzTZ//2X0QVgTgv8FrlWhYw4T3+yCp/FmqYfsujecYuJgGb2/T+bGJ s0Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Mv6D24bMSysj3hV8m09u6C4BPD9U2eW4vus0bJo6UBo=; b=ILx6EjvTZ8Uj8uzVIw+AoEjzJeCtYUUhXD782Q/Vg0RQMplI56cP9aEaezWGRw4z+j hnqQL/L4R3hc+Qo/X2F3IhBxYXRYlQ/45P8XGqCRXYpoI+/+oyvvoaxfwSURVCkt6NDe 3Dgb+mVkHAwf8JY8EYuiC/Du0JODCbDQGKzhSr6L+f7Lz0UD/Y2Oooww+x0xIAvmmnwl WCFqosvBc8ISKqNulioolq3lKaiqA+YrXCuTwBAUbUy3mTvbxI2C1oD2Qb7NIz+njX8W oczDMNYo7zI7AY0WqboBKGKBGM+Il+F8x7Cv/2ajGvedipnmc9KRsqRnCRueqOB8sigQ 5pwg== X-Gm-Message-State: AOAM530GHKJesk3Apu5ILp0JJnSEv2HH1KZ8TQrgcVy81LIfX9k7gOTh GCGccCqBWS0DYjLeTRsnhE8fc0UUIhE= X-Google-Smtp-Source: ABdhPJwlUpq6UGAkkD1fQtqaNbHx5a6yXAN1ufIDxMYW6oqhqUqbS/1w86cx/rC9Ee9PbXRhP4uGWA== X-Received: by 2002:a05:6000:10c7:b0:206:35e:8711 with SMTP id b7-20020a05600010c700b00206035e8711mr5212938wrx.78.1650663014140; Fri, 22 Apr 2022 14:30:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o10-20020a5d47ca000000b0020a992ce354sm3072062wrc.76.2022.04.22.14.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 14:30:13 -0700 (PDT) Message-Id: <77bc037481a89d69a2c038e5ff0c6d3d5ac656f1.1650662994.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Date: Fri, 22 Apr 2022 21:29:43 +0000 Subject: [PATCH v6 17/28] fsm-health-win32: add polling framework to monitor daemon health Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jeff Hostetler , Derrick Stolee , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Torsten =?unknown-8bit?Q?B=C3=B6gershausen?= , rsbecker@nexbridge.com, Bagas Sanjaya , Jeff Hostetler , Jeff Hostetler Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jeff Hostetler Extend the Windows version of the "health" thread to periodically inspect the system and shutdown if warranted. This commit updates the thread's wait loop to use a timeout and defines a (currently empty) table of functions to poll the system. A later commit will add functions to the table to actually inspect the system. Signed-off-by: Jeff Hostetler --- compat/fsmonitor/fsm-health-win32.c | 65 ++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/compat/fsmonitor/fsm-health-win32.c b/compat/fsmonitor/fsm-health-win32.c index 94b1d020f25..24fc612bf02 100644 --- a/compat/fsmonitor/fsm-health-win32.c +++ b/compat/fsmonitor/fsm-health-win32.c @@ -4,6 +4,24 @@ #include "fsm-health.h" #include "fsmonitor--daemon.h" +/* + * Every minute wake up and test our health. + */ +#define WAIT_FREQ_MS (60 * 1000) + +/* + * State machine states for each of the interval functions + * used for polling our health. + */ +enum interval_fn_ctx { + CTX_INIT = 0, + CTX_TERM, + CTX_TIMER +}; + +typedef int (interval_fn)(struct fsmonitor_daemon_state *state, + enum interval_fn_ctx ctx); + struct fsm_health_data { HANDLE hEventShutdown; @@ -42,18 +60,61 @@ void fsm_health__dtor(struct fsmonitor_daemon_state *state) FREE_AND_NULL(state->health_data); } +/* + * A table of the polling functions. + */ +static interval_fn *table[] = { + NULL, /* must be last */ +}; + +/* + * Call all of the polling functions in the table. + * Shortcut and return first error. + * + * Return 0 if all succeeded. + */ +static int call_all(struct fsmonitor_daemon_state *state, + enum interval_fn_ctx ctx) +{ + int k; + + for (k = 0; table[k]; k++) { + int r = table[k](state, ctx); + if (r) + return r; + } + + return 0; +} + void fsm_health__loop(struct fsmonitor_daemon_state *state) { struct fsm_health_data *data = state->health_data; + int r; + + r = call_all(state, CTX_INIT); + if (r < 0) + goto force_error_stop; + if (r > 0) + goto force_shutdown; for (;;) { DWORD dwWait = WaitForMultipleObjects(data->nr_handles, data->hHandles, - FALSE, INFINITE); + FALSE, WAIT_FREQ_MS); if (dwWait == WAIT_OBJECT_0 + HEALTH_SHUTDOWN) goto clean_shutdown; + if (dwWait == WAIT_TIMEOUT) { + r = call_all(state, CTX_TIMER); + if (r < 0) + goto force_error_stop; + if (r > 0) + goto force_shutdown; + continue; + } + error(_("health thread wait failed [GLE %ld]"), GetLastError()); goto force_error_stop; @@ -61,8 +122,10 @@ void fsm_health__loop(struct fsmonitor_daemon_state *state) force_error_stop: state->health_error_code = -1; +force_shutdown: ipc_server_stop_async(state->ipc_server_data); clean_shutdown: + call_all(state, CTX_TERM); return; } -- gitgitgadget