From patchwork Fri Dec 18 14:28:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jemma Denson X-Patchwork-Id: 7885231 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BB4A89F32E for ; Fri, 18 Dec 2015 14:29:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFC3320445 for ; Fri, 18 Dec 2015 14:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 285DD20426 for ; Fri, 18 Dec 2015 14:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964932AbbLRO3g (ORCPT ); Fri, 18 Dec 2015 09:29:36 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:34425 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933180AbbLRO3d (ORCPT ); Fri, 18 Dec 2015 09:29:33 -0500 Received: by mail-wm0-f54.google.com with SMTP id l126so67894845wml.1 for ; Fri, 18 Dec 2015 06:29:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pMsA+exijHMJxvBy2hi1lzXZL5rgPI3EEBotYCH4t3A=; b=EYiqDk/FxsrLq7/Xv/eiJOBo3HYQhnh2FlxZt/OxuUxBi0kWuqhjZY8ZxkXlIWwDbQ GUt6eEDPX9iL+1lBDmmYOZxfKYq+GqSOYaOxMF9Tif0Uyjgf9ENuHmIOwg0hqRQwcpTt Wl/Cb47SpaQj7qaqNUxbkCwWbw1lHAgMSIQR3J94lCSDHaSa3dOEIO8DBXpWY8MKzHBj JUBdArVWV6OwrBaHXXholcmjmIkgJuzTEy1LzB3+S6eDUSEXaq52KFI9FSHHVNmSbH3C vMhjUirInEmUIPCAi+77upq7dKyGh+y7YEz1jGM8fD2gfChSLrkAidthAlbOUWZR0rbz 3feA== X-Received: by 10.28.140.202 with SMTP id o193mr3395344wmd.38.1450448972172; Fri, 18 Dec 2015 06:29:32 -0800 (PST) Received: from localhost.brock (navahotech.plus.com. [84.92.64.232]) by smtp.gmail.com with ESMTPSA id 67sm6927998wmm.6.2015.12.18.06.29.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Dec 2015 06:29:31 -0800 (PST) From: Jemma Denson To: mchehab@osg.samsung.com Cc: linux-media@vger.kernel.org Subject: [v4l-utils PATCH-v2 2/4] dvbv5-zap.c: allow timeout with -x Date: Fri, 18 Dec 2015 14:28:24 +0000 Message-Id: <1450448906-17000-3-git-send-email-jdenson@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1450448906-17000-1-git-send-email-jdenson@gmail.com> References: <1450448906-17000-1-git-send-email-jdenson@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Timeout handlers aren't set when running with -x (exit after tuning). This patch adds handlers so -t can be used with -x. Without a timeout dvbv5-zap will run forever if there's no signal, preventing it's use by scripts to obtain signal stats. Signed-off-by: Jemma Denson --- utils/dvb/dvbv5-zap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c index e927383..2d19d45 100644 --- a/utils/dvb/dvbv5-zap.c +++ b/utils/dvb/dvbv5-zap.c @@ -855,6 +855,13 @@ int main(int argc, char **argv) goto err; if (args.exit_after_tuning) { + signal(SIGTERM, do_timeout); + signal(SIGINT, do_timeout); + if (args.timeout > 0) { + signal(SIGALRM, do_timeout); + alarm(args.timeout); + } + err = 0; check_frontend(&args, parms); goto err;