From ca9f26089df29fec5995ed4f19a06c29f7f4b12e Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 28 Feb 2019 18:55:40 +0000
Subject: [PATCH] Plugin chains to speed up running of plugins, part 1.
---
src/main.c | 66 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/src/main.c b/src/main.c
index 3407c65..d820471 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdio.h>
#include<math.h>
#include<stdlib.h>
@@ -16,26 +17,65 @@
#include "shcomplex.h"
#include "dumpstate.h"
#include "restore.h"
+#include "plugins.h"
+#include <fcntl.h>
/** Entrance function to the program
* @param argv is a number of parameters used in program call (including the program name
* @param argc is a pointer to strings (character arrays) which holds the arguments
* @returns returns 0 on success, any other number on fail.
*/
-
+#include <string.h>
int main(int argv, char *argc[]){
+ ts_char *plugin0 = (ts_char *)calloc(255,sizeof(ts_char));
+ ts_char *plugin1 = (ts_char *)calloc(255,sizeof(ts_char));
+ strcpy(plugin0,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/demoplugin.so");
+ strcpy(plugin1,"/home/samo/programiranje/trisurf-ng/src/plugins/.libs/vmdefaulthardconstraints.so");
+ ts_char **plugins=(ts_char **)calloc(2,sizeof(ts_char *));
+ *plugins=plugin0;
+ plugins[1]=plugin1;
+ ts_plugin_list *plist=init_plugin_list(plugins,2);
+ //printf("%s", plist->chain->at_start->next->plugin->filename);
+ //ts_fprintf(stdout, "TRISURF in PRVI PLUGIN %s\n", plist->plugin[0]->details->name);
ts_vesicle *vesicle;
ts_tape *tape;
ts_uint start_iteration=0;
force_from_tape=0;
+ /* Area and volume for constant area and constant volume are initialized to be zero */
+ A0=0;
+ V0=0;
+ /* create lock file */
+ createPidFile("ts_trisurf",".lock",0);
parse_args(argv,argc); // sets global variable command_line_args (defined in io.h)
+ ts_fprintf(stdout,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__);
+ ts_fprintf(stdout,"Programming done by: Samo Penic and Miha Fosnaric\n");
+ ts_fprintf(stdout,"Released under terms of GPLv3\n");
ts_fprintf(stdout,"Starting program...\n\n");
- parseDump("timestep_000000.vtu");
+
+/* Entry point for plugin function at_start() */
+ ts_plugin_chain *ptr=plist->chain->at_start;
+ while(ptr!=NULL){
+ ptr->plugin->function->at_start(argv,argc);
+ ptr=ptr->next;
+ }
+
if(command_line_args.dump_from_vtk[0]!=0){
ts_fprintf(stdout,"************************************************\n");
- ts_fprintf(stdout,"***** Dumping vesicle from VTK points list *****\n");
+ ts_fprintf(stdout,"**** Restoring vesicle from VTK points list ****\n");
ts_fprintf(stdout,"************************************************\n\n");
- tape=parsetape(command_line_args.tape_fullfilename);
- vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape);
+ vesicle = parseDump(command_line_args.dump_from_vtk);
+ tape = vesicle->tape;
+ int arguments_no;
+ FILE *fd=fopen(".status","r");
+ if(fd!=NULL){
+ arguments_no=fscanf(fd,"%u", &start_iteration);
+ if(arguments_no==0){
+ ts_fprintf(stdout,"No information of start iteration in .status file\n");
+ }
+ fclose(fd);
+ start_iteration++;
+ }
+ else
+ ts_fprintf(stdout,"No .status file. The iteration count will start from 0\n");
}
else if(command_line_args.force_from_tape){
ts_fprintf(stdout,"************************************************\n");
@@ -98,9 +138,25 @@
}
}
+ vesicle->plist=plist;
+/* Entry point for plugin after_vesicle_init() function */
+ ptr=plist->chain->after_vesicle_init;
+ while(ptr!=NULL){
+ ptr->plugin->function->after_vesicle_init(vesicle);
+ ptr=ptr->next;
+ }
+
run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration);
write_master_xml_file(command_line_args.output_fullfilename);
write_dout_fcompat_file(vesicle,"dout");
+/* Entry point for plugin cleanup() function */
+ ptr=plist->chain->cleanup;
+ while(ptr!=NULL){
+ ptr->plugin->function->cleanup();
+ ptr=ptr->next;
+ }
+
+
vesicle_free(vesicle);
tape_free(tape);
return 0; //program finished perfectly ok. We return 0.
--
Gitblit v1.9.3