diff --git a/libcpuset/libcpuset.c b/libcpuset-changed/libcpuset.c
index a9af218..47abccf 100644
--- a/libcpuset/libcpuset.c
+++ b/libcpuset-changed/libcpuset.c
@@ -673,25 +673,25 @@ int cpuset_setmems(struct cpuset *cp, const struct
bitmask *mems)
/* Set integer value optname of cpuset cp */
int cpuset_set_iopt(struct cpuset *cp, const char *optionname, int value)
{
- if (streq(optionname, "cpu_exclusive")) {
+ if (streq(optionname, "cpuset.cpu_exclusive")) {
cp->cpu_exclusive = !!value;
cp->cpu_exclusive_valid = 1;
- } else if (streq(optionname, "mem_exclusive")) {
+ } else if (streq(optionname, "cpuset.mem_exclusive")) {
cp->mem_exclusive = !!value;
cp->mem_exclusive_valid = 1;
} else if (streq(optionname, "notify_on_release")) {
cp->notify_on_release = !!value;
cp->notify_on_release_valid = 1;
- } else if (streq(optionname, "memory_pressure_enabled")) {
+ } else if (streq(optionname, "cpuset.memory_pressure_enabled")) {
cp->memory_pressure_enabled = !!value;
cp->memory_pressure_enabled_valid = 1;
- } else if (streq(optionname, "memory_migrate")) {
+ } else if (streq(optionname, "cpuset.memory_migrate")) {
cp->memory_migrate = !!value;
cp->memory_migrate_valid = 1;
- } else if (streq(optionname, "memory_spread_page")) {
+ } else if (streq(optionname, "cpuset.memory_spread_page")) {
cp->memory_spread_page = !!value;
cp->memory_spread_page_valid = 1;
- } else if (streq(optionname, "memory_spread_slab")) {
+ } else if (streq(optionname, "cpuset.memory_spread_slab")) {
cp->memory_spread_slab = !!value;
cp->memory_spread_slab_valid = 1;
} else
@@ -847,19 +847,19 @@ err:
/* Return integer value of option optname in cp */
int cpuset_get_iopt(const struct cpuset *cp, const char *optionname)
{
- if (streq(optionname, "cpu_exclusive"))
+ if (streq(optionname, "cpuset.cpu_exclusive"))
return cp->cpu_exclusive;
- else if (streq(optionname, "mem_exclusive"))
+ else if (streq(optionname, "cpuset.mem_exclusive"))
return cp->mem_exclusive;
else if (streq(optionname, "notify_on_release"))
return cp->notify_on_release;
- else if (streq(optionname, "memory_pressure_enabled"))
+ else if (streq(optionname, "cpuset.memory_pressure_enabled"))
return cp->memory_pressure_enabled;
- else if (streq(optionname, "memory_migrate"))
+ else if (streq(optionname, "cpuset.memory_migrate"))
return cp->memory_migrate;
- else if (streq(optionname, "memory_spread_page"))
+ else if (streq(optionname, "cpuset.memory_spread_page"))
return cp->memory_spread_page;
- else if (streq(optionname, "memory_spread_slab"))
+ else if (streq(optionname, "cpuset.memory_spread_slab"))
return cp->memory_spread_slab;
else
return -1; /* optionname not recognized */
@@ -1649,37 +1649,37 @@ err:
static int apply_cpuset_settings(const char *path, const struct cpuset *cp)
{
if (cp->cpu_exclusive_valid &&
- store_flag(path, "cpu_exclusive", cp->cpu_exclusive) < 0)
+ store_flag(path, "cpuset.cpu_exclusive", cp->cpu_exclusive) < 0)
goto err;
if (cp->mem_exclusive_valid &&
- store_flag(path, "mem_exclusive", cp->mem_exclusive) < 0)
+ store_flag(path, "cpuset.mem_exclusive", cp->mem_exclusive) < 0)
goto err;
if (cp->notify_on_release_valid &&
store_flag(path, "notify_on_release", cp->notify_on_release) < 0)
goto err;
if (cp->memory_migrate_valid &&
- exists_flag(path, "memory_migrate")) {
- if (store_flag(path, "memory_migrate", cp->memory_migrate) < 0)
+ exists_flag(path, "cpuset.memory_migrate")) {
+ if (store_flag(path, "cpuset.memory_migrate",
cp->memory_migrate) < 0)
goto err;
}
if (cp->memory_pressure_enabled_valid &&
- exists_flag(path, "memory_pressure_enabled")) {
- if (store_flag(path, "memory_pressure_enabled",
cp->memory_pressure_enabled) < 0)
+ exists_flag(path, "cpuset.memory_pressure_enabled")) {
+ if (store_flag(path, "cpuset.memory_pressure_enabled",
cp->memory_pressure_enabled) < 0)
goto err;
}
if (cp->memory_spread_page_valid &&
- exists_flag(path, "memory_spread_page")) {
- if (store_flag(path, "memory_spread_page",
cp->memory_spread_page) < 0)
+ exists_flag(path, "cpuset.memory_spread_page")) {
+ if (store_flag(path, "cpuset.memory_spread_page",
cp->memory_spread_page) < 0)
goto err;
}
if (cp->memory_spread_slab_valid &&
- exists_flag(path, "memory_spread_slab")) {
- if (store_flag(path, "memory_spread_slab",
cp->memory_spread_slab) < 0)
+ exists_flag(path, "cpuset.memory_spread_slab")) {
+ if (store_flag(path, "cpuset.memory_spread_slab",
cp->memory_spread_slab) < 0)
goto err;
}
- if (cp->cpus_valid && store_mask(path, "cpus", cp->cpus) < 0)
+ if (cp->cpus_valid && store_mask(path, "cpuset.cpus", cp->cpus) < 0)
goto err;
- if (cp->mems_valid && store_mask(path, "mems", cp->mems) < 0)
+ if (cp->mems_valid && store_mask(path, "cpuset.mems", cp->mems) < 0)
goto err;
return 0;
err:
@@ -1849,6 +1849,7 @@ static int cr_or_mod(const char *relpath, const struct
cpuset *cp, int new)
goto err;
fullpath(buf, sizeof(buf), relpath);
+ fprintf(stderr, "\n\n%s\n", buf);
if (new) {
if (mkdir(buf, 0755) < 0)
@@ -1856,16 +1857,20 @@ static int cr_or_mod(const char *relpath, const struct
cpuset *cp, int new)
/* we made it, so we should remove it on error */
do_rmdir_on_err = 1;
}
+ fprintf(stderr, "mkdir succeeded\n");
if ((cp_sav = cpuset_alloc()) == NULL)
goto err;
+ fprintf(stderr, "cpuset alloc succeeded\n");
if (cpuset_query(cp_sav, relpath) < 0)
goto err;
+ fprintf(stderr, "query succeeded\n");
/* we have old settings to restore on error */
do_restore_cp_sav_on_err = 1;
if (apply_cpuset_settings(buf, cp) < 0)
goto err;
+ fprintf(stderr, "cpuset apply succeeded\n");
cpuset_free(cp_sav);
return 0;
@@ -1914,11 +1919,12 @@ int cpuset_query(struct cpuset *cp, const char *relpath)
fullpath(buf, sizeof(buf), relpath);
- if (load_flag(buf, &cp->cpu_exclusive, "cpu_exclusive") < 0)
+ if (load_flag(buf, &cp->cpu_exclusive, "cpuset.cpu_exclusive") < 0)
goto err;
cp->cpu_exclusive_valid = 1;
+ fprintf(stderr, "found cpu exclusive \n");
- if (load_flag(buf, &cp->mem_exclusive, "mem_exclusive") < 0)
+ if (load_flag(buf, &cp->mem_exclusive, "cpuset.mem_exclusive") < 0)
goto err;
cp->mem_exclusive_valid = 1;
@@ -1926,35 +1932,35 @@ int cpuset_query(struct cpuset *cp, const char *relpath)
goto err;
cp->notify_on_release_valid = 1;
- if (exists_flag(buf, "memory_migrate")) {
- if (load_flag(buf, &cp->memory_migrate, "memory_migrate") < 0)
+ if (exists_flag(buf, "cpuset.memory_migrate")) {
+ if (load_flag(buf, &cp->memory_migrate,
"cpuset.memory_migrate") < 0)
goto err;
cp->memory_migrate_valid = 1;
}
- if (exists_flag(buf, "memory_pressure_enabled")) {
- if (load_flag(buf, &cp->memory_pressure_enabled,
"memory_pressure_enabled") < 0)
+ if (exists_flag(buf, "cpuset.memory_pressure_enabled")) {
+ if (load_flag(buf, &cp->memory_pressure_enabled,
"cpuset.memory_pressure_enabled") < 0)
goto err;
cp->memory_pressure_enabled_valid = 1;
}
- if (exists_flag(buf, "memory_spread_page")) {
- if (load_flag(buf, &cp->memory_spread_page,
"memory_spread_page") < 0)
+ if (exists_flag(buf, "cpuset.memory_spread_page")) {
+ if (load_flag(buf, &cp->memory_spread_page,
"cpuset.memory_spread_page") < 0)
goto err;
cp->memory_spread_page_valid = 1;
}
- if (exists_flag(buf, "memory_spread_slab")) {
- if (load_flag(buf, &cp->memory_spread_slab,
"memory_spread_slab") < 0)
+ if (exists_flag(buf, "cpuset.memory_spread_slab")) {
+ if (load_flag(buf, &cp->memory_spread_slab,
"cpuset.memory_spread_slab") < 0)
goto err;
cp->memory_spread_slab_valid = 1;
}
- if (load_mask(buf, &cp->cpus, cpuset_cpus_nbits(), "cpus") < 0)
+ if (load_mask(buf, &cp->cpus, cpuset_cpus_nbits(), "cpuset.cpus") < 0)
goto err;
cp->cpus_valid = 1;
- if (load_mask(buf, &cp->mems, cpuset_mems_nbits(), "mems") < 0)
+ if (load_mask(buf, &cp->mems, cpuset_mems_nbits(), "cpuset.mems") < 0)
goto err;
cp->mems_valid = 1;
@@ -2686,16 +2692,16 @@ int cpuset_migrate(pid_t pid, const char *relpath)
fullpath(buf2, sizeof(buf2), relpath);
- if (load_flag(buf2, &memory_migrate_flag, "memory_migrate") < 0)
+ if (load_flag(buf2, &memory_migrate_flag, "cpuset.memory_migrate") < 0)
return -1;
- if (store_flag(buf2, "memory_migrate", 1) < 0)
+ if (store_flag(buf2, "cpuset.memory_migrate", 1) < 0)
return -1;
fullpath2(buf, sizeof(buf), relpath, "tasks");
r = __cpuset_move(pid, buf);
- store_flag(buf2, "memory_migrate", memory_migrate_flag);
+ store_flag(buf2, "cpuset.memory_migrate", memory_migrate_flag);
return r;
}
@@ -2713,9 +2719,9 @@ int cpuset_migrate_all(struct cpuset_pidlist *pl, const
char *relpath)
fullpath(buf2, sizeof(buf2), relpath);
- if (load_flag(buf2, &memory_migrate_flag, "memory_migrate") < 0)
+ if (load_flag(buf2, &memory_migrate_flag, "cpuset.memory_migrate") < 0)
return -1;
- if (store_flag(buf2, "memory_migrate", 1) < 0)
+ if (store_flag(buf2, "cpuset.memory_migrate", 1) < 0)
return -1;
fullpath2(buf, sizeof(buf), relpath, "tasks");
@@ -2725,7 +2731,7 @@ int cpuset_migrate_all(struct cpuset_pidlist *pl, const
char *relpath)
if (__cpuset_move(pl->pids[i], buf) < 0)
ret = -1;
- if (store_flag(buf2, "memory_migrate", memory_migrate_flag) < 0)
+ if (store_flag(buf2, "cpuset.memory_migrate", memory_migrate_flag) < 0)
ret = -1;
return ret;
}
@@ -3368,11 +3374,11 @@ int cpuset_import(struct cpuset *cp, const char *buf,
int *elinenum,
arg = strtok_r(0, " \t", &ptr);
- if (streq(tok, "cpu_exclusive")) {
+ if (streq(tok, "cpuset.cpu_exclusive")) {
cp->cpu_exclusive = 1;
goto eol;
}
- if (streq(tok, "mem_exclusive")) {
+ if (streq(tok, "cpuset.mem_exclusive")) {
cp->mem_exclusive = 1;
goto eol;
}
@@ -3380,28 +3386,28 @@ int cpuset_import(struct cpuset *cp, const char *buf,
int *elinenum,
cp->notify_on_release = 1;
goto eol;
}
- if (streq(tok, "memory_pressure_enabled")) {
+ if (streq(tok, "cpuset.memory_pressure_enabled")) {
cp->memory_pressure_enabled = 1;
goto eol;
}
- if (streq(tok, "memory_migrate")) {
+ if (streq(tok, "cpuset.memory_migrate")) {
cp->memory_migrate = 1;
goto eol;
}
- if (streq(tok, "memory_spread_page")) {
+ if (streq(tok, "cpuset.memory_spread_page")) {
cp->memory_spread_page = 1;
goto eol;
}
- if (streq(tok, "memory_spread_slab")) {
+ if (streq(tok, "cpuset.memory_spread_slab")) {
cp->memory_spread_slab = 1;
goto eol;
}
- if (streq(tok, "cpu") || streq(tok, "cpus")) {
+ if (streq(tok, "cpu") || streq(tok, "cpuset.cpus")) {
if (import_list(tok, arg, cp->cpus, emsg, elen) < 0)
goto err;
goto eol;
}
- if (streq(tok, "mem") || streq(tok, "mems")) {
+ if (streq(tok, "mem") || streq(tok, "cpuset.mems")) {
if (import_list(tok, arg, cp->mems, emsg, elen) < 0)
goto err;
goto eol;
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1833317
Title:
Flag filename doesn't match cpuset filesystem
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/libcpuset/+bug/1833317/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
