#include "support/lstrings.h"
#include "support/os.h"
-#include "support/bind.h"
+#include <iostream>
#ifdef _WIN32
-#include <QCoreApplication>
+# include <io.h>
+# include <QCoreApplication>
+#else
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
#endif
#include <QThread>
return message;
}
-} // namespace anon
+} // namespace
DWORD WINAPI pipeServerWrapper(void * arg)
LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb)
- : pipename_(pip), client_(cli), clientcb_(ccb), stopserver_(0)
+ : stopserver_(0),
+ ready_(false), pipename_(pip), client_(cli), clientcb_(ccb),
+ deferred_loading_(false)
{
for (int i = 0; i < MAX_PIPES; ++i) {
event_[i] = 0;
pipe_[i].handle = INVALID_HANDLE_VALUE;
}
- ready_ = false;
- deferred_loading_ = false;
openConnection();
}
pipe_[i].overlap.hEvent = event_[i];
pipe_[i].iobuf.erase();
- pipe_[i].handle = CreateNamedPipe(pipename.c_str(),
+ pipe_[i].handle = CreateNamedPipeA(pipename.c_str(),
open_mode | FILE_FLAG_OVERLAPPED, PIPE_WAIT,
MAX_CLIENTS, PIPE_BUFSIZE, PIPE_BUFSIZE,
PIPE_TIMEOUT, NULL);
LYXERR(Debug::LYXSERVER, "LyXComm: Connection established");
ready_ = true;
outbuf_.erase();
- DWORD status;
- bool success;
+ DWORD status = 0;
+ bool success = false;
while (!checkStopServer()) {
// Indefinitely wait for the completion of an overlapped
// Determine which pipe instance completed the operation.
i = wait - WAIT_OBJECT_0;
- LASSERT(i >= 0 && i <= MAX_PIPES, /**/);
+ LASSERT(i <= MAX_PIPES, /**/);
// Check whether we were waked up for stopping the pipe server.
if (i == MAX_PIPES)
error = GetLastError();
- if (success && error == ERROR_IO_PENDING) {
+ if (success && (error == ERROR_IO_PENDING || error == NO_ERROR)) {
// The write operation is still pending.
// We get here when a reader is started
// well before a reply is ready, so delay
if (!resetPipe(i, !success))
return false;
break;
+ case CONNECTING_STATE:
+ LYXERR0("Wrong pipe state");
+ break;
}
}
CloseHandle(pipe_[index].handle);
pipe_[index].iobuf.erase();
- pipe_[index].handle = CreateNamedPipe(name.c_str(),
+ pipe_[index].handle = CreateNamedPipeA(name.c_str(),
open_mode | FILE_FLAG_OVERLAPPED, PIPE_WAIT,
MAX_CLIENTS, PIPE_BUFSIZE, PIPE_BUFSIZE,
PIPE_TIMEOUT, NULL);
}
// Check whether the pipe name is being used by some other instance.
- if (!stopserver_ && WaitNamedPipe(inPipeName().c_str(), 0)) {
+ if (!stopserver_ && WaitNamedPipeA(inPipeName().c_str(), 0)) {
// Tell the running instance to load the files
if (run_mode == USE_REMOTE && loadFilesInOtherInstance()) {
deferred_loading_ = true;
LyXComm::LyXComm(string const &, Server *, ClientCallbackfct)
{}
+
void LyXComm::openConnection()
{}
void LyXComm::emergencyCleanup()
{}
+
void LyXComm::read_ready()
{}
#else // defined (HAVE_MKFIFO)
-
LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb)
- : pipename_(pip), client_(cli), clientcb_(ccb)
+ : infd_(-1), outfd_(-1),
+ ready_(false), pipename_(pip), client_(cli), clientcb_(ccb),
+ deferred_loading_(false)
{
- ready_ = false;
- deferred_loading_ = false;
openConnection();
}
}
if (!write) {
- theApp()->registerSocketCallback(fd,
- bind(&LyXComm::read_ready, this));
+ // Make sure not to call read_ready after destruction.
+ weak_ptr<void> tracker = tracker_.p();
+ theApp()->registerSocketCallback(fd, [this, tracker](){
+ if (!tracker.expired())
+ read_ready();
+ });
}
return fd;
<< '\n' << strerror(errno) << endl;
}
- if (FileName(filename).removeFile() < 0) {
+ if (!FileName(filename).removeFile()) {
lyxerr << "LyXComm: Could not remove pipe " << filename
<< '\n' << strerror(errno) << endl;
}
int status;
// the single = is intended here.
while ((status = ::read(infd_, charbuf, charbuf_size - 1))) {
-
if (status > 0) {
charbuf[status] = '\0'; // turn it into a c string
read_buffer_ += rtrim(charbuf, "\r");
LYXERR(Debug::LYXSERVER, "LyXComm: Sending '" << msg << '\'');
- if (pipename_.empty()) return;
+ if (pipename_.empty())
+ return;
if (!ready_) {
LYXERR0("LyXComm: Pipes are closed. Could not send " << msg);
}
};
-} // namespace anon
+} // namespace
-bool LyXComm::loadFilesInOtherInstance()
+bool LyXComm::loadFilesInOtherInstance() const
{
int pipefd;
- int loaded_files = 0;
FileName const pipe(inPipeName());
+
+ if (theFilesToLoad().empty()) {
+ LYXERR0("LyX is already running in another instance\n"
+ "and 'use single instance' is active.");
+ // Wait a while for the other instance to reset the connection
+ Sleep::millisec(200);
+ pipefd = ::open(pipe.toFilesystemEncoding().c_str(), O_WRONLY);
+ if (pipefd >= 0) {
+ string const cmd = "LYXCMD:pipe:window-raise\n";
+ if (::write(pipefd, cmd.c_str(), cmd.length()) < 0)
+ LYXERR0("Cannot communicate with running instance!");
+ ::close(pipefd);
+ }
+ return true;
+ }
+
+ int loaded_files = 0;
vector<string>::iterator it = theFilesToLoad().begin();
while (it != theFilesToLoad().end()) {
FileName fname = fileSearch(string(), os::internal_path(*it),
break;
string const cmd = "LYXCMD:pipe:file-open:" +
fname.absFileName() + '\n';
- ::write(pipefd, cmd.c_str(), cmd.length());
+ if (::write(pipefd, cmd.c_str(), cmd.length()) < 0)
+ LYXERR0("Cannot write to pipe!");
::close(pipefd);
++loaded_files;
it = theFilesToLoad().erase(it);
int compare(char const * a, char const * b, unsigned int len)
{
- using namespace std;
return strncmp(a, b, len);
}
<< client << " said goodbye");
} else {
LYXERR(Debug::LYXSERVER,
- "Server: ignoring bye messge from unregistered client" << client);
+ "Server: ignoring bye message from unregistered client" << client);
}
} else {
LYXERR0("Server: Undefined server command " << cmd << '.');
// connect to the lyxfunc in the single GuiView we
// support currently. (Lgb)
- FuncRequest const fr(lyxaction.lookupFunc(cmd), arg);
+ FuncRequest fr(lyxaction.lookupFunc(cmd), from_utf8(arg));
+ fr.setOrigin(FuncRequest::LYXSERVER);
DispatchResult dr;
theApp()->dispatch(fr, dr);
string const rval = to_utf8(dr.message());
projects / lyx.git / blobdiff