X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.cpp;h=c6a9d1795d252fd286c8ca2266cb406fa141bf01;hb=0584aeb7c0bebaa46738dc1cc81a3a7dc463fd17;hp=8ab19f17dcbda4cd62500b724e63a2e62e15195a;hpb=1fda21e7f7ea3c58af8bc87e68c4dd25ab4b4c89;p=vlp.git diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp index 8ab19f1..c6a9d17 100644 --- a/src/kernel/kernel.cpp +++ b/src/kernel/kernel.cpp @@ -29,7 +29,6 @@ ************************************************************/ - #include #include #include @@ -37,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +48,9 @@ #include #include #include -#include +#include +#include +#include #include #include @@ -57,157 +58,26 @@ #include #include "genint1.h" -#include "comm.h" #include "socu.h" #include #include +#include -/* File resides in top directory (where are Makefiles)*/ -#include "../../config.h" - -#define GPATH "loggr" -#define IPATH "logi" -#define NPATH "logn" -#define REMOTE_PATH "REMOTE" -#define MAXINTERP 20 -#define MAXINSTANCES 256 +#include "kernel.h" +#include "ui/kernelwindow.h" +#include "lock.h" +#include "options.h" +#include "kill_interpreter_dialog.h" +#include "connect_dialog.h" +#include "vlp/config.h" -#define MESG_COL 0 -#define WARN_COL 1 -#define NORM_COL 2 +/* File resides in top directory (where are Makefiles)*/ +#include "../../config.h" char CharLine[25] = "________________________"; -char myargs[5][255]; - -/** - * Interpreter slot - */ -class InterpEntry { -public: - /** Interpreter identifier */ - int ID; - /** Defines if interpreter is remote or not */ - bool remote; - /* Program name */ - char fullname[255]; - char shortname[255]; - - /* Socket */ - int sock; - QSocketNotifier *notify; - /* IDs of my remote INT modules */ - int RInstances[MAXINSTANCES]; - /* Parent interpreter info */ - ctx_struct p_ctx; -}; - -/** - * Connection slot - */ -class ConnectEntry { -public: - char addr[256]; - - ConnectEntry(char *s) { - strcpy(addr, s); - }; -}; - -QApplication *app; - -/** - * Kernel class - */ -class QKernel : public QMainWindow { - Q_OBJECT -public: - QTextEdit *desktop; - QMenuBar *bar; - QMenu *programMenu; - QMenu *machineMenu; - QMenu *toolsMenu; - char progdir[256]; - int NodeNumber; - int ConType; - - QKernel(); - - virtual void resizeEvent(QResizeEvent *ev); - - void WriteMessage(char* msg); - void InitMessage(); - -public slots: - void n_impl(); - void Run_Prog(); - void Edit(); - void Help(); - void SetOptions(); - void AddAddress(); - void DelAddress(); - void LockConsole(); - void UnlockConsole(); - void MessageToNode(); - void QuitProc(); - void NetMessage(); - void IntMessage(int); - void KillInterpreter(); - void Disconnect(); - void SetMessages(); - void Connect(); - void Info(); - -protected: - virtual void closeEvent (QCloseEvent * e); - -private: - QList Interpreters; - QList ConnectList; - QListWidget *connections; - - /** - * number of working interpreters - * @attention Currently not in use - */ - int Tasks; - - /** - * number of connected VLPs - */ - int ActiveConnections; - bool LOCKED; - bool synchro; - bool wait_for_info; - char LockPasswd[25]; - QAction * lockid; - QAction * unlockid; - QAction * qid; - QAction * cwid; - QAction * optid; - QAction * prid; - QAction * mid; - QAction * msgid; - QAction * toolsid; - QAction * hid; - - int net_sock; - int freeINTid; - QSocketNotifier *Net_Notify; - char HomeDir[255]; - bool info_messages; - - void LoadConfig(char *); - void RunGraphModule(char*); - void RunNetModule(); - InterpEntry *findINTbySocket(int); - InterpEntry *findINTbyID(int); - InterpEntry *RunIntModule(char *ss, int r); - void RemoteInstance(InterpEntry*, int); - void CloseInstances(InterpEntry*); -}; /** * Event invoked on program close. @@ -215,208 +85,139 @@ private: */ void QKernel::closeEvent(QCloseEvent * e) { - QuitProc(); + e->ignore(); + + if (!LOCKED) { + on_actionQuit_triggered(); + } +} + +void QKernel::setLocked(bool locked) +{ + LOCKED = locked; + + actionQuit->setDisabled(locked); + + actionExecute->setDisabled(locked); + actionKill->setDisabled(locked); + actionMessage->setDisabled(locked); + actionConnect->setDisabled(locked); + actionDisconnect->setDisabled(locked); + actionInfo->setDisabled(locked); + + + /* Enable only menu entry for unlocking */ + actionEditor->setDisabled(locked); + actionOptions->setDisabled(locked); + actionLock_console->setDisabled(locked); + actionUnlock_console->setDisabled(!locked); } /** * Kernel program constructor. * Prepares everything to work. */ -QKernel::QKernel() +QKernel::QKernel(int argc, char **argv) { - QDir q(REMOTE_PATH); - char ss[255]; + setupUi(this); + + QString arg0(argv[0]); + arg0 += "/"; + homeDir = QDir(arg0); + homeDir.cdUp(); + + + int i; + for(i = 0; (i < 5) && (i < argc-1); i++) { + strcpy(myargs[i], ""); + if (i < argc) { + strcpy(myargs[i], argv[i+1]); + } + } + + QDir q(getRemoteDir()); if (!q.exists()) { - sprintf(ss, "mkdir %s", REMOTE_PATH); - system(ss); - } + q.mkpath(getRemoteDir()); + } - info_messages = TRUE; + info_messages = actionInfo_messages->isChecked(); wait_for_info = FALSE; setWindowTitle(PACKAGE_NAME); - QMenu * programMenu = NULL; - programMenu = menuBar()->addMenu("&Program"); - programMenu->addAction("Execute", this, SLOT(Run_Prog())); - programMenu->addAction("Kill", this, SLOT(KillInterpreter())); - - - machineMenu = menuBar()->addMenu("&Machine"); - machineMenu->addAction("Message", this, SLOT(MessageToNode())); - machineMenu->addSeparator(); - machineMenu->addAction("Connect", this, SLOT(Connect())); - machineMenu->addAction("Disconnect", this, SLOT(Disconnect())); - machineMenu->addAction("Info", this, SLOT(Info())); - - toolsMenu = menuBar()->addMenu("&Tools"); - cwid = toolsMenu->addAction("Editor", this, SLOT(Edit())); - hid = toolsMenu->addAction("Help", this, SLOT(Help())); - toolsMenu->addSeparator(); - optid = toolsMenu->addAction("Options", this, SLOT(SetOptions())); - msgid = toolsMenu->addAction("Info messages", this, SLOT(SetMessages())); - msgid->setCheckable(TRUE); - msgid->setChecked(TRUE); - toolsMenu->addSeparator(); - lockid = toolsMenu->addAction("Lock console", this, SLOT(LockConsole())); - unlockid = toolsMenu->addAction("Unlock console", this, - SLOT(UnlockConsole())); - unlockid->setDisabled(TRUE); LOCKED = FALSE; - qid = menuBar()->addAction("&Quit", this, SLOT(QuitProc())); - - desktop = new QTextEdit(this); - desktop->setReadOnly(TRUE); - QVBoxLayout * layout = new QVBoxLayout(); - layout->setContentsMargins (3, 0, 3, 0); - layout->addWidget(desktop); - QWidget *window = new QWidget(); - window->setLayout(layout); - setCentralWidget(window); - - resize(400, 200); Tasks = 0; freeINTid = 1; ActiveConnections = 0; strcpy(LockPasswd, ""); - LoadConfig("vlp.cfg"); + + loadConfig(getConfigFilePath()); + RunNetModule(); Net_Notify = new QSocketNotifier(net_sock, QSocketNotifier::Read, this); connect(Net_Notify, SIGNAL(activated(int)), this, SLOT(NetMessage())); + + WriteMessage("\n " PACKAGE_STRING ": READY \n"); } -/** - * Event invoked on resizing kernel application window. - * @copydoc QWidget::resizeEvent(QResizeEvent*) - */ -void QKernel::resizeEvent(QResizeEvent *ev) +QString QKernel::getConfigFilePath() { -// QFrame::resizeEvent(ev); -// if (desktop) -// desktop->setGeometry(0, bar->height(), width(), -// height() - bar->height()); + return homeDir.absoluteFilePath("vlp.cfg"); } -/** - * Displays window with information about not implemented functionality. - */ -void QKernel::n_impl() +const char * QKernel::getHomeDir() { - QMessageBox::information(this, "Function info", "This function is not " - "implemented yet...", "Ok"); + return homeDir.absolutePath().toStdString().c_str(); } +const char * QKernel::getRemoteDir() +{ + return homeDir.absoluteFilePath(REMOTE_PATH).toStdString().c_str(); +} + +const char * QKernel::getNetModuleSocket() +{ + return homeDir.absoluteFilePath(NPATH).toStdString().c_str(); +} + +const char * QKernel::getGraphModuleSocket() +{ + return homeDir.absoluteFilePath(GPATH).toStdString().c_str(); +} + +void QKernel::loadConfig(const QString & fname) +{ + loadConfig(fname.toStdString().c_str()); +} /** * Loads configuration from the given file. * @param fname Filename of the configuration file. */ -void QKernel::LoadConfig(char * fname) +void QKernel::loadConfig(const char * fname) { - config_t cfg; - config_setting_t *setting; - const char *str; - - /* Hack for checking if file exists without using external libs.*/ - 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);/* from original code. */ - } + loglan::vlp::Config config; + if(config.load(fname)) { + NodeNumber = config.getNodeNumber(); + ConType = config.getConnectionType(); - 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; - } - } 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"); + std::vector 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, "host"); - } - 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"); + strncpy(progdir, config.getProgramDir(), 256); } - - setting = config_lookup(&cfg, "homedir"); - if (setting) { - strncpy(HomeDir, config_setting_get_string(setting), 255); - } else { - fprintf(stderr, "%s! In file %s, '%s' was not found.\n", - "Warning", fname, "homedir"); - } - - config_destroy(&cfg); - fclose(file); } /** * Executes program. * Additional window id displayed to set which code to execute. */ -void QKernel::Run_Prog() +void QKernel::on_actionExecute_triggered() { int i; QString s = QFileDialog::getOpenFileName(this, "Execute", progdir, "*.log"); @@ -427,6 +228,7 @@ void QKernel::Run_Prog() if (i > 0) s.remove(i, 4); + // @TODO: if no interpreter is running will result in killing app RunIntModule((char*)s.toAscii().data(), 0); } } @@ -434,23 +236,67 @@ void QKernel::Run_Prog() /** * Invokes editor program */ -void QKernel::Edit() +void QKernel::on_actionEditor_triggered() { - char cmd[255]; - sprintf(cmd, "%s/modules/logedit %s %s %s %s %s %s &", HomeDir, HomeDir, - myargs[0], myargs[1], myargs[2], myargs[3], myargs[4]); - system(cmd); + QString program = getHomeDir(); + program += "/modules/logedit"; + + pid_t pid = fork(); + if (pid == 0) { + if (execl(program.toStdString().c_str(), + getHomeDir(), + myargs[0], + myargs[1], + myargs[2], + myargs[3], + myargs[4], + NULL + ) == -1) { + WriteMessage("Executing logedit failed!"); + } + } + else if (pid < 0) { + WriteMessage("fork(logedit) failed!"); + WriteMessage("Exiting..."); + sleep(2); + on_actionQuit_triggered(); + exit(3); + } } /** * Invokes help program */ -void QKernel::Help() +void QKernel::on_actionHelp_triggered() { - char cmd[255]; - sprintf(cmd, "%s/modules/loghelp %s/doc %s %s %s %s %s &", HomeDir, - HomeDir, myargs[0], myargs[1], myargs[2], myargs[3], myargs[4]); - system(cmd); + QString program = getHomeDir(); + program += "/modules/loghelp"; + + QString docDir = getHomeDir(); + docDir += "/doc"; + + pid_t pid = fork(); + if (pid == 0) { + if (execl(program.toStdString().c_str(), + docDir.toStdString().c_str(), + myargs[0], + myargs[1], + myargs[2], + myargs[3], + myargs[4], + NULL + ) == -1) { + + WriteMessage("Executing loghelp failed!"); + } + } + else if (pid < 0) { + WriteMessage("fork(loghelp) failed!"); + WriteMessage("Exiting..."); + sleep(2); + on_actionQuit_triggered(); + exit(3); + } } /** @@ -458,14 +304,35 @@ void QKernel::Help() */ void QKernel::RunGraphModule(char *sk) { - char cmd[255]; - - sprintf(cmd, "%s/modules/loggraph %s %s %s %s %s %s", HomeDir, sk, - myargs[0], myargs[1], myargs[2], myargs[3], myargs[4]); - strcat(cmd, " &"); - - if (system(cmd) != 0) - WriteMessage("Cannot connect GRAPH resources"); + QString program = getHomeDir(); + program += "/modules/loggraph"; + + pid_t pid = fork(); + if (pid == 0) { + if (execl(program.toStdString().c_str(), + program.toStdString().c_str(), + sk, + myargs[0], + myargs[1], + myargs[2], + myargs[3], + myargs[4], + NULL + ) == -1) { + + WriteMessage("Executing loggraph failed!"); + WriteMessage("Exiting..."); + sleep(2); + on_actionQuit_triggered(); + } + } + else if (pid < 0) { + WriteMessage("fork(loggraph) failed!"); + WriteMessage("Exiting..."); + sleep(2); + on_actionQuit_triggered(); + exit(3); + } } /** @@ -474,45 +341,63 @@ void QKernel::RunGraphModule(char *sk) void QKernel::RunNetModule() { struct sockaddr_un svr; - int len, on; + int len; + int on; int sock; - char cmd[255]; - sprintf(cmd, "%s/modules/lognet %s %s %s %s %s %s", HomeDir, NPATH, - myargs[0], myargs[1], myargs[2], myargs[3], myargs[4]); - strcat(cmd, " &"); + + QString program = getHomeDir(); + program += "/modules/lognet"; + + pid_t pid = fork(); + if (pid == 0) { + if (execl(program.toStdString().c_str(), + program.toStdString().c_str(), + getNetModuleSocket(), + getConfigFilePath().toStdString().c_str(), + myargs[0], + myargs[1], + myargs[2], + myargs[3], + myargs[4], + NULL + ) == -1) { + + WriteMessage("Executing lognet failed!"); + WriteMessage("Exiting..."); + sleep(2); + on_actionQuit_triggered(); + } + } + else if (pid < 0) { + WriteMessage("fork(lognet) failed!"); + WriteMessage("Exiting..."); + sleep(2); + on_actionQuit_triggered(); + exit(3); + } /* -------- socket for NET module -------- */ - unlink(NPATH); + unlink(getNetModuleSocket()); sock = socket(AF_UNIX, SOCK_STREAM, 0); bzero(&svr, sizeof(svr)); svr.sun_family = AF_UNIX; - strcpy(svr.sun_path, NPATH); + strcpy(svr.sun_path, getNetModuleSocket()); len = strlen(svr.sun_path) + sizeof(svr.sun_family); - bind(sock, (struct sockaddr*)&svr, len); + bind(sock, (struct sockaddr*)&svr, len); listen(sock, 5); - if (system(cmd) == 0) { - net_sock = accept(sock, (struct sockaddr*)0, (unsigned int*)0); - // close(sock); - if (net_sock != 0) { - WriteMessage("NETWORK successfully connected"); - fcntl(net_sock, F_SETFL, O_NONBLOCK|fcntl(net_sock, - F_GETFL, 0)); - on=1; - setsockopt(net_sock, IPPROTO_TCP, TCP_NODELAY, - (char*)&on, sizeof(on)); - } else { - WriteMessage("Cannot connect NETWORK resources"); - WriteMessage("Exiting..."); - sleep(2); - QuitProc(); - } - /* system OK */ + net_sock = accept(sock, (struct sockaddr*)0, (unsigned int*)0); + // close(sock); + if (net_sock != 0) { + WriteMessage("NETWORK successfully connected"); + fcntl(net_sock, F_SETFL, O_NONBLOCK|fcntl(net_sock, F_GETFL, 0)); + on = 1; + setsockopt(net_sock, IPPROTO_TCP, TCP_NODELAY, (char*)&on, sizeof(on)); } else { WriteMessage("Cannot connect NETWORK resources"); WriteMessage("Exiting..."); sleep(2); - QuitProc(); + on_actionQuit_triggered(); } } @@ -520,39 +405,25 @@ void QKernel::RunNetModule() * Connects to the specified address * Additional window is displayed to connect to the specified address */ -void QKernel::Connect() +void QKernel::on_actionConnect_triggered() { - QDialog d(this, Qt::Dialog); - QLabel lab("IP Address:", &d); - QLineEdit ed("", &d); - QPushButton ob("", &d); - QPushButton cb("", &d); MESSAGE m; - ob.setGeometry(30, 60, 80, 30); - ob.setText("Ok"); - ob.setDefault(TRUE); - lab.setGeometry(10, 10, 60, 30); - lab.setText("Address"); - ed.setGeometry(70, 10, 140, 30); - cb.setGeometry(130, 60, 80, 30); - cb.setText("Cancel"); - d.resize(240, 100); - - connect(&ob, SIGNAL(clicked()), &d, SLOT(accept())); - connect(&cb, SIGNAL(clicked()), &d, SLOT(reject())); - if (d.exec()) { + ConnectDialog dialog(this); + dialog.setWindowTitle("IP Address:"); + + if (dialog.exec()) { m.msg_type = MSG_NET; m.param.pword[0] = NET_CONNECT_TO; - strcpy(m.param.pstr, ed.text().toAscii().data()); - write(net_sock, &m, sizeof(MESSAGE)); + strcpy(m.param.pstr, dialog.getAddress().toStdString().c_str()); + write(net_sock, &m, sizeof(MESSAGE)); } } /** * Disconnects from virtual machine */ -void QKernel::Disconnect() +void QKernel::on_actionDisconnect_triggered() { MESSAGE msg; @@ -567,72 +438,31 @@ void QKernel::Disconnect() /** * Quits process. Closes VLP. Shows additional window to confirm exit. */ -void QKernel::QuitProc() +void QKernel::on_actionQuit_triggered() { MESSAGE msg; - if (QMessageBox::question(this, "Close VLP", "Terminate VLP ?", - QMessageBox::Yes, QMessageBox::No, 0) == QMessageBox::No) { - return; - } - - if (!LOCKED) { - /* - msg.msg_type = MSG_NET; - msg.param.pword[0] = NET_DISCONNECT; - write(net_sock, &msg, sizeof(MESSAGE));*/ - delete Net_Notify; - - msg.msg_type = MSG_NET; - msg.param.pword[0] = NET_EXIT; - write(net_sock, &msg, sizeof(MESSAGE)); - /* ::close(net_sock);*/ - app->quit(); - } -} + QMessageBox::StandardButton response = QMessageBox::question(this, + "Close VLP", + "Terminate VLP ?", + QMessageBox::Ok | QMessageBox::Cancel + ); -/** - * Adds IP address to the configuration. - * Additional window is displayed to add address to the list - */ -void QKernel::AddAddress() -{ - QDialog d(this, Qt::Dialog); - QLabel lab("IP Address:", &d); - QLineEdit ed("", &d); - QPushButton ob("", &d); - QPushButton cb("", &d); - - if (connections) { - ob.setGeometry(30, 60, 80, 30); - ob.setText("Ok"); - ob.setDefault(TRUE); - lab.setGeometry(10, 10, 60, 30); - lab.setText("Address"); - ed.setGeometry(70, 10, 140, 30); - cb.setGeometry(130, 60, 80, 30); - cb.setText("Cancel"); - d.resize(240, 100); - connect(&ob, SIGNAL(clicked()), &d, SLOT(accept())); - connect(&cb, SIGNAL(clicked()), &d, SLOT(reject())); - if (d.exec()) - if (strcmp(ed.text().toAscii().data(), "") != 0) { - connections->addItem(ed.text()); - } - } -} -/** - * Deletes current address from available connections. - */ -void QKernel::DelAddress() -{ - if (connections) { - if (connections->currentRow() != -1) { - /* TODO: Checki if this work correctly after porting */ - connections->removeItemWidget(connections->currentItem()); - } + if (response == QMessageBox::Cancel) { + return; } + /* + msg.msg_type = MSG_NET; + msg.param.pword[0] = NET_DISCONNECT; + write(net_sock, &msg, sizeof(MESSAGE));*/ + delete Net_Notify; + + msg.msg_type = MSG_NET; + msg.param.pword[0] = NET_EXIT; + write(net_sock, &msg, sizeof(MESSAGE)); + /* ::close(net_sock);*/ + QApplication::instance()->quit(); } /** @@ -640,7 +470,7 @@ void QKernel::DelAddress() * Additional window is displayed to set Node Number of node where send message, * and textfield to enter message. */ -void QKernel::MessageToNode() +void QKernel::on_actionMessage_triggered() { QDialog *dlg; QLineEdit *nodenr; @@ -693,43 +523,23 @@ void QKernel::MessageToNode() * Additional window is displayed to get ID of interpreter which should be * killed. */ -void QKernel::KillInterpreter() +void QKernel::on_actionKill_triggered() { - QDialog *dlg; - QLineEdit *nodenr; - MESSAGE m; - InterpEntry *pom; - - dlg = new QDialog(this, Qt::Dialog); - dlg->setWindowTitle("Kill interpreter"); - - nodenr = new QLineEdit("", dlg); - nodenr->setGeometry(90, 10, 50, 30); - - QLabel * tmpQLabel = new QLabel("Interp. ID:", dlg); - tmpQLabel->setGeometry(10, 10, 77, 30); - - QPushButton * ob = new QPushButton("Kill", dlg); - ob->setGeometry( 160, 10, 80, 30); - ob->setDefault(TRUE); - - QPushButton * cb = new QPushButton("Cancel", dlg); - cb->setGeometry(260, 10, 80, 30); - dlg->resize(360, 50); + KillInterpreterDialog dialog(this); + dialog.setWindowTitle("Kill interpreter"); - connect(ob, SIGNAL(clicked()), dlg, SLOT(accept())); - connect(cb, SIGNAL(clicked()), dlg, SLOT(reject())); + MESSAGE m; + InterpEntry *interpreter; - if (dlg->exec()) { + if (dialog.exec()) { m.msg_type = MSG_INT; m.param.pword[0] = INT_KILL; - pom = findINTbyID(atoi(nodenr->text().toAscii().data())); - if (pom != NULL) { - if (!(pom->remote)) - write(pom->sock, &m, sizeof(MESSAGE)); + interpreter = findINTbyID(dialog.getInterpreterId()); + if (interpreter != NULL) { + if (!(interpreter->remote)) + write(interpreter->sock, &m, sizeof(MESSAGE)); else - WriteMessage("This is a remote instance of " - "a program!"); + WriteMessage("This is a remote instance of a program!"); } else { WriteMessage("Interpreter not found"); @@ -777,7 +587,7 @@ void QKernel::NetMessage() WriteMessage(CharLine); break; case VLP_REMOTE_INSTANCE: - sprintf(ss, "%s/%s", REMOTE_PATH, + sprintf(ss, "%s/%s", getRemoteDir(), msg.param.pstr); if (info_messages) { @@ -831,10 +641,8 @@ void QKernel::NetMessage() cnt = poms1.indexOf('='); if (cnt != -1) { poms2 = poms1.left(cnt); - poms1 = poms1.right( - poms1.length() - - cnt - 1); - sprintf(ss, "Node: %s Addr: %s", poms2.data(), poms1.data()); + poms1 = poms1.right(poms1.length() - cnt - 1); + sprintf(ss, "Node: %s Addr: %s", poms2.toStdString().c_str(), poms1.toStdString().c_str()); WriteMessage(ss); } } @@ -924,12 +732,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(); @@ -954,18 +762,12 @@ void QKernel::WriteMessage(char *msg) * Adds checkbox to menu item. If it is checked additional info messages are * shown. */ -void QKernel::SetMessages() +void QKernel::on_actionInfo_messages_triggered() { if (toolsMenu != NULL) { - if (msgid->isChecked()) { - msgid->setChecked(FALSE); - info_messages = FALSE; - } else { - msgid->setChecked(TRUE); - info_messages = TRUE; - } + info_messages = actionInfo_messages->isChecked(); + actionInfo_messages->setChecked(info_messages); } - /* bar->repaint(); */ } /** @@ -973,137 +775,13 @@ void QKernel::SetMessages() * Additional window is displayed to set kernel options which are saved in * vlp.cfg file in kernel executable directory. */ -void QKernel::SetOptions() +void QKernel::on_actionOptions_triggered() { - QDialog dlg(this, Qt::Dialog); - dlg.setWindowTitle("Options"); - ConnectEntry *e; - unsigned int i; - - QLineEdit* progs; - progs = new QLineEdit(progdir, &dlg); - progs->setGeometry(150, 20, 180, 30); - - QLabel* tmpQLabel; - tmpQLabel = new QLabel("Programs directory", &dlg); - tmpQLabel->setGeometry(30, 20, 120, 30); - - QFrame* tmpQFrame; - tmpQFrame = new QFrame(&dlg); - tmpQFrame->setGeometry(10, 60, 380, 30); - tmpQFrame->setFrameStyle(52); - - tmpQLabel = new QLabel("Virtual Processor properties (activated after " - "restarting VLP):", &dlg); - tmpQLabel->setGeometry(10, 80, 340, 30); - - QLineEdit *nn; - char nns[256]; - sprintf(nns, "%d", NodeNumber); - nn = new QLineEdit(nns, &dlg); - nn->setGeometry(110, 110, 40, 30); - - tmpQLabel = new QLabel("Node number:", &dlg); - tmpQLabel->setGeometry(20, 110, 90, 30); - - QRadioButton *exp, *reg; - exp = new QRadioButton("Explicit", &dlg); - exp->setGeometry(30, 170, 100, 30); - exp->setChecked(TRUE); + OptionsDialog optionsDialog(getConfigFilePath(), this); + if (optionsDialog.exec()) { + optionsDialog.saveConfig(getConfigFilePath()); - reg = new QRadioButton("Registration", &dlg); - reg->setGeometry(30, 200, 100, 30); - reg->setEnabled(FALSE); - - connections = new QListWidget(&dlg); - connections->setGeometry(170, 140, 130, 100); - - for (int i = 0; i < ConnectList.size(); i++) { - e = ConnectList.at(i); - connections->addItem(e->addr); - } - - tmpQLabel = new QLabel("Connection list:", &dlg); - tmpQLabel->setGeometry(170, 110, 100, 30); - - QPushButton *addbtn; - QPushButton *delbtn; - QPushButton *okbtn; - QPushButton *cancelbtn; - addbtn = new QPushButton("Add", &dlg); - addbtn->setGeometry(310, 150, 60, 30); - connect(addbtn, SIGNAL(clicked()), this, SLOT(AddAddress())); - - delbtn = new QPushButton("Del", &dlg); - delbtn->setGeometry(310, 200, 60, 30); - connect(delbtn, SIGNAL(clicked()), this, SLOT(DelAddress())); - - okbtn = new QPushButton("Ok", &dlg); - okbtn->setGeometry(80, 260, 100, 30); - okbtn->setDefault(TRUE); - connect(okbtn, SIGNAL(clicked()), &dlg, SLOT(accept())); - - cancelbtn = new QPushButton("Cancel", &dlg); - cancelbtn->setGeometry(210, 260, 100, 30); - connect(cancelbtn, SIGNAL(clicked()), &dlg, SLOT(reject())); - - QGroupBox* group; - group = new QGroupBox("Connection type", &dlg); - group->setGeometry(20, 150, 120, 90); - group->setAlignment(Qt::AlignLeft); - group->lower(); - - QVBoxLayout *vbox = new QVBoxLayout(); - vbox->addWidget(exp); - vbox->addWidget(reg); - vbox->addStretch(1); - group->setLayout(vbox); - - dlg.resize(400, 310); - if (dlg.exec()) { - config_t cfg; - config_setting_t *root; - config_setting_t *setting; - config_init(&cfg); - - root = config_root_setting(&cfg); - - setting = config_setting_add(root, "progdir", - CONFIG_TYPE_STRING); - config_setting_set_string(setting, progs->text().toAscii().data()); - strcpy(progdir, progs->text().toAscii().data()); - - setting = config_setting_add(root, "node_number", - CONFIG_TYPE_INT); - config_setting_set_int(setting, atoi(nn->text().toAscii().data())); - - setting = config_setting_add(root, "homedir", - CONFIG_TYPE_STRING); - config_setting_set_string(setting, HomeDir); - - setting = config_setting_add(root, "type", - CONFIG_TYPE_STRING); - if (exp->isChecked()) { - config_setting_set_string(setting, "explicit"); - - config_setting_t *hosts = NULL; - hosts = config_setting_add(root, "host", - CONFIG_TYPE_ARRAY); - for(i = 0; i < connections->count(); i++) { - setting = config_setting_add(hosts, NULL, - CONFIG_TYPE_STRING); - config_setting_set_string(setting, - connections->item(i)->text().toAscii().data()); - } - } else { - config_setting_set_string(setting, "register"); - } - - if (!config_write_file(&cfg, "vlp.cfg")) { - fprintf(stderr, "Error while writing to file: %s.\n", - "vlp.cfg"); - } - config_destroy(&cfg); + loadConfig(getConfigFilePath()); } } @@ -1112,50 +790,27 @@ void QKernel::SetOptions() * Additional window is displayed to enter password and retype it. If both are * same kernel window is locked. */ -void QKernel::LockConsole() +void QKernel::on_actionLock_console_triggered() { - QDialog d(this, Qt::Dialog); - d.setWindowTitle("Lock console"); - - QPushButton ob("Ok", &d); - ob.setGeometry(30, 60, 80, 30); - ob.setDefault(TRUE); - connect(&ob, SIGNAL(clicked()), &d, SLOT(accept())); - - QLabel lab("Password:", &d); - lab.setGeometry(10, 10, 60, 30); - - QLineEdit ed("", &d); - ed.setGeometry(70, 10, 140, 30); - ed.setEchoMode(QLineEdit::Password); - - QPushButton cb("Cancel", &d); - cb.setGeometry(130, 60, 80, 30); - connect(&cb, SIGNAL(clicked()), &d, SLOT(reject())); - - d.resize(240, 100); - - if (d.exec()) { - if (strcmp(ed.text().toAscii().data(), "") != 0) { - strcpy(LockPasswd, ed.text().toAscii().data()); - lab.setText("Retype:"); - ed.setText(""); - if (d.exec()) { - if (strcmp(ed.text().toAscii().data(), LockPasswd)==0) { - qid->setEnabled(FALSE); - prid->setEnabled(FALSE); - mid->setEnabled(FALSE); - unlockid->setEnabled(TRUE); - lockid->setEnabled(FALSE); - cwid->setEnabled(FALSE); - optid->setEnabled(FALSE); + LockDialog lockDialog(this); + + if (lockDialog.exec()) { + QString password = lockDialog.getPassword(); + if (lockDialog.getPassword().size() > 0) { + strcpy(LockPasswd, password.toStdString().c_str()); + lockDialog.retype(); + + if (lockDialog.exec()) { + password = lockDialog.getPassword(); + if (password == LockPasswd) { + setLocked(TRUE); WriteMessage("CONSOLE LOCKED"); - LOCKED = TRUE; } else { QMessageBox msg(this); msg.setText("Not matching!"); msg.setButtonText(0, "Close"); msg.show(); + strcpy(LockPasswd, ""); } } else { strcpy(LockPasswd, ""); @@ -1169,40 +824,15 @@ void QKernel::LockConsole() * Additional window is displayed to enter password. If it is correct, kernel * window is unlocked */ -void QKernel::UnlockConsole() +void QKernel::on_actionUnlock_console_triggered() { - QDialog d(this, Qt::Dialog); - d.setWindowTitle("Enter password"); - - QLabel lab("Password:", &d); - lab.setGeometry(10, 10, 60, 30); - - QLineEdit ed("", &d); - ed.setGeometry(70, 10, 140, 30); - ed.setEchoMode(QLineEdit::Password); - - QPushButton ob("Ok", &d); - ob.setGeometry(30, 60, 80, 30); - ob.setDefault(TRUE); - connect(&ob, SIGNAL(clicked()), &d, SLOT(accept())); - - QPushButton cb("Cancel", &d); - cb.setGeometry(130, 60, 80, 30); - connect(&cb, SIGNAL(clicked()), &d, SLOT(reject())); - - d.resize(240, 100); - - if (d.exec()) { - if (strcmp(ed.text().toAscii().data(), LockPasswd) == 0) { - qid->setEnabled(TRUE); - prid->setEnabled(TRUE); - mid->setEnabled(TRUE); - unlockid->setEnabled(FALSE); - lockid->setEnabled(TRUE); - cwid->setEnabled(TRUE); - optid->setEnabled(TRUE); + LockDialog lockDialog(this); + + if (lockDialog.exec()) { + QString password = lockDialog.getPassword(); + if (strcmp(password.toStdString().c_str(), LockPasswd) == 0) { + setLocked(FALSE); WriteMessage("CONSOLE UNLOCKED"); - LOCKED = FALSE; } else { QMessageBox msg(this); msg.setText("Wrong password!"); @@ -1212,14 +842,6 @@ void QKernel::UnlockConsole() } } -/** - * Writes init message in kernel - */ -void QKernel::InitMessage() -{ - WriteMessage("\n " PACKAGE_STRING ": READY \n"); -} - /** * Finds Interpreter by its socket * @param _id ID of the socket @@ -1271,7 +893,8 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r) { char a[256], b[255]; struct sockaddr_un svr; - int len, sock, i, on; + int len, sock, on; + unsigned int i; int newint=-1; char cmd[255]; FILE *cf; @@ -1315,11 +938,15 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r) strcpy(newINT->fullname, ss); sprintf(a, "%s%d", IPATH, newint); - sprintf(cmd, "%s/modules/logint %s %s", HomeDir, a, ss); - if (r) + sprintf(cmd, "%s/modules/logint %s %s", + getHomeDir(), + a, + ss); + if (r) { strcat(cmd, " r"); - sprintf(b, " %s %s %s %s %s", myargs[0], myargs[1], myargs[2], - myargs[3], myargs[4]); + } + sprintf(b, " %s %s %s %s %s", + myargs[0], myargs[1], myargs[2], myargs[3], myargs[4]); strcat(cmd, b); strcat(cmd, " &"); @@ -1331,7 +958,7 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r) len = strlen(svr.sun_path)+sizeof(svr.sun_family); bind(sock, (struct sockaddr*)&svr, len); listen(sock, 5); - system(cmd); + system(cmd); newINT->sock = accept(sock, (struct sockaddr*)0, (unsigned int *)0); //::close(sock); @@ -1340,7 +967,7 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r) O_NONBLOCK|fcntl(newINT->sock, F_GETFL, 0)); on=1; setsockopt(newINT->sock, IPPROTO_TCP, TCP_NODELAY, (char*)&on, - sizeof(on)); + sizeof(on)); if (r) newINT->remote = 1; else @@ -1419,7 +1046,7 @@ void QKernel::RemoteInstance(InterpEntry *interp, int on) interp->RInstances[on] = m.param.pword[7]; break; } - read(net_sock, &m, sizeof(MESSAGE)); + read(net_sock, &m, sizeof(MESSAGE)); } Net_Notify->setEnabled(TRUE); @@ -1468,7 +1095,7 @@ void QKernel::CloseInstances(InterpEntry *e) /** * Displays information about virtual machine */ -void QKernel::Info() +void QKernel::on_actionInfo_triggered() { MESSAGE m; @@ -1480,8 +1107,6 @@ void QKernel::Info() wait_for_info = TRUE; } -#include "kernel.moc" - /** * Program main function * All program arguments but the first one (argv[0]: program name) are saved and @@ -1491,18 +1116,11 @@ void QKernel::Info() */ int main(int argc, char **argv) { - int i; - for(i = 0; i < 5; i++) { - strcpy(myargs[i], ""); - } - for(i = 1; i < argc; i++) { - strcpy(myargs[i - 1], argv[i]); - } + XInitThreads(); - app = new QApplication(argc, argv); - QKernel kernel; + QApplication * app = new QApplication(argc, argv); + QKernel kernel(argc, argv); kernel.show(); - kernel.InitMessage(); return app->exec(); }