|
Description |
The included patches fix two issues with hosting webtiles on a Mac running OS X.
The first patch 0001-Fix-a-crash-when-running-a-webtiles-server-in-OS-X.patch prevents a crash that would occur whenever the crawl process sends a large datagram to the webserving process as happens whenever a complicated menu such as the list of commands is drawn. The maximum datagram size was reduced because by default there is only 4K space to send datagrams. sysctl net.local.dgram.recvspace returns net.local.dgram.recvspace: 4096 on my system running OS X 10.8.3.
The second patch 0001-Fixed-use-of-arrows-and-other-special-keys-in-OS-X-v.patch allows the use of arrow keys when running webtiles. Keys with negative character codes were not getting through to the crawl process due to inconsistencies with how different systems treat wint_t types.
The two patches were created separately, but if 0001-Fix-a-crash-when-running-a-webtiles-server-in-OS-X.patch is applied first on a fresh copy of trunk, they should both take. I made the mistake of pulling after making the first commit, and it seemed silly to submit a patch for the pull. |
|
Attached Files |
 0001-Fix-a-crash-when-running-a-webtiles-server-in-OS-X.patch [^] (1,986 bytes) 2013-04-15 04:10 [Show Content] [Hide Content]From 53b88b4cb4a65a1f795454a716a07f1626a89a75 Mon Sep 17 00:00:00 2001
From: Kyle Fox <kylefox2@illinois.edu>
Date: Thu, 11 Apr 2013 16:25:04 -0500
Subject: [PATCH] Fix a crash when running a webtiles server in OS X.
Fixes #6083. The crash would occur when sending datagrams from crawl to
the python webserver. In OS X, there is very little space in memory to
send datagrams and drawing menus such as the list of commands would
exceed this memory. The crawl process would then die after receiving too
many ENOBUFS errors from sendto.
ENOBUFS will still occur unless we add artifical sleeps to the datagram
sending loop. Sleep responses to ENOBUFS have been changed to reduce the
lag this causes.
---
crawl-ref/source/tileweb.cc | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc
index 784eb1b..15c1940 100644
--- a/crawl-ref/source/tileweb.cc
+++ b/crawl-ref/source/tileweb.cc
@@ -140,7 +140,8 @@ bool TilesFramework::initialise()
int bufsize = 64 * 1024;
if (setsockopt(m_sock, SOL_SOCKET, SO_SNDBUF, &bufsize, sizeof(bufsize)))
die("Can't set buffer size!");
- m_max_msg_size = bufsize;
+ // Need small maximum message size to avoid crashes in OS X
+ m_max_msg_size = 2048;
if (m_await_connection)
_await_connection();
@@ -208,8 +209,11 @@ void TilesFramework::finish_message()
}
else if (errno == ENOBUFS)
{
- // Wait for half a second, then try again
- usleep(500 * 1000);
+ int sleep_time = 10 * 1000;
+ if (retries <= 5)
+ sleep_time = 500 * 1000;
+ // Wait for up to half a second, then try again
+ usleep(sleep_time);
}
else
die("Socket write error: %s", strerror(errno));
--
1.7.12.4 (Apple Git-37)
0001-Fixed-use-of-arrows-and-other-special-keys-in-OS-X-v.patch [^] (1,268 bytes) 2013-04-15 04:11 [Show Content] [Hide Content]From 309734c9def83de74795e4e7acd76a757dca039b Mon Sep 17 00:00:00 2001
From: Kyle Fox <kylejfox@gmail.com>
Date: Sat, 13 Apr 2013 23:32:02 -0500
Subject: [PATCH] Fixed use of arrows and other special keys in OS X versions
of webtiles.
The code was written assuming wint_t's are unsigned and therefore
positive if not 0. This is not necessarily true for all environments.
---
crawl-ref/source/libunix.cc | 2 +-
crawl-ref/source/tileweb.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc
index 27a93fa..301ab87 100644
--- a/crawl-ref/source/libunix.cc
+++ b/crawl-ref/source/libunix.cc
@@ -238,7 +238,7 @@ int getchk()
tiles.redraw();
tiles.await_input(c, true);
- if (c > 0)
+ if (c != 0)
return c;
#endif
diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc
index 15c1940..6dd50a9 100644
--- a/crawl-ref/source/tileweb.cc
+++ b/crawl-ref/source/tileweb.cc
@@ -376,7 +376,7 @@ bool TilesFramework::await_input(wint_t& c, bool block)
{
c = _receive_control_message();
- if (c > 0)
+ if (c != 0)
return true;
}
--
1.7.12.4 (Apple Git-37)
|
