mirror of https://github.com/BOINC/boinc.git
code beautifying
implementation of some wu info retrieving funcs git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@642 a7169a2c-3604-0410-bc95-c702d8d87f7a
This commit is contained in:
drdani
Adam Visegradi
parent
fe6e0f0f4c
commit
dbab02b4ef
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
/* Submits a work unit. */
|
||||
int
|
||||
DC_submitWU (DC_Workunit * wu)
|
||||
DC_submitWU(DC_Workunit *wu)
|
||||
{
|
||||
int ret;
|
||||
//GString *fn;
|
||||
|
|
@ -52,25 +52,25 @@ DC_submitWU (DC_Workunit * wu)
|
|||
|
||||
/* Cancels all computations for a given work unit. */
|
||||
int
|
||||
DC_cancelWU (DC_Workunit * wu)
|
||||
DC_cancelWU(DC_Workunit *wu)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Temporarily suspends the execution of a work unit. */
|
||||
int
|
||||
DC_suspendWU (DC_Workunit * wu)
|
||||
DC_suspendWU(DC_Workunit *wu)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Resumes computation of a previously suspended work unit. */
|
||||
int
|
||||
DC_resumeWU (DC_Workunit * wu)
|
||||
DC_resumeWU(DC_Workunit *wu)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@
|
|||
|
||||
/********************************************************************* INIT */
|
||||
|
||||
static GHashTable *wu_table = NULL;
|
||||
static GHashTable *wu_table= NULL;
|
||||
uuid_t project_uuid;
|
||||
char project_uuid_str[37] = "";
|
||||
char project_uuid_str[37]= "";
|
||||
|
||||
/* Initializes the DC-API. */
|
||||
int
|
||||
DC_initMaster (const char *configFile)
|
||||
DC_initMaster(const char *configFile)
|
||||
{
|
||||
int ret;
|
||||
char *cfgval = NULL;
|
||||
char *cfgval= NULL;
|
||||
|
||||
if (!configFile)
|
||||
configFile= DC_CONFIG_FILE;
|
||||
|
|
@ -41,9 +41,8 @@ DC_initMaster (const char *configFile)
|
|||
}
|
||||
|
||||
if (!wu_table)
|
||||
wu_table =
|
||||
g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
|
||||
NULL);
|
||||
wu_table= g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
|
||||
NULL);
|
||||
|
||||
cfgval= DC_getCfgStr(CFG_INSTANCEUUID);
|
||||
if (!cfgval)
|
||||
|
|
@ -52,19 +51,19 @@ DC_initMaster (const char *configFile)
|
|||
CFG_INSTANCEUUID, configFile);
|
||||
return DC_ERR_CONFIG;
|
||||
}
|
||||
ret = uuid_parse ((char *) cfgval, project_uuid);
|
||||
ret= uuid_parse((char *)cfgval, project_uuid);
|
||||
if (ret)
|
||||
{
|
||||
DC_log (LOG_ERR, "Invalid project UUID");
|
||||
g_free (cfgval);
|
||||
return (DC_ERR_CONFIG);
|
||||
DC_log(LOG_ERR, "Invalid project UUID");
|
||||
g_free(cfgval);
|
||||
return(DC_ERR_CONFIG);
|
||||
}
|
||||
g_free (cfgval);
|
||||
g_free(cfgval);
|
||||
|
||||
/* Enforce a canonical string representation of the UUID */
|
||||
uuid_unparse_lower (project_uuid, project_uuid_str);
|
||||
uuid_unparse_lower(project_uuid, project_uuid_str);
|
||||
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -72,8 +71,8 @@ DC_initMaster (const char *configFile)
|
|||
|
||||
/* Creates one work unit. */
|
||||
DC_Workunit *
|
||||
DC_createWU (const char *clientName,
|
||||
const char *arguments[], int subresults, const char *tag)
|
||||
DC_createWU(const char *clientName,
|
||||
const char *arguments[], int subresults, const char *tag)
|
||||
{
|
||||
DC_Workunit *wu;
|
||||
char uuid_str[37];
|
||||
|
|
@ -81,70 +80,69 @@ DC_createWU (const char *clientName,
|
|||
GString *str;
|
||||
int ret;
|
||||
|
||||
wu= g_new0 (DC_Workunit, 1);
|
||||
wu= g_new0(DC_Workunit, 1);
|
||||
|
||||
wu->client_name= g_strdup(clientName);
|
||||
|
||||
wu->argv = g_strdupv ((char **) arguments);
|
||||
for (wu->argc = 0; arguments && arguments[wu->argc]; wu->argc++)
|
||||
wu->argv= g_strdupv((char **) arguments);
|
||||
for (wu->argc= 0; arguments && arguments[wu->argc]; wu->argc++)
|
||||
;
|
||||
wu->subresults = subresults;
|
||||
wu->tag = g_strdup (tag);
|
||||
wu->subresults= subresults;
|
||||
wu->tag= g_strdup(tag);
|
||||
|
||||
uuid_generate (wu->uuid);
|
||||
uuid_unparse_lower (wu->uuid, uuid_str);
|
||||
wu->uuid_str = g_strdup (uuid_str);
|
||||
uuid_generate(wu->uuid);
|
||||
uuid_unparse_lower(wu->uuid, uuid_str);
|
||||
wu->uuid_str= g_strdup(uuid_str);
|
||||
|
||||
if (tag)
|
||||
wu->name =
|
||||
g_strdup_printf ("%s_%s_%s", project_uuid_str,
|
||||
uuid_str, tag);
|
||||
wu->name= g_strdup_printf("%s_%s_%s", project_uuid_str,
|
||||
uuid_str, tag);
|
||||
else
|
||||
wu->name =
|
||||
g_strdup_printf ("%s_%s", project_uuid_str, uuid_str);
|
||||
wu->name= g_strdup_printf("%s_%s", project_uuid_str,
|
||||
uuid_str);
|
||||
|
||||
/* Calculate & create the working directory. The working directory
|
||||
* has the form:
|
||||
* <project work dir>/.dcapi-<project uuid>/<hash>/<wu uuid>
|
||||
* Where <hash> is the first 2 hex digits of the uuid
|
||||
*/
|
||||
cfgval = DC_getCfgStr (CFG_WORKDIR);
|
||||
str = g_string_new (cfgval);
|
||||
free (cfgval);
|
||||
g_string_append_c (str, G_DIR_SEPARATOR);
|
||||
g_string_append (str, ".dcapi-");
|
||||
g_string_append (str, project_uuid_str);
|
||||
g_string_append_c (str, G_DIR_SEPARATOR);
|
||||
g_string_append_printf (str, "%02x", wu->uuid[0]);
|
||||
g_string_append_c (str, G_DIR_SEPARATOR);
|
||||
g_string_append (str, uuid_str);
|
||||
cfgval= DC_getCfgStr(CFG_WORKDIR);
|
||||
str= g_string_new(cfgval);
|
||||
free(cfgval);
|
||||
g_string_append_c(str, G_DIR_SEPARATOR);
|
||||
g_string_append(str, ".dcapi-");
|
||||
g_string_append(str, project_uuid_str);
|
||||
g_string_append_c(str, G_DIR_SEPARATOR);
|
||||
g_string_append_printf(str, "%02x", wu->uuid[0]);
|
||||
g_string_append_c(str, G_DIR_SEPARATOR);
|
||||
g_string_append(str, uuid_str);
|
||||
|
||||
ret = g_mkdir_with_parents (str->str, 0700);
|
||||
ret= g_mkdir_with_parents(str->str, 0700);
|
||||
if (ret)
|
||||
{
|
||||
DC_log (LOG_ERR,
|
||||
"Failed to create WU working directory %s: %s",
|
||||
str->str, strerror (errno));
|
||||
DC_destroyWU (wu);
|
||||
DC_log(LOG_ERR,
|
||||
"Failed to create WU working directory %s: %s",
|
||||
str->str, strerror(errno));
|
||||
DC_destroyWU(wu);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
wu->workdir = str->str;
|
||||
g_string_free (str, FALSE);
|
||||
wu->workdir= str->str;
|
||||
g_string_free(str, FALSE);
|
||||
|
||||
if (!wu_table)
|
||||
DC_initMaster (NULL);
|
||||
g_hash_table_insert (wu_table, wu->name, wu);
|
||||
DC_initMaster(NULL);
|
||||
g_hash_table_insert(wu_table, wu->name, wu);
|
||||
|
||||
wu_make_client_executables(wu);
|
||||
|
||||
return (wu);
|
||||
return(wu);
|
||||
}
|
||||
|
||||
|
||||
/* Releases internal resources allocated to a work unit. */
|
||||
void
|
||||
DC_destroyWU (DC_Workunit * wu)
|
||||
DC_destroyWU(DC_Workunit * wu)
|
||||
{
|
||||
if (!wu)
|
||||
return;
|
||||
|
|
@ -165,12 +163,13 @@ DC_destroyWU (DC_Workunit * wu)
|
|||
unlink(fn->str);
|
||||
g_string_free(fn, TRUE);
|
||||
|
||||
dir = g_dir_open(wu->workdir, 0, NULL);
|
||||
dir= g_dir_open(wu->workdir, 0, NULL);
|
||||
/* The work directory should not contain any extra files, but
|
||||
* just in case */
|
||||
while (dir && (name= g_dir_read_name (dir)))
|
||||
while (dir &&
|
||||
(name= g_dir_read_name(dir)))
|
||||
{
|
||||
GString *str= g_string_new (wu->workdir);
|
||||
GString *str= g_string_new(wu->workdir);
|
||||
g_string_append_c(str, G_DIR_SEPARATOR);
|
||||
g_string_append(str, name);
|
||||
DC_log(LOG_INFO, "Removing unknown file %s",
|
||||
|
|
@ -185,7 +184,7 @@ DC_destroyWU (DC_Workunit * wu)
|
|||
if (ret)
|
||||
DC_log(LOG_WARNING, "Failed to remove WU working "
|
||||
"directory %s: %s", wu->workdir,
|
||||
strerror (errno));
|
||||
strerror(errno));
|
||||
g_free(wu->workdir);
|
||||
}
|
||||
|
||||
|
|
@ -201,9 +200,9 @@ DC_destroyWU (DC_Workunit * wu)
|
|||
|
||||
/* Sets an input file for the work unit. */
|
||||
int
|
||||
DC_addWUInput (DC_Workunit * wu,
|
||||
const char *logicalFileName,
|
||||
const char *URL, DC_FileMode fileMode)
|
||||
DC_addWUInput(DC_Workunit * wu,
|
||||
const char *logicalFileName,
|
||||
const char *URL, DC_FileMode fileMode)
|
||||
{
|
||||
DC_PhysicalFile *file;
|
||||
char *workpath;
|
||||
|
|
@ -212,7 +211,7 @@ DC_addWUInput (DC_Workunit * wu,
|
|||
/* Sanity checks */
|
||||
ret= wu_check_logical_name(wu, logicalFileName);
|
||||
if (ret)
|
||||
return (ret);
|
||||
return(ret);
|
||||
workpath= wu_get_workdir_path(wu, logicalFileName, FILE_IN);
|
||||
file= _DC_createPhysicalFile(logicalFileName, workpath);
|
||||
g_free(workpath);
|
||||
|
|
@ -238,8 +237,8 @@ DC_addWUInput (DC_Workunit * wu,
|
|||
if (ret)
|
||||
{
|
||||
DC_log(LOG_ERR, "Failed to link %s to %s: %s",
|
||||
URL, file->path, strerror (errno));
|
||||
_DC_destroyPhysicalFile (file);
|
||||
URL, file->path, strerror(errno));
|
||||
_DC_destroyPhysicalFile(file);
|
||||
return(DC_ERR_BADPARAM); /* XXX */
|
||||
}
|
||||
/* Remember the file mode */
|
||||
|
|
@ -252,8 +251,8 @@ DC_addWUInput (DC_Workunit * wu,
|
|||
if (ret)
|
||||
{
|
||||
DC_log(LOG_ERR, "Failed to rename %s to %s: %s",
|
||||
URL, file->path, strerror (errno));
|
||||
_DC_destroyPhysicalFile (file);
|
||||
URL, file->path, strerror(errno));
|
||||
_DC_destroyPhysicalFile(file);
|
||||
return(DC_ERR_BADPARAM);
|
||||
}
|
||||
break;
|
||||
|
|
@ -262,18 +261,18 @@ DC_addWUInput (DC_Workunit * wu,
|
|||
wu->input_files= g_list_append(wu->input_files, file);
|
||||
/*wu->num_inputs++; */
|
||||
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Defines an output file for the work unit. */
|
||||
int
|
||||
DC_addWUOutput (DC_Workunit * wu, const char *logicalFileName)
|
||||
DC_addWUOutput(DC_Workunit *wu, const char *logicalFileName)
|
||||
{
|
||||
int ret;
|
||||
|
||||
/* Sanity checks */
|
||||
ret = wu_check_logical_name(wu, logicalFileName);
|
||||
ret= wu_check_logical_name(wu, logicalFileName);
|
||||
if (ret)
|
||||
return ret;
|
||||
DC_log(LOG_DEBUG, "Adding out file %s",
|
||||
|
|
@ -281,71 +280,88 @@ DC_addWUOutput (DC_Workunit * wu, const char *logicalFileName)
|
|||
wu->output_files= g_list_append(wu->output_files,
|
||||
g_strdup(logicalFileName));
|
||||
/*wu->num_outputs++;*/
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Sets the priority for the work unit. */
|
||||
int
|
||||
DC_setWUPriority (DC_Workunit * wu, int priority)
|
||||
DC_setWUPriority(DC_Workunit *wu, int priority)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Sets the callback functions that will be called when a particular event. */
|
||||
void
|
||||
DC_setMasterCb (DC_ResultCallback resultcb,
|
||||
DC_SubresultCallback subresultcb, DC_MessageCallback msgcb)
|
||||
DC_setMasterCb(DC_ResultCallback resultcb,
|
||||
DC_SubresultCallback subresultcb,
|
||||
DC_MessageCallback msgcb)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/* Queries the state of a work unit. */
|
||||
DC_WUState
|
||||
DC_getWUState (DC_Workunit * wu)
|
||||
DC_getWUState(DC_Workunit *wu)
|
||||
{
|
||||
return (DC_WU_UNKNOWN);
|
||||
if (!wu)
|
||||
return(DC_WU_UNKNOWN);
|
||||
return(wu->state);
|
||||
}
|
||||
|
||||
|
||||
/* Queries the low-level ID of the work unit. */
|
||||
char *
|
||||
DC_getWUId (const DC_Workunit * wu)
|
||||
DC_getWUId(const DC_Workunit *wu)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Queries the tag of a work unit. */
|
||||
char *
|
||||
DC_getWUTag (const DC_Workunit * wu)
|
||||
DC_getWUTag(const DC_Workunit *wu)
|
||||
{
|
||||
return (0);
|
||||
return(strdup(wu->tag));
|
||||
}
|
||||
|
||||
|
||||
/* Serializes a work unit description. */
|
||||
char *
|
||||
DC_serializeWU (DC_Workunit * wu)
|
||||
DC_serializeWU(DC_Workunit *wu)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Restores a serialized work unit. */
|
||||
DC_Workunit *
|
||||
DC_deserializeWU (const char *buf)
|
||||
DC_deserializeWU(const char *buf)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* iterator for DC_getWUNumber() */
|
||||
static DC_WUState dd_look_for_state;
|
||||
static void dd_check_state(void *key, void *value, void *ptr)
|
||||
{
|
||||
DC_Workunit *wu=(DC_Workunit *)value;
|
||||
int *count= (int *)ptr;
|
||||
if (wu->state == dd_look_for_state)
|
||||
++(*count);
|
||||
}
|
||||
|
||||
/* Queries the number of WUs known to the API in the given state. */
|
||||
int
|
||||
DC_getWUNumber (DC_WUState state)
|
||||
DC_getWUNumber(DC_WUState state)
|
||||
{
|
||||
return (0);
|
||||
int val;
|
||||
|
||||
dd_look_for_state= state;
|
||||
g_hash_table_foreach(wu_table, (GHFunc)dd_check_state, &val);
|
||||
return(val);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -353,31 +369,31 @@ DC_getWUNumber (DC_WUState state)
|
|||
|
||||
/* Waits for events and processes them. */
|
||||
int
|
||||
DC_processMasterEvents (int timeout)
|
||||
DC_processMasterEvents(int timeout)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Checks for events and return them. */
|
||||
DC_MasterEvent *
|
||||
DC_waitMasterEvent (const char *wuFilter, int timeout)
|
||||
DC_waitMasterEvent(const char *wuFilter, int timeout)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Checks for events for a particular WU. */
|
||||
DC_MasterEvent *
|
||||
DC_waitWUEvent (DC_Workunit * wu, int timeout)
|
||||
DC_waitWUEvent(DC_Workunit *wu, int timeout)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Destroys an event. */
|
||||
void
|
||||
DC_destroyMasterEvent (DC_MasterEvent * event)
|
||||
DC_destroyMasterEvent(DC_MasterEvent *event)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -386,9 +402,9 @@ DC_destroyMasterEvent (DC_MasterEvent * event)
|
|||
|
||||
/* Sends a message to a running work unit. */
|
||||
int
|
||||
DC_sendWUMessage (DC_Workunit * wu, const char *message)
|
||||
DC_sendWUMessage(DC_Workunit *wu, const char *message)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -396,33 +412,33 @@ DC_sendWUMessage (DC_Workunit * wu, const char *message)
|
|||
|
||||
/* Queries what optional fields are present in the result. */
|
||||
unsigned
|
||||
DC_getResultCapabilities (const DC_Result * result)
|
||||
DC_getResultCapabilities(const DC_Result *result)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Returns the WU that generated this result. */
|
||||
DC_Workunit *
|
||||
DC_getResultWU (DC_Result * result)
|
||||
DC_getResultWU(DC_Result *result)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Returns the exit code of the client application. */
|
||||
int
|
||||
DC_getResultExit (const DC_Result * result)
|
||||
DC_getResultExit(const DC_Result *result)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* Returns the local name of an output file. */
|
||||
char *
|
||||
DC_getResultOutput (const DC_Result * result, const char *logicalFileName)
|
||||
DC_getResultOutput(const DC_Result *result, const char *logicalFileName)
|
||||
{
|
||||
return (0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue