Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Fix EDGI Bug #91: add handling the UploadURL configuration variable for output file uploads. 

Fix workunit description parsing (also read remote files).


git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@2506 a7169a2c-3604-0410-bc95-c702d8d87f7a
This commit is contained in:
zfarkas 2011-05-18 06:54:12 +00:00 committed by Adam Visegradi
parent 814237b798
commit 08d54b1280
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dcapi/boinc/dc_boinc.h
View File

@ -48,6 +48,8 @@ extern "C" {
#define CFG_REGEXPMATCH "InputURLRewriteRegExpMatch" #define CFG_REGEXPMATCH "InputURLRewriteRegExpMatch"
/* Remote file rewrite regexp replace string */ /* Remote file rewrite regexp replace string */
#define CFG_REGEXPREPLACE "InputURLRewriteRegExpReplace" #define CFG_REGEXPREPLACE "InputURLRewriteRegExpReplace"
/* Upload URL configuration option */
#define CFG_UPLOADURL "UploadURL"
/* File types in the working directory */ /* File types in the working directory */
typedef enum typedef enum

41
dcapi/boinc/wu.C
View File

@ -38,6 +38,7 @@ typedef enum
WU_NOTAG = -1, WU_NOTAG = -1,
WU_WUDESC, WU_WUDESC,
WU_INPUT_LABEL, WU_INPUT_LABEL,
WU_REMOTE_IN_LABEL,
WU_OUTPUT_LABEL, WU_OUTPUT_LABEL,
WU_TAG, WU_TAG,
WU_CLIENT_NAME, WU_CLIENT_NAME,
@ -70,6 +71,9 @@ struct parser_state
wu_tag curr_tag; wu_tag curr_tag;
DC_FileMode curr_mode; DC_FileMode curr_mode;
DC_Workunit *wu; DC_Workunit *wu;
char *curr_url;
char *curr_md5;
size_t curr_size;
}; };
struct wu_params struct wu_params
@ -117,6 +121,7 @@ static const struct tag_desc tags[] =
{ {
{ WU_WUDESC, "wudesc" }, { WU_WUDESC, "wudesc" },
{ WU_INPUT_LABEL, "input_label" }, { WU_INPUT_LABEL, "input_label" },
{ WU_REMOTE_IN_LABEL, "remote_input_label" },
{ WU_OUTPUT_LABEL, "output_label" }, { WU_OUTPUT_LABEL, "output_label" },
{ WU_TAG, "tag" }, { WU_TAG, "tag" },
{ WU_CLIENT_NAME, "client_name" }, { WU_CLIENT_NAME, "client_name" },
@ -355,6 +360,18 @@ static void wudesc_start(GMarkupParseContext *ctx, const char *element_name,
else else
pctx->curr_mode = DC_FILE_REGULAR; pctx->curr_mode = DC_FILE_REGULAR;
} }
else if (tags[i].id == WU_REMOTE_IN_LABEL)
{
int j = 0;
for (; j < 3; j++) {
if (attr_names && attr_names[j] && !strcmp(attr_names[j], "url"))
pctx->curr_url = g_strdup(attr_values[j]);
if (attr_names && attr_names[j] && !strcmp(attr_names[j], "md5"))
pctx->curr_md5 = g_strdup(attr_values[j]);
if (attr_names && attr_names[j] && !strcmp(attr_names[j], "size"))
pctx->curr_size = atoll(attr_values[j]);
}
}
else if (attr_names && attr_names[0]) else if (attr_names && attr_names[0])
{ {
*error = g_error_new(G_MARKUP_ERROR, *error = g_error_new(G_MARKUP_ERROR,
@ -400,6 +417,7 @@ static void wudesc_text(GMarkupParseContext *ctx, const char *text,
{ {
struct parser_state *pctx = (struct parser_state *)ptr; struct parser_state *pctx = (struct parser_state *)ptr;
DC_PhysicalFile *file; DC_PhysicalFile *file;
DC_RemoteFile *rfile;
char *tmp, *label; char *tmp, *label;
switch (pctx->curr_tag) switch (pctx->curr_tag)
@ -415,6 +433,14 @@ static void wudesc_text(GMarkupParseContext *ctx, const char *text,
g_list_append(pctx->wu->input_files, file); g_list_append(pctx->wu->input_files, file);
pctx->wu->num_inputs++; pctx->wu->num_inputs++;
break; break;
case WU_REMOTE_IN_LABEL:
label = g_strndup(text, text_len);
rfile = _DC_createRemoteFile(label, pctx->curr_url,
pctx->curr_md5, pctx->curr_size);
pctx->wu->remote_input_files =
g_list_append(pctx->wu->remote_input_files, rfile);
pctx->wu->num_remote_inputs++;
break;
case WU_OUTPUT_LABEL: case WU_OUTPUT_LABEL:
label = g_strndup(text, text_len); label = g_strndup(text, text_len);
pctx->wu->output_files = pctx->wu->output_files =
@ -501,8 +527,8 @@ static int write_wudesc(const DC_Workunit *wu)
for (l = wu->remote_input_files; l; l = l->next) for (l = wu->remote_input_files; l; l = l->next)
{ {
rfile = (DC_RemoteFile *)l->data; rfile = (DC_RemoteFile *)l->data;
fprintf(f, "\t<remote_input_label>%s</remote_input_label>\n", fprintf(f, "\t<remote_input_label url=\"%s\" md5=\"%s\" size=\"%zu\">%s</remote_input_label>\n",
rfile->label); rfile->url, rfile->remotefilehash, rfile->remotefilesize, rfile->label);
} }
for (l = wu->output_files; l; l = l->next) for (l = wu->output_files; l; l = l->next)
@ -1238,7 +1264,16 @@ static void append_result_file_info(GString *tmpl, int idx, int auto_upload,
if (auto_upload) if (auto_upload)
g_string_append(tmpl, "\t<upload_when_present/>\n"); g_string_append(tmpl, "\t<upload_when_present/>\n");
g_string_append_printf(tmpl, "\t<max_nbytes>%d</max_nbytes>\n", max_output); g_string_append_printf(tmpl, "\t<max_nbytes>%d</max_nbytes>\n", max_output);
g_string_append(tmpl, "\t<url><UPLOAD_URL/></url>\n");
gchar *uploadURL = DC_getCfgStr(CFG_UPLOADURL);
if (!uploadURL)
g_string_append(tmpl, "\t<url><UPLOAD_URL/></url>\n");
else
{
g_string_append_printf(tmpl, "\t<url>%s</url>\n", uploadURL);
free(uploadURL);
}
g_string_append(tmpl, "</file_info>\n"); g_string_append(tmpl, "</file_info>\n");
} }