Brice -- do you need to move r1195 and r1196 to the v0.9 branch?
Also, r1198 didn't merge cleanly into v0.9 -- are there bugs fixed on
the trunk that didn't make it over to v0.9? An example is in topology-
linux.c; svn merge didn't find a corresponding section for the change,
but the section below it seems like it might have been replaced by the
conflicting section...?
-----
<<<<<<< .working
=======
/* check whether a cgroup-cpuset is enabled */
fd = hwloc_fopen("proc/self/cgroup", "r", fsroot_fd);
if (fd) {
/* find a cpuset line */
#define CGROUP_LINE_LEN 256
char line[CGROUP_LINE_LEN];
while (fgets(line, sizeof(line), fd)) {
char *end, *colon = strchr(line, ':');
if (!colon)
continue;
if (strncmp(colon, ":cpuset:", 8))
continue;
/* found a cgroup-cpuset line, return the name */
fclose(fd);
end = strchr(colon, '\n');
if (end)
*end = '\0';
hwloc_debug("Found cgroup-cpuset %s\n", colon+8);
return strdup(colon+8);
}
fclose(fd);
}
>>>>>>> .merge-right.r1198
/* check whether a cpuset is enabled */
fd = hwloc_fopen(filename, "r", fsroot_fd);
if (!fd)
return 0;
fgets(cpuset_name, sizeof(cpuset_name), fd);
fclose(fd);
-----
--
Jeff Squyres
[email protected]
