implement functions to execute arbitrary python code from strings or files and... (d84f8898) · Commits · 郑智淋 / lammps

src/PYTHON/python_impl.cpp

+31 −14

Original line number	Diff line number	Diff line
		@@ -122,26 +122,17 @@ void PythonImpl::command(int narg, char **arg)
		// if source is only keyword, execute the python code

		if (narg == 3 && strcmp(arg[1],"source") == 0) {
		int err;

		PyGILState_STATE gstate = PyGILState_Ensure();

		// if argument string is file, open it
		// otherwise process string as python code

		int err = 0;
		FILE *fp = fopen(arg[2],"r");

		if (fp == NULL)
		err = PyRun_SimpleString(arg[2]);
		err = execute_string(arg[2]);
		else
		err = PyRun_SimpleFile(fp,arg[2]);
		err = execute_file(arg[2]);

		if (err) {
		PyGILState_Release(gstate);
		error->all(FLERR,"Could not process Python source command");
		}
		if (fp) fclose(fp);
		PyGILState_Release(gstate);
		if (err) error->all(FLERR,"Could not process Python source command");

		return;
		}

		@@ -503,6 +494,32 @@ int PythonImpl::create_entry(char *name)
		return ifunc;
		}

		/* ---------------------------------------------------------------------- */

		int PythonImpl::execute_string(char *cmd)
		{
		PyGILState_STATE gstate = PyGILState_Ensure();
		int err = PyRun_SimpleString(cmd);
		PyGILState_Release(gstate);

		return err;
		}

		/* ---------------------------------------------------------------------- */

		int PythonImpl::execute_file(char *fname)
		{
		FILE *fp = fopen(fname,"r");
		if (fp == NULL) return -1;

		PyGILState_STATE gstate = PyGILState_Ensure();
		int err = PyRun_SimpleFile(fp,fname);
		PyGILState_Release(gstate);

		if (fp) fclose(fp);
		return err;
		}

		/* ------------------------------------------------------------------ */

		void PythonImpl::deallocate(int i)

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ class PythonImpl : protected Pointers, public PythonInterface {
		int find(char *);
		int variable_match(char , char , int);
		char *long_string(int);
		int execute_string(char *);
		int execute_file(char *);

		private:
		int ninput,noutput,length_longstr;

+16 −0

Original line number	Diff line number	Diff line
		@@ -97,3 +97,19 @@ char * Python::long_string(int ifunc)
		init();
		return impl->long_string(ifunc);
		}

		/* ------------------------------------------------------------------ */

		int Python::execute_string(char *cmd)
		{
		init();
		return impl->execute_string(cmd);
		}

		/* ------------------------------------------------------------------ */

		int Python::execute_file(char *fname)
		{
		init();
		return impl->execute_file(fname);
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ public:
		virtual int find(char *) = 0;
		virtual int variable_match(char , char , int) = 0;
		virtual char * long_string(int ifunc) = 0;
		virtual int execute_string(char *) = 0;
		virtual int execute_file(char *) = 0;
		};

		class Python : protected Pointers {
		@@ -38,6 +40,8 @@ public:
		int find(char *);
		int variable_match(char , char , int);
		char * long_string(int ifunc);
		int execute_string(char *);
		int execute_file(char *);

		bool is_enabled() const;
		void init();