Author: titmuss
Date: Thu Jan 8 08:13:48 2009
New Revision: 3733
URL: http://svn.slimdevices.com?rev=3733&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3728): richard | 2009-01-08 16:02:31 +0000
Bug: 10296
Description:
Increase the stack size, this may fix random rebooting.
r3...@harrypotter (orig r3729): richard | 2009-01-08 16:04:03 +0000
Bug: 10296
Description:
Revert change to the watchdog timer.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/SDL-1.2.13/src/thread/pthread/SDL_systhread.c
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 8 08:13:48 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3698
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3729
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeplay/src/SDL-1.2.13/src/thread/pthread/SDL_systhread.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/SDL-1.2.13/src/thread/pthread/SDL_systhread.c?rev=3733&root=Jive&r1=3732&r2=3733&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/SDL-1.2.13/src/thread/pthread/SDL_systhread.c
(original)
+++ 7.4/trunk/squeezeplay/src/SDL-1.2.13/src/thread/pthread/SDL_systhread.c Thu
Jan 8 08:13:48 2009
@@ -61,8 +61,8 @@
}
pthread_attr_setdetachstate(&type, PTHREAD_CREATE_JOINABLE);
- /* set stack size to 64k */
- stacksize = 64 * 1024;
+ /* set stack size to 128k */
+ stacksize = 128 * 1024;
pthread_attr_setstacksize(&type, stacksize);
/* Create the thread and go! */
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=3733&root=Jive&r1=3732&r2=3733&view=diff
==============================================================================
(empty)
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=3733&root=Jive&r1=3732&r2=3733&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Thu Jan 8 08:13:48 2009
@@ -118,10 +118,10 @@
local timer = Timer(2000, -- 2 seconds
function()
-- 10 second when running
- if not self.watchdogRunning then
- self.watchdog:setTimeout(10)
- self.watchdogRunning = true
- end
+ --if not self.watchdogRunning then
+ -- self.watchdog:setTimeout(10)
+ -- self.watchdogRunning = true
+ --end
self.watchdog:keepAlive()
end)
timer:start()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
