From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../forte-0.3.5/forte-0.3.5_socket_reuse.patch | 20 +++++++++ .../forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch | 22 ++++++++++ recipes/forte/forte-0.3.5/forte-0.3.5_timer.patch | 48 ++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 recipes/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch create mode 100644 recipes/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch create mode 100644 recipes/forte/forte-0.3.5/forte-0.3.5_timer.patch (limited to 'recipes/forte/forte-0.3.5') diff --git a/recipes/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch b/recipes/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch new file mode 100644 index 0000000000..a3dcd10917 --- /dev/null +++ b/recipes/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch @@ -0,0 +1,20 @@ +diff -Naur FORTE-0.3.5.orig/src/arch/pc/pcsochan.cpp FORTE-0.3.5/src/arch/pc/pcsochan.cpp +--- FORTE-0.3.5.orig/src/arch/pc/pcsochan.cpp 2009-01-13 16:17:18.000000000 +0000 ++++ FORTE-0.3.5/src/arch/pc/pcsochan.cpp 2009-02-16 10:08:53.000000000 +0000 +@@ -128,6 +128,16 @@ + } + // switch between client/server: + if (pa_stConnectionInformation.m_enServiceType == e_Server) { ++ unsigned int opt = 1; ++ ++ if (setsockopt(sock_id, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) != 0) ++ { ++ char acError[80] = { "TCP-Socket setsockopt() failed: " }; ++ strcat(acError, strerror(errno)); ++ DEVLOG_ERROR(cg_nID_CSocketHandler, 0x10, acError); ++ return -1; ++ } ++ + sock_addr.sin_addr.s_addr = htonl(INADDR_ANY); + if (bind(sock_id, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr)) != 0) { + DEVLOG_ERROR_2(cg_nID_CSocketHandler, 0x02, "TCP-Socket bind() failed: %s", strerror(errno) ); diff --git a/recipes/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch b/recipes/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch new file mode 100644 index 0000000000..3ebd47325a --- /dev/null +++ b/recipes/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch @@ -0,0 +1,22 @@ +diff -Naur FORTE-0.3.5.orig/src/core/datatypes/forte_lreal.cpp FORTE-0.3.5/src/core/datatypes/forte_lreal.cpp +--- FORTE-0.3.5.orig/src/core/datatypes/forte_lreal.cpp 2008-12-11 16:05:26.000000000 +0000 ++++ FORTE-0.3.5/src/core/datatypes/forte_lreal.cpp 2009-02-16 11:01:44.000000000 +0000 +@@ -8,6 +8,7 @@ + * Contributors: + * : , - changes + *******************************************************************************/ ++#include + #include + #include "forte_lreal.h" + +diff -Naur FORTE-0.3.5.orig/src/core/datatypes/forte_real.cpp FORTE-0.3.5/src/core/datatypes/forte_real.cpp +--- FORTE-0.3.5.orig/src/core/datatypes/forte_real.cpp 2008-12-11 16:05:40.000000000 +0000 ++++ FORTE-0.3.5/src/core/datatypes/forte_real.cpp 2009-02-16 11:12:16.000000000 +0000 +@@ -8,6 +8,7 @@ + * Contributors: + * : , - changes + *******************************************************************************/ ++#include + #include + #include "forte_real.h" + diff --git a/recipes/forte/forte-0.3.5/forte-0.3.5_timer.patch b/recipes/forte/forte-0.3.5/forte-0.3.5_timer.patch new file mode 100644 index 0000000000..2064cda581 --- /dev/null +++ b/recipes/forte/forte-0.3.5/forte-0.3.5_timer.patch @@ -0,0 +1,48 @@ +diff -Naur FORTE-0.3.5.orig/src/arch/pc/pctimeha.cpp FORTE-0.3.5/src/arch/pc/pctimeha.cpp +--- FORTE-0.3.5.orig/src/arch/pc/pctimeha.cpp 2009-01-13 16:17:18.000000000 +0000 ++++ FORTE-0.3.5/src/arch/pc/pctimeha.cpp 2009-02-16 10:16:37.000000000 +0000 +@@ -11,6 +11,7 @@ + #include "pctimeha.h" + #include "../../core/devexec.h" + #include ++#include + + const TINT32 CPCTimerHandler::csm_nTicksPerSecond = 1000; + +@@ -28,14 +29,34 @@ + disableHandler(); + } + ++static inline unsigned long long GetTicks(struct timeval* stTmVal, TINT32 ticksPerSecond) ++{ ++ unsigned long long ret = stTmVal->tv_sec * 1000LL;// sec -> ms ++ ret += stTmVal->tv_usec/1000;// + us -> ms ++ ret /= 1000/ticksPerSecond; // ms -> ticks ++ return ret; ++} ++ + bool CPCTimerHandler::run(){ + struct timespec stReq; ++ struct timeval stTmNow; ++ unsigned long long tickStart; ++ unsigned long long tickNow; ++ unsigned long long tickCalled = 0; + stReq.tv_sec = 0; +- stReq.tv_nsec = 1000000 / (csm_nTicksPerSecond / 1000); ++ stReq.tv_nsec = 1000000000 / (csm_nTicksPerSecond); ++ ++ gettimeofday(&stTmNow, NULL); ++ tickNow = tickStart = GetTicks(&stTmNow, csm_nTicksPerSecond); + + while(m_bAlive){ +- nanosleep(&stReq, NULL); ++ if( (tickNow-tickStart) <= (tickCalled+1) ) { ++ nanosleep(&stReq, NULL); ++ } + nextTick(); ++ ++tickCalled; ++ gettimeofday(&stTmNow, NULL); ++ tickNow = GetTicks(&stTmNow, csm_nTicksPerSecond); + } + return true; + } -- cgit 1.2.3-korg