X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.cpp;h=d7a2e2514c285a26a533bfa67b39ac6bf79c6b5e;hb=70a24259f8e3eb75677178ef5e28ecbb51c2935b;hp=d2cd33b373c7560dc31b350c4ba65234ce07ca8b;hpb=c3e1c597abe56e947b0a78bb58790212108f70b4;p=lyx.git diff --git a/src/Server.cpp b/src/Server.cpp index d2cd33b373..d7a2e2514c 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon @@ -40,15 +40,15 @@ #include #include "Server.h" -#include "debug.h" #include "FuncRequest.h" #include "LyXAction.h" #include "LyXFunc.h" + #include "frontends/Application.h" +#include "support/debug.h" #include "support/FileName.h" #include "support/lstrings.h" -#include "support/lyxlib.h" #include @@ -58,19 +58,11 @@ #endif #include +using namespace std; +using namespace lyx::support; namespace lyx { -using support::compare; -using support::FileName; -using support::rtrim; -using support::split; -using support::unlink; - -using std::endl; -using std::string; - - ///////////////////////////////////////////////////////////////////// // // LyXComm @@ -80,7 +72,7 @@ using std::string; #if !defined (HAVE_MKFIFO) // We provide a stub class that disables the lyxserver. -LyXComm::LyXComm(std::string const &, Server *, ClientCallbackfct) +LyXComm::LyXComm(string const &, Server *, ClientCallbackfct) {} void LyXComm::openConnection() @@ -115,7 +107,7 @@ void LyXComm::send(string const & msg) #else // defined (HAVE_MKFIFO) -LyXComm::LyXComm(std::string const & pip, Server * cli, ClientCallbackfct ccb) +LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb) : pipename_(pip), client_(cli), clientcb_(ccb) { ready_ = false; @@ -125,7 +117,7 @@ LyXComm::LyXComm(std::string const & pip, Server * cli, ClientCallbackfct ccb) void LyXComm::openConnection() { - LYXERR(Debug::LYXSERVER) << "LyXComm: Opening connection" << endl; + LYXERR(Debug::LYXSERVER, "LyXComm: Opening connection"); // If we are up, that's an error if (ready_) { @@ -136,9 +128,7 @@ void LyXComm::openConnection() ready_ = false; if (pipename_.empty()) { - LYXERR(Debug::LYXSERVER) - << "LyXComm: server is disabled, nothing to do" - << endl; + LYXERR(Debug::LYXSERVER, "LyXComm: server is disabled, nothing to do"); return; } @@ -160,24 +150,22 @@ void LyXComm::openConnection() // We made it! ready_ = true; - LYXERR(Debug::LYXSERVER) << "LyXComm: Connection established" << endl; + LYXERR(Debug::LYXSERVER, "LyXComm: Connection established"); } /// Close pipes void LyXComm::closeConnection() { - LYXERR(Debug::LYXSERVER) << "LyXComm: Closing connection" << endl; + LYXERR(Debug::LYXSERVER, "LyXComm: Closing connection"); if (pipename_.empty()) { - LYXERR(Debug::LYXSERVER) - << "LyXComm: server is disabled, nothing to do" - << endl; + LYXERR(Debug::LYXSERVER, "LyXComm: server is disabled, nothing to do"); return; } if (!ready_) { - lyxerr << "LyXComm: Already disconnected" << endl; + LYXERR0("LyXComm: Already disconnected"); return; } @@ -190,13 +178,39 @@ void LyXComm::closeConnection() int LyXComm::startPipe(string const & file, bool write) { + static bool stalepipe = false; FileName const filename(file); - if (::access(filename.toFilesystemEncoding().c_str(), F_OK) == 0) { - lyxerr << "LyXComm: Pipe " << filename << " already exists.\n" - << "If no other LyX program is active, please delete" - " the pipe by hand and try again." << endl; - pipename_.erase(); - return -1; + if (filename.exists()) { + if (!write) { + // Let's see whether we have a stale pipe. + int fd = ::open(filename.toFilesystemEncoding().c_str(), + O_WRONLY | O_NONBLOCK); + if (fd >= 0) { + // Another LyX instance is using it. + ::close(fd); + } else if (errno == ENXIO) { + // No process is reading from the other end. + stalepipe = true; + LYXERR(Debug::LYXSERVER, + "LyXComm: trying to remove " + << filename); + filename.removeFile(); + } + } else if (stalepipe) { + LYXERR(Debug::LYXSERVER, "LyXComm: trying to remove " + << filename); + filename.removeFile(); + stalepipe = false; + } + if (filename.exists()) { + lyxerr << "LyXComm: Pipe " << filename + << " already exists.\nIf no other LyX program" + " is active, please delete the pipe by hand" + " and try again." + << endl; + pipename_.erase(); + return -1; + } } if (::mkfifo(filename.toFilesystemEncoding().c_str(), 0600) < 0) { @@ -210,7 +224,7 @@ int LyXComm::startPipe(string const & file, bool write) if (fd < 0) { lyxerr << "LyXComm: Could not open pipe " << filename << '\n' << strerror(errno) << endl; - unlink(filename); + filename.removeFile(); return -1; } @@ -236,7 +250,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write) << '\n' << strerror(errno) << endl; } - if (unlink(FileName(filename)) < 0) { + if (FileName(filename).removeFile() < 0) { lyxerr << "LyXComm: Could not remove pipe " << filename << '\n' << strerror(errno) << endl; } @@ -264,6 +278,12 @@ void LyXComm::read_ready() int const charbuf_size = 100; char charbuf[charbuf_size]; + // As O_NONBLOCK is set, until no data is available for reading, + // read() doesn't block but returns -1 and set errno to EAGAIN. + // After a client that opened the pipe for writing, closes it + // (and no other client is using the pipe), read() would always + // return 0 and thus the connection has to be reset. + errno = 0; int status; // the single = is intended here. @@ -278,32 +298,32 @@ void LyXComm::read_ready() // the delim /wasn't/ found. ?:-P string cmd; read_buffer_= split(read_buffer_, cmd,'\n'); - LYXERR(Debug::LYXSERVER) - << "LyXComm: status:" << status + LYXERR(Debug::LYXSERVER, "LyXComm: status:" << status << ", read_buffer_:" << read_buffer_ - << ", cmd:" << cmd << endl; + << ", cmd:" << cmd); if (!cmd.empty()) clientcb_(client_, cmd); //\n or not \n? } - } - if (errno == EAGAIN) { - errno = 0; - return; - } - if (errno != 0) { - lyxerr << "LyXComm: " << strerror(errno) << endl; + } else { + if (errno == EAGAIN) { + // Nothing to read, continue + errno = 0; + return; + } + // An error occurred, better bailing out + LYXERR0("LyXComm: " << strerror(errno)); if (!read_buffer_.empty()) { - lyxerr << "LyXComm: truncated command: " - << read_buffer_ << endl; + LYXERR0("LyXComm: truncated command: " << read_buffer_); read_buffer_.erase(); } break; // reset connection } } - // The connection gets reset in errno != EAGAIN - // Why does it need to be reset if errno == 0? + // The connection gets reset when read() returns 0 (meaning that the + // last client closed the pipe) or an error occurred, in which case + // read() returns -1 and errno != EAGAIN. closeConnection(); openConnection(); errno = 0; @@ -313,18 +333,16 @@ void LyXComm::read_ready() void LyXComm::send(string const & msg) { if (msg.empty()) { - lyxerr << "LyXComm: Request to send empty string. Ignoring." - << endl; + LYXERR0("LyXComm: Request to send empty string. Ignoring."); return; } - LYXERR(Debug::LYXSERVER) << "LyXComm: Sending '" << msg << '\'' << endl; + LYXERR(Debug::LYXSERVER, "LyXComm: Sending '" << msg << '\''); if (pipename_.empty()) return; if (!ready_) { - lyxerr << "LyXComm: Pipes are closed. Could not send " - << msg << endl; + LYXERR0("LyXComm: Pipes are closed. Could not send " << msg); } else if (::write(outfd_, msg.c_str(), msg.length()) < 0) { lyxerr << "LyXComm: Error sending message: " << msg << '\n' << strerror(errno) @@ -360,7 +378,7 @@ void ServerCallback(Server * server, string const & msg) server->callback(msg); } -Server::Server(LyXFunc * f, std::string const & pipes) +Server::Server(LyXFunc * f, string const & pipes) : numclients_(0), func_(f), pipes_(pipes, this, &ServerCallback) {} @@ -378,11 +396,17 @@ Server::~Server() } +int compare(char const * a, char const * b, unsigned int len) +{ + using namespace std; + return strncmp(a, b, len); +} + + // Handle data gotten from communication, called by LyXComm void Server::callback(string const & msg) { - LYXERR(Debug::LYXSERVER) << "Server: Received: '" - << msg << '\'' << endl; + LYXERR(Debug::LYXSERVER, "Server: Received: '" << msg << '\''); char const * p = msg.c_str(); @@ -425,10 +449,8 @@ void Server::callback(string const & msg) if (*p) ++p; } - LYXERR(Debug::LYXSERVER) - << "Server: Client: '" << client - << "' Command: '" << cmd - << "' Argument: '" << arg << '\'' << endl; + LYXERR(Debug::LYXSERVER, "Server: Client: '" << client + << "' Command: '" << cmd << "' Argument: '" << arg << '\''); // --- lookup and exec the command ------------------ @@ -439,9 +461,7 @@ void Server::callback(string const & msg) if (cmd == "hello") { // One more client if (numclients_ == MAX_CLIENTS) { //paranoid check - LYXERR(Debug::LYXSERVER) - << "Server: too many clients..." - << endl; + LYXERR(Debug::LYXSERVER, "Server: too many clients..."); return; } int i = 0; @@ -450,9 +470,7 @@ void Server::callback(string const & msg) clients_[i] = client; ++numclients_; buf = "LYXSRV:" + client + ":hello\n"; - LYXERR(Debug::LYXSERVER) - << "Server: Greeting " - << client << endl; + LYXERR(Debug::LYXSERVER, "Server: Greeting " << client); pipes_.send(buf); } else if (cmd == "bye") { // If clients_ == 0 maybe we should reset the pipes @@ -465,18 +483,14 @@ void Server::callback(string const & msg) if (i < numclients_) { --numclients_; clients_[i].erase(); - LYXERR(Debug::LYXSERVER) - << "Server: Client " - << client << " said goodbye" - << endl; + LYXERR(Debug::LYXSERVER, "Server: Client " + << client << " said goodbye"); } else { - LYXERR(Debug::LYXSERVER) - << "Server: ignoring bye messge from unregistered client" - << client << endl; + LYXERR(Debug::LYXSERVER, + "Server: ignoring bye messge from unregistered client" << client); } } else { - lyxerr <<"Server: Undefined server command " - << cmd << '.' << endl; + LYXERR0("Server: Undefined server command " << cmd << '.'); } return; } @@ -515,7 +529,7 @@ void Server::callback(string const & msg) } -// Send a notify messge to a client, called by WorkAreaKeyPress +// Send a notify message to a client, called by WorkAreaKeyPress void Server::notifyClient(string const & s) { pipes_.send("NOTIFY:" + s + "\n");