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

optimize

Browse source
This commit is contained in:
Olof hagsand 2019-04-02 11:46:28 +02:00
parent ed62c33a79
commit 4de15343c9
2 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/backend/backend_commit.c
View file

@ -313,15 +313,6 @@ startup_commit(clicon_handle h,
/* 10. Call plugin transaction end callbacks */ /* 10. Call plugin transaction end callbacks */
plugin_transaction_end(h, td); plugin_transaction_end(h, td);
/* 11. Copy running back to candidate in case end functions updated running
* XXX: room for improvement: candidate and running may be equal.
* Copy only diffs?
*/
if (xmldb_copy(h, "running", "candidate") < 0){
/* ignore errors or signal major setback ? */
clicon_log(LOG_NOTICE, "Error in rollback, trying to continue");
goto done;
}
retval = 1; retval = 1;
done: done:
if (td) if (td)
@ -494,15 +485,6 @@ candidate_commit(clicon_handle h,
/* 9. Call plugin transaction end callbacks */ /* 9. Call plugin transaction end callbacks */
plugin_transaction_end(h, td); plugin_transaction_end(h, td);
/* 8. Copy running back to candidate in case end functions updated running
* XXX: room for improvement: candidate and running may be equal.
* Copy only diffs?
*/
if (xmldb_copy(h, "running", candidate) < 0){
/* ignore errors or signal major setback ? */
clicon_log(LOG_NOTICE, "Error in rollback, trying to continue");
goto done;
}
retval = 1; retval = 1;
done: done:
/* In case of failure (or error), call plugin transaction termination callbacks */ /* In case of failure (or error), call plugin transaction termination callbacks */

2
lib/src/clixon_xml_map.c
View file

@ -1652,7 +1652,7 @@ xml_default(cxobj *xt,
} }
} }
} }
xml_sort(xt, NULL); // xml_sort(xt, NULL);
retval = 0; retval = 0;
done: done:
return retval; return retval;