net/Socket.hpp | 15 ---------------
1 file changed, 15 deletions(-)
New commits:
commit 188d00ce4a4b635fc43f653d12e92bd250d7c8a7
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Mar 12 20:58:03 2020 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Mar 12 20:01:59 2020 +0100
Bin code that has always been inside #if 0
Also, the comment in it was misleading. We don't have just a single
buffer for a FakeSocket any longer.
Change-Id: I8f45fba2342ef42040e467b631739a56664ce6e8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90440
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/net/Socket.hpp b/net/Socket.hpp
index b15aeb21b..5427b99fa 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -697,21 +697,6 @@ public:
#if !MOBILEAPP
rc = ::write(fd, "w", 1);
#else
-#if 0
- // Our fake sockets are record-oriented with a single record
buffer, so as we write one
- // byte at a time to the wakeup pipe, we can't write another one
before the previous one
- // has been read.
- //
- // FIXME: Still, explicitly waiting here with fakeSocketPoll() for
it to be writable
- // doesn't seem to be any improvement. On the contrary, with this
fakeSocketPoll(), we
- // hang every time we run the app. Without it, we only hang
occasionally.
-
- LOG_TRC("Wakeup pipe write");
- struct pollfd p;
- p.fd = fd;
- p.events = POLLOUT;
- fakeSocketPoll(&p, 1, -1);
-#endif
rc = fakeSocketWrite(fd, "w", 1);
#endif
} while (rc == -1 && errno == EINTR);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
