mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log PipeIpcThread communication

Browse Source 
Change-Id: I9e818351a435d39a9d1d8988214185f5bc504e8c
This commit is contained in:
Stephan Bergmann
2016-07-15 18:09:29 +02:00
parent 0710fcd58d
commit 24d0a0549d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/source/app/officeipcthread.cxx
View File

@@ -75,6 +75,7 @@ OString readStringFromPipe(osl::StreamPipe & pipe) {
char buf[1024];
sal_Int32 n = pipe.recv(buf, SAL_N_ELEMENTS(buf));
if (n <= 0) {
SAL_INFO("desktop.app", "read empty string");
return "";
}
bool end = false;
@@ -85,7 +86,9 @@ OString readStringFromPipe(osl::StreamPipe & pipe) {
str.append(buf, n);
//TODO: how does OStringBuffer.append handle overflow?
if (end) {
return str.makeStringAndClear();
auto s = str.makeStringAndClear();
SAL_INFO("desktop.app", "read <" << s << ">");
return s;
}
}
}
@@ -893,6 +896,7 @@ RequestHandler::Status PipeIpcThread::enable(rtl::Reference<IpcThread> * thread)
}
aArguments.append('\0');
// finally, write the string onto the pipe
SAL_INFO("desktop.app", "writing <" << aArguments.getStr() << ">");
sal_Int32 n = aStreamPipe.write(
aArguments.getStr(), aArguments.getLength());
if (n != aArguments.getLength()) {
@@ -1204,6 +1208,7 @@ void PipeIpcThread::execute()
}
// notify client we're ready to process its args:
SAL_INFO("desktop.app", "writing <" << SEND_ARGUMENTS << ">");
sal_Int32 n = aStreamPipe.write(
SEND_ARGUMENTS, SAL_N_ELEMENTS(SEND_ARGUMENTS));
// incl. terminating NUL
@@ -1229,6 +1234,7 @@ void PipeIpcThread::execute()
if (waitProcessed)
handler_->cProcessed.wait();
// processing finished, inform the requesting end:
SAL_INFO("desktop.app", "writing <" << PROCESSING_DONE << ">");
n = aStreamPipe.write(
PROCESSING_DONE, SAL_N_ELEMENTS(PROCESSING_DONE));
// incl. terminating NUL