Skip to content

[PATCH] util: fix max socket calculation #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
3d0c wants to merge 1 commit into from
+30 −3
Closed

[PATCH] util: fix max socket calculation #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions src/util/virhostcpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ virHostCPUParseNode(const char *node,
int siblings;
unsigned int cpu;
int direrr;
GHashTable *st = g_hash_table_new(g_direct_hash, g_direct_equal);
gpointer sock_resolved;

*threads = 0;
*cores = 0;
Expand All @@ -356,15 +358,29 @@ virHostCPUParseNode(const char *node,
if (virHostCPUGetSocket(cpu, &sock) < 0)
goto cleanup;

virBitmapSetBitExpand(sockets_map, sock);
if (!g_hash_table_lookup_extended(st,
GUINT_TO_POINTER(sock),
NULL,
&sock_resolved)) {
g_hash_table_insert(st,
GUINT_TO_POINTER(sock),
GUINT_TO_POINTER(sock_max));
sock = sock_max;
sock_max++;
} else {
sock = GPOINTER_TO_UINT(sock_resolved);
}

if (sock > sock_max)
sock_max = sock;
virBitmapSetBitExpand(sockets_map, sock);
}

if (direrr < 0)
goto cleanup;

if (sock_max == 0) {
g_hash_table_insert(st, GUINT_TO_POINTER(0), GUINT_TO_POINTER(sock_max));
}

sock_max++;

/* allocate cores maps for each socket */
Expand Down Expand Up @@ -400,6 +416,16 @@ virHostCPUParseNode(const char *node,

if (virHostCPUGetSocket(cpu, &sock) < 0)
goto cleanup;

if (!g_hash_table_lookup_extended(st,
GUINT_TO_POINTER(sock),
NULL,
&sock_resolved)) {
goto cleanup;
}

sock = GPOINTER_TO_UINT(sock_resolved);

if (!virBitmapIsBitSet(sockets_map, sock)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("CPU socket topology has changed"));
Expand Down Expand Up @@ -449,6 +475,7 @@ virHostCPUParseNode(const char *node,
for (i = 0; i < sock_max; i++)
virBitmapFree(cores_maps[i]);
VIR_FREE(cores_maps);
g_hash_table_destroy(st);

return ret;
}
Expand Down