Skip to content

Exempt URL queries from having lock files #3768

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

Merged
PaulWessel merged 1 commit into from
Jul 29, 2020
Merged

Exempt URL queries from having lock files #3768

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
22 changes: 14 additions & 8 deletions src/gmt_remote.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ GMT_LOCAL size_t gmtremote_skip_large_files (struct GMT_CTRL *GMT, char * URL, s
#define GMT_HASH_TIME_OUT 10L /* Not waiting longer than this to time out on getting the hash file */

GMT_LOCAL int gmtremote_get_url (struct GMT_CTRL *GMT, char *url, char *file, char *orig, unsigned int index) {
bool query = gmt_M_file_is_query (file);
int curl_err = 0;
long time_spent;
char *Lfile = NULL;
Expand All @@ -529,12 +530,14 @@ GMT_LOCAL int gmtremote_get_url (struct GMT_CTRL *GMT, char *url, char *file, ch
struct GMTAPI_CTRL *API = GMT->parent;
time_t begin, end;

Lfile = gmtremote_lockfile (API, file);
if ((fp = fopen (Lfile, "w")) == NULL) {
GMT_Report (API, GMT_MSG_ERROR, "Failed to create lock file %s\n", Lfile);
return 1;
if (!query) { /* Only make a filename if not a query */
Lfile = gmtremote_lockfile (API, file);
if ((fp = fopen (Lfile, "w")) == NULL) {
GMT_Report (API, GMT_MSG_ERROR, "Failed to create lock file %s\n", Lfile);
return 1;
}
gmtlib_file_lock (GMT, fileno(fp)); /* Attempt exclusive lock */
}
gmtlib_file_lock (GMT, fileno(fp)); /* Attempt exclusive lock */

if ((Curl = curl_easy_init ()) == NULL) {
GMT_Report (GMT->parent, GMT_MSG_ERROR, "Failed to initiate curl - cannot obtain %s\n", url);
Expand Down Expand Up @@ -600,9 +603,12 @@ GMT_LOCAL int gmtremote_get_url (struct GMT_CTRL *GMT, char *url, char *file, ch
curl_easy_cleanup (Curl);
if (urlfile.fp) /* close the local file */
fclose (urlfile.fp);
gmtlib_file_unlock (GMT, fileno(fp));
gmt_remove_file (GMT, Lfile);
gmt_M_str_free (Lfile);

if (!query) { /* Remove lock file after successful download */
gmtlib_file_unlock (GMT, fileno(fp));
gmt_remove_file (GMT, Lfile);
gmt_M_str_free (Lfile);
}

gmtremote_turn_off_ctrl_C_check ();
return 0;
Expand Down