experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

getting legacy grideye application to work on clixon

Browse source
This commit is contained in:
Olof hagsand 2016-03-20 22:25:42 +01:00
parent 6169ea6bed
commit c1c1670a74
22 changed files with 952 additions and 805 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/backend/backend_commit.c
View file

@ -154,7 +154,7 @@ candidate_commit(clicon_handle h,
&td->td_avec, /* added: only in candidate */
&td->td_alen,
&td->td_scvec, /* changed: original values */
&td->td_tcvec, /* changed: wanted values */
&td->td_tcvec, /* changed: wanted values */
&td->td_clen) < 0)
goto done;
if (debug)
@ -164,15 +164,17 @@ candidate_commit(clicon_handle h,
xn = td->td_dvec[i];
xml_flag_set(xn, XML_FLAG_DEL);
xml_apply(xn, CX_ELMNT, (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_DEL);
xml_apply_ancestor(xn, (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_CHANGE);
}
for (i=0; i<td->td_alen; i++){ /* Also down */
xn = td->td_avec[i];
xml_flag_set(xn, XML_FLAG_ADD);
xml_apply(xn, CX_ELMNT, (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_ADD);
xml_apply_ancestor(xn, (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_CHANGE);
}
for (i=0; i<td->td_clen; i++){ /* Also up */
xn = td->td_scvec[i];
xml_flag(xn, XML_FLAG_CHANGE);
xml_flag_set(xn, XML_FLAG_CHANGE);
xml_apply_ancestor(xn, (xml_applyfn_t*)xml_flag_set, (void*)XML_FLAG_CHANGE);
xn = td->td_tcvec[i];
xml_flag_set(xn, XML_FLAG_CHANGE);

12
apps/backend/clixon_backend_handle.c
View file

@ -108,7 +108,10 @@ backend_handle_exit(clicon_handle h)
* @see also backend_notify_xml()
*/
int
backend_notify(clicon_handle h, char *stream, int level, char *event)
backend_notify(clicon_handle h,
char *stream,
int level,
char *event)
{
struct client_entry *ce;
struct client_subscription *su;
@ -144,7 +147,7 @@ backend_notify(clicon_handle h, char *stream, int level, char *event)
* @param[in] h Clicon handle
* @param[in] stream Name of event stream. CLICON is predefined as LOG stream
* @param[in] level Event level (not used yet)
* @param[in] event Actual message as xml tree
* @param[in] x Actual message as xml tree
*
* Stream is a string used to qualify the event-stream. Distribute the
* event to all clients registered to this backend.
@ -153,7 +156,10 @@ backend_notify(clicon_handle h, char *stream, int level, char *event)
* @see also backend_notify()
*/
int
backend_notify_xml(clicon_handle h, char *stream, int level, cxobj *x)
backend_notify_xml(clicon_handle h,
char *stream,
int level,
cxobj *x)
{
struct client_entry *ce;
struct client_subscription *su;

6
apps/backend/clixon_backend_transaction.c
View file

@ -62,7 +62,7 @@ transaction_id(transaction_data td)
return ((transaction_data_t *)td)->td_id;
}
/*! Get plugin/application specific callbackargument
/*! Get plugin/application specific callback argument
* @param[in] td transaction_data
* @retval arg callback argument
* @note NYI
@ -73,7 +73,7 @@ transaction_arg(transaction_data td)
return ((transaction_data_t *)td)->td_arg;
}
/*! Get Source database xml tree
/*! Get source database xml tree
* @param[in] td transaction_data
* @retval src source xml tree containing original state
*/
@ -160,7 +160,7 @@ transaction_scvec(transaction_data td)
cxobj **
transaction_tcvec(transaction_data td)
{
return ((transaction_data_t *)td)->td_dvec;
return ((transaction_data_t *)td)->td_tcvec;
}
/*! Get length of changed xml vector