Blame 0001-Revert-Run-binary-package-generation-in-parallel-thr.patch
|
Igor Gnatenko |
c06560 |
From cb9e874ba52d866a86164ae8675ab6f07a35845e Mon Sep 17 00:00:00 2001
|
|
Igor Gnatenko |
c06560 |
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
Igor Gnatenko |
c06560 |
Date: Tue, 11 Jun 2019 00:07:49 +0200
|
|
Igor Gnatenko |
c06560 |
Subject: [PATCH] Revert "Run binary package generation in parallel threads"
|
|
Igor Gnatenko |
c06560 |
|
|
Igor Gnatenko |
c06560 |
https://github.com/rpm-software-management/rpm/issues/742
|
|
Igor Gnatenko |
c06560 |
|
|
Igor Gnatenko |
c06560 |
This reverts commit 18c92e6fe76df334fed8d5f04b5f40b776daba8c.
|
|
Igor Gnatenko |
c06560 |
---
|
|
Igor Gnatenko |
c06560 |
build/pack.c | 13 +------------
|
|
Igor Gnatenko |
c06560 |
1 file changed, 1 insertion(+), 12 deletions(-)
|
|
Igor Gnatenko |
c06560 |
|
|
Igor Gnatenko |
c06560 |
diff --git a/build/pack.c b/build/pack.c
|
|
Igor Gnatenko |
c06560 |
index 447e3ec94..e8d4c220c 100644
|
|
Igor Gnatenko |
c06560 |
--- a/build/pack.c
|
|
Igor Gnatenko |
c06560 |
+++ b/build/pack.c
|
|
Igor Gnatenko |
c06560 |
@@ -744,23 +744,12 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
|
|
Igor Gnatenko |
c06560 |
rpmRC rc = RPMRC_OK;
|
|
Igor Gnatenko |
c06560 |
Package pkg;
|
|
Igor Gnatenko |
c06560 |
|
|
Igor Gnatenko |
c06560 |
- /* Run binary creation in parallel */
|
|
Igor Gnatenko |
c06560 |
- #pragma omp parallel
|
|
Igor Gnatenko |
c06560 |
- #pragma omp single
|
|
Igor Gnatenko |
c06560 |
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
|
|
Igor Gnatenko |
c06560 |
- #pragma omp task
|
|
Igor Gnatenko |
c06560 |
- {
|
|
Igor Gnatenko |
c06560 |
pkg->rc = packageBinary(spec, pkg, cookie, cheating, &pkg->filename);
|
|
Igor Gnatenko |
c06560 |
- rpmlog(RPMLOG_DEBUG,
|
|
Igor Gnatenko |
c06560 |
- _("Finished binary package job, result %d, filename %s\n"),
|
|
Igor Gnatenko |
c06560 |
- pkg->rc, pkg->filename);
|
|
Igor Gnatenko |
c06560 |
if (pkg->rc) {
|
|
Igor Gnatenko |
c06560 |
- #pragma omp critical
|
|
Igor Gnatenko |
c06560 |
rc = pkg->rc;
|
|
Igor Gnatenko |
c06560 |
- }
|
|
Igor Gnatenko |
c06560 |
- } /* omp task */
|
|
Igor Gnatenko |
c06560 |
- if (rc)
|
|
Igor Gnatenko |
c06560 |
break;
|
|
Igor Gnatenko |
c06560 |
+ }
|
|
Igor Gnatenko |
c06560 |
}
|
|
Igor Gnatenko |
c06560 |
|
|
Igor Gnatenko |
c06560 |
/* Now check the package set if enabled */
|
|
Igor Gnatenko |
c06560 |
--
|
|
Igor Gnatenko |
c06560 |
2.22.0.rc3
|
|
Igor Gnatenko |
c06560 |
|