External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx_vi: Use automatic mutex management

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-02-16 17:07:30 +01:00
parent 12e19f172d
commit 3d836f828a
1 changed files with 47 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/esx/esx_vi.c
View File

@ -380,8 +380,7 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content,
range = g_strdup_printf("%llu-", offset); range = g_strdup_printf("%llu-", offset);
} }
virMutexLock(&curl->lock); VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) {
curl_easy_setopt(curl->handle, CURLOPT_URL, url); curl_easy_setopt(curl->handle, CURLOPT_URL, url);
curl_easy_setopt(curl->handle, CURLOPT_RANGE, range); curl_easy_setopt(curl->handle, CURLOPT_RANGE, range);
curl_easy_setopt(curl->handle, CURLOPT_WRITEDATA, &buffer); curl_easy_setopt(curl->handle, CURLOPT_WRITEDATA, &buffer);
@ -389,8 +388,7 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content,
curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1); curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1);
responseCode = esxVI_CURL_Perform(curl, url); responseCode = esxVI_CURL_Perform(curl, url);
}
virMutexUnlock(&curl->lock);
if (responseCode < 0) { if (responseCode < 0) {
return -1; return -1;
@ -422,8 +420,7 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content)
return -1; return -1;
} }
virMutexLock(&curl->lock); VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) {
curl_easy_setopt(curl->handle, CURLOPT_URL, url); curl_easy_setopt(curl->handle, CURLOPT_URL, url);
curl_easy_setopt(curl->handle, CURLOPT_RANGE, NULL); curl_easy_setopt(curl->handle, CURLOPT_RANGE, NULL);
curl_easy_setopt(curl->handle, CURLOPT_READDATA, &content); curl_easy_setopt(curl->handle, CURLOPT_READDATA, &content);
@ -431,8 +428,7 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content)
curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, strlen(content)); curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, strlen(content));
responseCode = esxVI_CURL_Perform(curl, url); responseCode = esxVI_CURL_Perform(curl, url);
}
virMutexUnlock(&curl->lock);
if (responseCode < 0) { if (responseCode < 0) {
return -1; return -1;
@ -574,14 +570,12 @@ esxVI_SharedCURL_Add(esxVI_SharedCURL *shared, esxVI_CURL *curl)
} }
} }
virMutexLock(&curl->lock); VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) {
curl_easy_setopt(curl->handle, CURLOPT_SHARE, shared->handle); curl_easy_setopt(curl->handle, CURLOPT_SHARE, shared->handle);
curl->shared = shared; curl->shared = shared;
++shared->count; ++shared->count;
}
virMutexUnlock(&curl->lock);
return 0; return 0;
} }
@ -606,14 +600,12 @@ esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esxVI_CURL *curl)
return -1; return -1;
} }
virMutexLock(&curl->lock); VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) {
curl_easy_setopt(curl->handle, CURLOPT_SHARE, NULL); curl_easy_setopt(curl->handle, CURLOPT_SHARE, NULL);
curl->shared = NULL; curl->shared = NULL;
--shared->count; --shared->count;
}
virMutexUnlock(&curl->lock);
return 0; return 0;
} }
@ -667,14 +659,12 @@ esxVI_MultiCURL_Add(esxVI_MultiCURL *multi, esxVI_CURL *curl)
} }
virMutexLock(&curl->lock); VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) {
curl_multi_add_handle(multi->handle, curl->handle); curl_multi_add_handle(multi->handle, curl->handle);
curl->multi = multi; curl->multi = multi;
++multi->count; ++multi->count;
}
virMutexUnlock(&curl->lock);
return 0; return 0;
} }
@ -701,14 +691,12 @@ esxVI_MultiCURL_Remove(esxVI_MultiCURL *multi, esxVI_CURL *curl)
return -1; return -1;
} }
virMutexLock(&curl->lock); VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) {
curl_multi_remove_handle(multi->handle, curl->handle); curl_multi_remove_handle(multi->handle, curl->handle);
curl->multi = NULL; curl->multi = NULL;
--multi->count; --multi->count;
}
virMutexUnlock(&curl->lock);
return 0; return 0;
} }
@ -1232,8 +1220,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName,
if (esxVI_Response_Alloc(response) < 0) if (esxVI_Response_Alloc(response) < 0)
return -1; return -1;
virMutexLock(&ctx->curl->lock); VIR_WITH_MUTEX_LOCK_GUARD(&ctx->curl->lock) {
curl_easy_setopt(ctx->curl->handle, CURLOPT_URL, ctx->url); curl_easy_setopt(ctx->curl->handle, CURLOPT_URL, ctx->url);
curl_easy_setopt(ctx->curl->handle, CURLOPT_RANGE, NULL); curl_easy_setopt(ctx->curl->handle, CURLOPT_RANGE, NULL);
curl_easy_setopt(ctx->curl->handle, CURLOPT_WRITEDATA, &buffer); curl_easy_setopt(ctx->curl->handle, CURLOPT_WRITEDATA, &buffer);
@ -1242,8 +1229,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName,
curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDSIZE, strlen(request)); curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDSIZE, strlen(request));
(*response)->responseCode = esxVI_CURL_Perform(ctx->curl, ctx->url); (*response)->responseCode = esxVI_CURL_Perform(ctx->curl, ctx->url);
}
virMutexUnlock(&ctx->curl->lock);
if ((*response)->responseCode < 0) if ((*response)->responseCode < 0)
goto cleanup; goto cleanup;
@ -1872,13 +1858,14 @@ esxVI_EnsureSession(esxVI_Context *ctx)
esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_DynamicProperty *dynamicProperty = NULL;
esxVI_UserSession *currentSession = NULL; esxVI_UserSession *currentSession = NULL;
g_autofree char *escapedPassword = NULL; g_autofree char *escapedPassword = NULL;
VIR_LOCK_GUARD lock = { NULL };
if (!ctx->sessionLock) { if (!ctx->sessionLock) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no mutex")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no mutex"));
return -1; return -1;
} }
virMutexLock(ctx->sessionLock); lock = virLockGuardLock(ctx->sessionLock);
if (!ctx->session) { if (!ctx->session) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no session")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no session"));
@ -1933,8 +1920,6 @@ esxVI_EnsureSession(esxVI_Context *ctx)
result = 0; result = 0;
cleanup: cleanup:
virMutexUnlock(ctx->sessionLock);
esxVI_String_Free(&propertyNameList); esxVI_String_Free(&propertyNameList);
esxVI_ObjectContent_Free(&sessionManager); esxVI_ObjectContent_Free(&sessionManager);
esxVI_UserSession_Free(&currentSession); esxVI_UserSession_Free(&currentSession);