Attachment 80222 Details for Bug 64285 – Avoid having two of the same set of commands run in parallel

[patch] Avoid having two of the same set of commands run in parallel

0007-Avoid-having-two-of-the-same-set-of-commands-run-in-.patch (text/plain), 3.12 KB, created by Simon McVittie on 2013-06-03 11:58:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-06-03 11:58:09 UTC

Size: 3.12 KB

patch

obsolete

>From 4b9cf6c4d7bbc33eea69bbd3602aa108f994ef71 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 3 Jun 2013 12:40:50 +0100
>Subject: [PATCH 7/8] Avoid having two of the same set of commands run in
> parallel
>
>A rule like this:
>
>    _gen/x.c _gen/x.h: prerequisites
>        $(AM_V_GEN)x-generator
>
>doesn't consider x.c and x.h together. Instead, it expands to two rules,
>one to generate x.c and one to generate x.h, which happen to run the
>same commands.
>
>This means that in the worst case, you can end up running x-generator
>twice in parallel, and they'll race with each other and overwrite or
>delete each other's output.
>
>Based on commit 36c2a545c from telepathy-glib.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64285
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> extensions/Makefile.am |   28 +++++++++++++++++++---------
> 1 file changed, 19 insertions(+), 9 deletions(-)
>
>diff --git a/extensions/Makefile.am b/extensions/Makefile.am
>index ecb02ef..b435ae3 100644
>--- a/extensions/Makefile.am
>+++ b/extensions/Makefile.am
>@@ -59,8 +59,11 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl Makefile.am
> 		$(tools_dir)/doc-generator.xsl \
> 		$< > $@
> 
>-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py \
>-	Makefile.am
>+_gen/svc.h: _gen/svc.c
>+	@: # do nothing, output as a side-effect
>+_gen/svc-gtk-doc.h: _gen/svc.c
>+	@: # do nothing, output as a side-effect
>+_gen/svc.c: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py Makefile.am
> 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
> 		--filename=_gen/svc \
> 		--include='<telepathy-glib/telepathy-glib.h>' \
>@@ -68,18 +71,25 @@ _gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/glib-ginterf
> 		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
> 		$< Gabble_Svc_
> 
>-_gen/enums.h _gen/enums-gtk-doc.h: _gen/all.xml $(tools_dir)/c-constants-gen.py \
>-	Makefile.am
>+_gen/enums-gtk-doc.h: _gen/enums.h
>+	@: # do nothing, output as a side-effect
>+_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-gen.py Makefile.am
> 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Gabble $< _gen/enums
> 
>-_gen/interfaces.h _gen/interfaces-body.h _gen/interfaces-gtk-doc.h: _gen/all.xml \
>-	$(tools_dir)/glib-interfaces-gen.py \
>-	Makefile.am
>+_gen/interfaces-body.h: _gen/interfaces.h
>+	@: # do nothing, output as a side-effect
>+_gen/interfaces-gtk-doc.h: _gen/interfaces.h
>+	@: # do nothing, output as a side-effect
>+_gen/interfaces.h: _gen/all.xml $(tools_dir)/glib-interfaces-gen.py Makefile.am
> 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
> 		Gabble _gen/interfaces-body.h _gen/interfaces.h $<
> 
>-_gen/gtypes.h _gen/gtypes-body.h _gen/gtypes-gtk-doc.h: _gen/all.xml \
>-	$(tools_dir)/glib-gtypes-generator.py Makefile.am
>+_gen/gtypes.h: _gen/gtypes-body.h
>+	@: # do nothing, output as a side-effect
>+_gen/gtypes-gtk-doc.h: _gen/gtypes-body.h
>+	@: # do nothing, output as a side-effect
>+
>+_gen/gtypes-body.h: _gen/all.xml $(tools_dir)/glib-gtypes-generator.py Makefile.am
> 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
> 		$< _gen/gtypes Gabble
> 
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 64285: 80222 | 80244

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.