From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, jrnieder@gmail.com
Cc: Jens.Lehmann@web.de, peff@peff.net, sunshine@sunshineco.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/7] run-command: expose default_{start_failure, task_finished}
Date: Wed, 24 Feb 2016 17:42:00 -0800 [thread overview]
Message-ID: <1456364525-21190-3-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1456364525-21190-1-git-send-email-sbeller@google.com>
We want to reuse the error reporting facilities in a later patch.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
run-command.c | 18 +++++++++---------
run-command.h | 19 +++++++++++++++++++
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/run-command.c b/run-command.c
index 1f86728..71abafb 100644
--- a/run-command.c
+++ b/run-command.c
@@ -902,10 +902,10 @@ struct parallel_processes {
struct strbuf buffered_output; /* of finished children */
};
-static int default_start_failure(struct child_process *cp,
- struct strbuf *err,
- void *pp_cb,
- void *pp_task_cb)
+int default_start_failure(struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb)
{
int i;
@@ -916,11 +916,11 @@ static int default_start_failure(struct child_process *cp,
return 0;
}
-static int default_task_finished(int result,
- struct child_process *cp,
- struct strbuf *err,
- void *pp_cb,
- void *pp_task_cb)
+int default_task_finished(int result,
+ struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb)
{
int i;
diff --git a/run-command.h b/run-command.h
index d5a57f9..a054fa6 100644
--- a/run-command.h
+++ b/run-command.h
@@ -164,6 +164,15 @@ typedef int (*start_failure_fn)(struct child_process *cp,
void *pp_task_cb);
/**
+ * If a command fails to start, then print an error message stating the
+ * exact command which failed.
+ */
+int default_start_failure(struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb);
+
+/**
* This callback is called on every child process that finished processing.
*
* You must not write to stdout or stderr in this function. Add your
@@ -184,6 +193,16 @@ typedef int (*task_finished_fn)(int result,
void *pp_task_cb);
/**
+ * If the child process returns with a non zero error code, print
+ * an error message of the exact command which failed.
+ */
+int default_task_finished(int result,
+ struct child_process *cp,
+ struct strbuf *err,
+ void *pp_cb,
+ void *pp_task_cb);
+
+/**
* Runs up to n processes at the same time. Whenever a process can be
* started, the callback get_next_task_fn is called to obtain the data
* required to start another child process.
--
2.7.2.335.g3f96d05
next prev parent reply other threads:[~2016-02-25 1:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 1:41 [PATCHv16 0/7] Expose submodule parallelism to the user Stefan Beller
2016-02-25 1:41 ` [PATCH 1/7] run_processes_parallel: treat output of children as byte array Stefan Beller
2016-02-25 1:42 ` Stefan Beller [this message]
2016-02-25 1:42 ` [PATCH 3/7] run_processes_parallel: rename parameters for the callbacks Stefan Beller
2016-02-25 1:47 ` Jonathan Nieder
2016-02-25 1:42 ` [PATCH 4/7] run_processes_parallel: correctly terminate callbacks with an LF Stefan Beller
2016-02-25 1:42 ` [PATCH 5/7] git submodule update: have a dedicated helper for cloning Stefan Beller
2016-02-25 1:42 ` [PATCH 6/7] submodule update: expose parallelism to the user Stefan Beller
2016-02-25 1:42 ` [PATCH 7/7] clone: allow an explicit argument for parallel submodule clones Stefan Beller
2016-02-25 1:54 ` [PATCHv16 0/7] Expose submodule parallelism to the user Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456364525-21190-3-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).