From patchwork Sat Jul 31 05:35:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhanshu Saxena X-Patchwork-Id: 29145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp136307ios; Fri, 30 Jul 2021 22:44:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDfN7FpJ4klULog/ndcuod5j7HtT5qbUZIMDwjQtgWMiYHSIULewyDAHQXzMCHgKBDedws X-Received: by 2002:a17:906:8152:: with SMTP id z18mr6308122ejw.419.1627710269069; Fri, 30 Jul 2021 22:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627710269; cv=none; d=google.com; s=arc-20160816; b=tEJB2HORK35fTcbwyS/Ytb8EklAJ/xjUD2nXpnyjNmpxSOcQ0sQgrEIwuIEIdGqkQu 8kltBftjlw1Aqjfz75hEDBRjAKDXrh9RInqoU1mpmFliqFy77LWYHScmDRz1y2qjT6BL aUmgvWONFMAjhUmFENzaDN7GZ/+8EPY/LaBgrl62eAqPnUYd6Fx1vY5/cppBQo+GGY3Y 8S1RHuvBJgWOFDdyAvGVrpqIaTVM+Og3LJrFSLm1fKmJBQgF4eBynv4g2wRUAWCWIZyg YvETwFTsyuNIht2ppI3E+WGNhC3U+IR9aievvoWx6j/9xP2kCWx5UX7ze8VrlI+bwABt 54rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=PquoaGuVaabw19GMBimaFa/zV1bHx/p/nPndb+VBQ9c=; b=qWMVDSHzpp4aVnQ09p0FJ2eR/LCrR5WnDg1xW3/3y5/Wj3eeifSU5Yjux1OhQoy0Eo /1y23/rugP3AI3QFOIrdN9W0uCxVy5q8x9IjK6Wm72K1sGU+WxCtipKZeYyMjo6IA8HF pP0YQeicPP/X9WTMN1m7jkzmYaCRmam80dQLWXZBD3vq0jS+unZG44u++BJltq1LRFrL nGz2jyO5Zf/9K+NUE1x2QxiJr36O4H3nUCCjxdL0qGF3dS/fytHhgkBI0XdW1hyBRO0r Gf9/55UapRZhXXoWGh9BFc3vy+YzhCpoF8xajGYMJ8HF/Uo9+jGWUr6Y9m0JORkmC9UX RR0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bGYNZU4E; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v6si3954259ejg.102.2021.07.30.22.44.28; Fri, 30 Jul 2021 22:44:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bGYNZU4E; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB8B768A412; Sat, 31 Jul 2021 08:44:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 067FB68022F for ; Sat, 31 Jul 2021 08:44:20 +0300 (EEST) Received: by mail-pl1-f179.google.com with SMTP id k1so13538304plt.12 for ; Fri, 30 Jul 2021 22:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vauU9bb9s1tBNjhXdaNfdF9AKP8/RU27dqP7XBh53/Q=; b=bGYNZU4Eag+F419ZuaAOeAmKZzJdPmcNx1q0s8U0enQ/+gVdtBxEFu2ev6Py+uyvjP 2cqqkb2mxRPY+vwdA/BffJLYQE0kyoMwrTMdFg6baFs1ucRJlelhCMLLgR9qCnf13YpI ilBEe1eeXWYNpnJ/paylvMX+cmxISBo28GnUrWtXpSv7JTYcqHG++NvGq9n4y/sRJCvl 7h86QnddLHNirRM+nmf7I0dgWm92BBb1TefHSLuhEhNZMl7YaccNcbcxqHLJaqUs94hM zuNm4xBfJCYJ8SU3oXD/3GS0prFOLmb26x8xol/VfGQWHTAmTvwvNkiRUhB1raf1cHU4 LnNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vauU9bb9s1tBNjhXdaNfdF9AKP8/RU27dqP7XBh53/Q=; b=ITRfK2tHvzl8Vc60JMAzTY3mjSSuVINTWpp9gLNvmS9EtGP/WDbceUiXNWIzWGelKA MqEJS9dbDdz8v50fIyo39FZIUikRZjNau3fEAtOjNCE3d1e2Cvkvwqt+L7jB75ne48uW rcpGifjuUZvbs+OQuGCJ41R2jTRp/71yL9MFE1kslVcxR9MAW6cVLw5svEGoewAcRuiM 0ETSn7yU7ften5WuH/EQclriHAwFBnaRzrByMDnbItYncCGG4C6SFEWi1lmpZf5zECBj uwXDn7KgPqYuCbVmyQZXogCoWdFdkR25eDwVPUe6kovMTTCU6IwjvA4BOYv4wq0dwLzn UYJw== X-Gm-Message-State: AOAM530zoGjjt3viTCTDEwHAkuq0AA8Iz6bpZCSeSKmzRX/9BJQcOXvs dQ9Fmk8It5m6ZfdzdY5mQTxBZhA8hVF3uQ== X-Received: by 2002:a65:564f:: with SMTP id m15mr3462108pgs.346.1627709763368; Fri, 30 Jul 2021 22:36:03 -0700 (PDT) Received: from localhost.localdomain ([103.157.220.250]) by smtp.googlemail.com with ESMTPSA id p34sm4312266pfh.172.2021.07.30.22.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 22:36:03 -0700 (PDT) From: Shubhanshu Saxena To: ffmpeg-devel@ffmpeg.org Date: Sat, 31 Jul 2021 11:05:13 +0530 Message-Id: <20210731053516.7700-5-shubhanshu.e01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210731053516.7700-1-shubhanshu.e01@gmail.com> References: <20210731053516.7700-1-shubhanshu.e01@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] lavfi/dnn_backend_tf: Error Handling for execute_model_tf X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Shubhanshu Saxena Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OuO/OFhR3PEK This patch adds error handling for cases where the execute_model_tf fails, clears the used memory in the TFRequestItem and finally pushes it back to the request queue. Signed-off-by: Shubhanshu Saxena --- libavfilter/dnn/dnn_backend_tf.c | 52 ++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index d3658c3308..102e91a667 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -172,6 +172,24 @@ static DNNReturnType tf_start_inference(void *args) return DNN_SUCCESS; } +/** + * Free the TFRequestItem completely. + * + * @param arg Address of the TFInferRequest instance. + */ +static inline void destroy_request_item(TFRequestItem **arg) { + TFRequestItem *request; + if (!arg) { + return; + } + request = *arg; + tf_free_request(request->infer_request); + av_freep(&request->infer_request); + av_freep(&request->inference); + ff_dnn_async_module_cleanup(&request->exec_module); + av_freep(arg); +} + static DNNReturnType extract_inference_from_task(TaskItem *task, Queue *inference_queue) { TFModel *tf_model = task->model; @@ -880,6 +898,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_ if (!item) { goto err; } + item->inference = NULL; item->infer_request = tf_create_inference_request(); if (!item->infer_request) { av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for TensorFlow inference request\n"); @@ -891,8 +910,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_ item->exec_module.args = item; if (ff_safe_queue_push_back(tf_model->request_queue, item) < 0) { - av_freep(&item->infer_request); - av_freep(&item); + destroy_request_item(&item); goto err; } } @@ -1059,8 +1077,7 @@ err: av_freep(&outputs); if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { - av_freep(&request->infer_request); - av_freep(&request); + destroy_request_item(&request); av_log(ctx, AV_LOG_ERROR, "Failed to push back request_queue.\n"); } } @@ -1072,28 +1089,35 @@ static DNNReturnType execute_model_tf(TFRequestItem *request, Queue *inference_q InferenceItem *inference; TaskItem *task; - inference = ff_queue_peek_front(inference_queue); - if (!inference) { - av_log(NULL, AV_LOG_ERROR, "Failed to get inference item\n"); - return DNN_ERROR; + if (ff_queue_size(inference_queue) == 0) { + destroy_request_item(&request); + return DNN_SUCCESS; } + + inference = ff_queue_peek_front(inference_queue); task = inference->task; tf_model = task->model; ctx = &tf_model->ctx; if (fill_model_input_tf(tf_model, request) != DNN_SUCCESS) { - return DNN_ERROR; + goto err; } if (task->async) { return ff_dnn_start_inference_async(ctx, &request->exec_module); } else { if (tf_start_inference(request) != DNN_SUCCESS) { - return DNN_ERROR; + goto err; } infer_completion_callback(request); return (task->inference_done == task->inference_todo) ? DNN_SUCCESS : DNN_ERROR; } +err: + tf_free_request(request->infer_request); + if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { + destroy_request_item(&request); + } + return DNN_ERROR; } DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNExecBaseParams *exec_params) @@ -1193,8 +1217,7 @@ DNNReturnType ff_dnn_flush_tf(const DNNModel *model) if (ret != DNN_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Failed to fill model input.\n"); if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { - av_freep(&request->infer_request); - av_freep(&request); + destroy_request_item(&request); } return ret; } @@ -1210,10 +1233,7 @@ void ff_dnn_free_model_tf(DNNModel **model) tf_model = (*model)->model; while (ff_safe_queue_size(tf_model->request_queue) != 0) { TFRequestItem *item = ff_safe_queue_pop_front(tf_model->request_queue); - ff_dnn_async_module_cleanup(&item->exec_module); - tf_free_request(item->infer_request); - av_freep(&item->infer_request); - av_freep(&item); + destroy_request_item(&item); } ff_safe_queue_destroy(tf_model->request_queue);