From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 14 Dec 2024 16:13:57 +0000 (+0000)
Subject: build: Move cgroup accounting here
X-Git-Tag: 0.9.30~700
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef54dc1f63a5341fb27e4efc4419bfb47a21ee00;p=pakfire.git

build: Move cgroup accounting here

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 93d3c8561..2df93a737 100644
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -1355,6 +1355,19 @@ static int pakfire_build_setup_cgroup(struct pakfire_build* build) {
 		goto ERROR;
 	}
 
+	// Enable accounting to collect stats
+	r = pakfire_cgroup_enable_accounting(build->cgroup);
+	if (r < 0) {
+		switch (-r) {
+			case ENOTSUP:
+				DEBUG(build->ctx, "Could not enable accounting in cgroup\n");
+				break;
+
+			default:
+				goto ERROR;
+		}
+	}
+
 	// Fetch config
 	config = pakfire_get_config(build->pakfire);
 	if (!config)
diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index eac4ea2f2..e32fdb293 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -1506,19 +1506,6 @@ static int __pakfire_jail_exec(struct pakfire_jail* jail,
 		// Fetch our UUID
 		const char* uuid = pakfire_jail_uuid(jail);
 
-		// Enable accounting to collect stats
-		r = pakfire_cgroup_enable_accounting(jail->cgroup);
-		if (r < 0) {
-			switch (-r) {
-				case ENOTSUP:
-					DEBUG(jail->ctx, "Could not enable accounting in cgroup\n");
-					break;
-
-				default:
-					goto ERROR;
-			}
-		}
-
 		// Create a temporary cgroup
 		r = pakfire_cgroup_child(&ctx.cgroup, jail->cgroup, uuid, 0);
 		if (r < 0) {