X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.cpp;h=a37c89433931be1787eefdd19dcc09a426b5bfd5;hb=3a3287b8425c355dbb54fffe6b546367ce32c8ac;hp=d67acede310ea76508526958845534f70152c89c;hpb=bff1b59055aaba5927b1e2fc0c53f72d0b43a2df;p=vlp.git

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index d67aced..a37c894 100644
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -71,10 +71,15 @@
 #include "kill_interpreter_dialog.h"
 #include "connect_dialog.h"
 
+#include "vlp/config.h"
+
 /* File resides in top directory (where are Makefiles)*/
 #include "../../config.h"
 
 
+namespace loglan {
+namespace vlp {
+
 char CharLine[25] = "________________________";
 
 /**
@@ -196,93 +201,19 @@ void QKernel::loadConfig(const QString & fname)
  */
 void QKernel::loadConfig(const char * fname)
 {
-	config_t cfg;
-	config_setting_t *setting;
-
-	/* Hack for checking if file exists without using external libs.*/
+	loglan::vlp::Config config;
+	if(config.load(fname)) {
+		NodeNumber = config.getNodeNumber();
+		ConType = config.getConnectionType();
 
-	FILE * file = fopen(fname, "rt");
-	if (!file) {
-		fprintf(stderr, "Error: Cannot load configuration file: %s!\n", 
-									fname);
-		exit(3);
-	}
-	/* File exists, so file has been locked. Release it. */
-
-	config_init(&cfg);
-
-	/* Read the file. If there is an error, report it and exit. */
-	if (!config_read(&cfg, file)) {
-		fprintf(stderr, "%s! In file %s, line %d\n", 
-			config_error_text(&cfg), 
-			config_error_file(&cfg), 
-			config_error_line(&cfg));
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
 
-	setting = config_lookup(&cfg, "node_number");
-	if (setting) {
-		NodeNumber = config_setting_get_int(setting);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-					"Warning", fname, "node_number");
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
-
-	setting = config_lookup(&cfg, "type");
-	if (setting) {
-		/* same as strcmp(..) == 0 */
-		if (!strcmp(config_setting_get_string(setting), "explicit")) {
-			ConType = 1;
-		} else {
-			ConType = 2;
+		std::vector<std::string> hosts = config.getHosts();
+		for (unsigned int i = 0; i < hosts.size(); i++) {
+			ConnectList.append(new ConnectEntry(hosts[i].c_str()));
 		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "type");
-	}
 
-	setting = config_lookup(&cfg, "host");
-	if (setting) {
-		switch(config_setting_type(setting)) {
-		/* TODO: Deprecated. Made for back compatibility. */
-		case CONFIG_TYPE_STRING:
-			ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string(setting)));
-			break;
-		case CONFIG_TYPE_ARRAY: {
-			int size = config_setting_length(setting);
-			for (int i = 0; i < size; i++) {
-				ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string_elem(setting,
-									i)));
-			}
-			break;
-		}
-		default:
-			fprintf(stderr, "%s! In file %s, bad entry type for %s."
-							" Will not be read.\n", 
-							"Error", fname, "host");
-		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "host");
+		strncpy(progdir, config.getProgramDir(), 256);
 	}
-
-	setting = config_lookup(&cfg, "progdir");
-	if (setting){
-		strncpy(progdir, config_setting_get_string(setting), 256);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "progdir");
-	}
-
-	config_destroy(&cfg);
-	fclose(file);
 }
 
 /**
@@ -291,11 +222,10 @@ void QKernel::loadConfig(const char * fname)
  */
 void QKernel::on_actionExecute_triggered()
 {
-	int i;
 	QString s = QFileDialog::getOpenFileName(this, "Execute", progdir, "*.log");
 
 	if (!s.isNull()) {
-		i = s.indexOf(".log");
+		int i = s.indexOf(".log");
 
 		if (i > 0)
 			s.remove(i, 4);
@@ -376,8 +306,6 @@ void QKernel::on_actionHelp_triggered()
  */
 void QKernel::RunGraphModule(char *sk)
 {
-	char cmd[255];
-
 	QString program = getHomeDir();
 	program += "/modules/loggraph";
 
@@ -602,18 +530,21 @@ void QKernel::on_actionKill_triggered()
 	KillInterpreterDialog dialog(this);
 	dialog.setWindowTitle("Kill interpreter");
 
-	MESSAGE m;
-	InterpEntry *interpreter;
-
 	if (dialog.exec()) {
+		MESSAGE m;
 		m.msg_type = MSG_INT;
 		m.param.pword[0] = INT_KILL;
+		
+		InterpEntry *interpreter;
 		interpreter = findINTbyID(dialog.getInterpreterId());
+
 		if (interpreter != NULL) {
-			if (!(interpreter->remote))
+			if (!(interpreter->remote)) {
 				write(interpreter->sock, &m, sizeof(MESSAGE));
-			else
+			}
+			else {
 				WriteMessage("This is a remote instance of a program!");
+			}
 		}
 		else {
 			WriteMessage("Interpreter not found");
@@ -630,11 +561,12 @@ void QKernel::NetMessage()
 	/* TODO: It has to be rewritten */
 	MESSAGE msg;
 	int cnt;
-	char ss[255];
 	InterpEntry *pom;
 
 	cnt = read(net_sock, &msg, sizeof(MESSAGE));
 	if ((cnt > 0) && (msg.msg_type == MSG_NET)) {
+		char ss[255];
+
 		switch(msg.param.pword[0]) {
 		case NET_CSWRITELN:
 			WriteMessage(msg.param.pstr);
@@ -806,12 +738,12 @@ void QKernel::IntMessage(int sock)
  * Writes message to kernel logger.
  * @parame msg String with message to log
  */
-void QKernel::WriteMessage(char *msg)
+void QKernel::WriteMessage(const char *msg)
 {
 	int x;
-	int y;
+// 	int y;
 	x = desktop->textCursor().blockNumber();
-	y = desktop->textCursor().columnNumber();
+// 	y = desktop->textCursor().columnNumber();
 
 	if (x > 100) {
 		desktop->clear();
@@ -925,9 +857,9 @@ InterpEntry *QKernel::findINTbySocket(int _id)
 {
 	InterpEntry *pom = NULL;
 	
-	for (int i = 0; i < Interpreters.size(); i++) {
-		if (Interpreters.at(i)->sock == _id) {
-			pom = Interpreters.at(i);
+	for (auto interpreter : Interpreters) {
+		if (interpreter->sock == _id) {
+			pom = interpreter;
 			break;
 		}
 	}
@@ -944,9 +876,9 @@ InterpEntry *QKernel::findINTbyID(int _id)
 {
 	InterpEntry *pom = NULL;
 	
-	for (int i = 0; i < Interpreters.size(); i++) {
-		if (Interpreters.at(i)->ID == _id) {
-			pom = Interpreters.at(i);
+	for (auto interpreter : Interpreters) {
+		if (interpreter->ID == _id) {
+			pom = interpreter;
 			break;
 		}
 	}
@@ -1076,7 +1008,6 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r)
 void QKernel::RemoteInstance(InterpEntry *interp, int on)
 {
 	MESSAGE m;
-	char s[255];
 
 	m.msg_type = MSG_NET;
 	m.param.pword[0] = NET_NODE_EXIST;
@@ -1131,6 +1062,7 @@ void QKernel::RemoteInstance(InterpEntry *interp, int on)
 		m.param.pword[1] = interp->RInstances[on];
 		write(interp->sock, &m, sizeof(MESSAGE));
 	} else { /* There is no such a node! */
+		char s[255];
 		sprintf(s, "Warning: Node number %d not found!", on); 
 		WriteMessage(s);
 		WriteMessage("Allocating O-process on the local node");
@@ -1181,6 +1113,9 @@ void QKernel::on_actionInfo_triggered()
 	wait_for_info = TRUE;
 }
 
+}
+}
+
 /**
  * Program main function
  * All program arguments but the first one (argv[0]: program name) are saved and
@@ -1193,8 +1128,8 @@ int main(int argc, char **argv)
 	XInitThreads();
 
 	QApplication * app = new QApplication(argc, argv);
-	QKernel kernel(argc, argv);
+	loglan::vlp::QKernel kernel(argc, argv);
 	kernel.show();
 	
 	return app->exec();
-}
+}
\ No newline at end of file