use wrapper to create event record

git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@750 a7169a2c-3604-0410-bc95-c702d8d87f7a
This commit is contained in:
drdani 2006-06-23 07:49:59 +00:00 committed by Adam Visegradi
parent 5ac9695159
commit b50ff6d0fb
2 changed files with 13 additions and 7 deletions

View File

@ -16,6 +16,7 @@
#include "dc_common.h" #include "dc_common.h"
#include "condor_defs.h" #include "condor_defs.h"
#include "condor_event.h"
#include "condor_result.h" #include "condor_result.h"
#include "condor_wu.h" #include "condor_wu.h"
#include "condor_log.h" #include "condor_log.h"
@ -96,12 +97,14 @@ _DC_wu_condor2api_event(DC_Workunit *wu)
if (ce->event == ULOG_JOB_TERMINATED) if (ce->event == ULOG_JOB_TERMINATED)
{ {
DC_MasterEvent *e; DC_MasterEvent *e;
e= g_new0(DC_MasterEvent, 1); /*e= g_new0(DC_MasterEvent, 1);*/
e= _DC_event_create(wu, _DC_result_create(wu),
NULL, NULL);
DC_log(LOG_DEBUG, "Result event created: %p for " DC_log(LOG_DEBUG, "Result event created: %p for "
"wu (%p-\"%s\")", e, wu, wu->name); "wu (%p-\"%s\")", e, wu, wu->name);
e->type= DC_MASTER_RESULT; /*e->type= DC_MASTER_RESULT;
e->wu= wu; e->wu= wu;
e->result= _DC_create_result(wu); e->result= _DC_result_create(wu);*/
DC_log(LOG_DEBUG, "Result of the event: %p", DC_log(LOG_DEBUG, "Result of the event: %p",
e->result); e->result);
wu->state= DC_WU_FINISHED; wu->state= DC_WU_FINISHED;

View File

@ -318,12 +318,14 @@ _DC_wu_check_client_messages(DC_Workunit *wu)
NULL, NULL,
&err)) &err))
{ {
e= g_new0(DC_MasterEvent, 1); /*e= g_new0(DC_MasterEvent, 1);*/
e= _DC_event_create(wu, NULL, NULL,
cont);
DC_log(LOG_DEBUG, "Message event created: %p " DC_log(LOG_DEBUG, "Message event created: %p "
"for wu (%p-\"%s\")", e, wu, wu->name); "for wu (%p-\"%s\")", e, wu, wu->name);
e->type= DC_MASTER_MESSAGE; /*e->type= DC_MASTER_MESSAGE;
e->wu= wu; e->wu= wu;
e->message= cont; e->message= cont;*/
DC_log(LOG_DEBUG, "Message of the event: %s", DC_log(LOG_DEBUG, "Message of the event: %s",
e->message); e->message);
} }
@ -332,7 +334,8 @@ _DC_wu_check_client_messages(DC_Workunit *wu)
"message from %s", "message from %s",
dn->str); dn->str);
fclose(f); fclose(f);
unlink(dn->str); if (e)
unlink(dn->str);
} }
else else
DC_log(LOG_ERR, "Failed to open client message %s", DC_log(LOG_ERR, "Failed to open client message %s",