diff options
| author |   Henning Heinold <heinold@inf.fu-berlin.de> | 2012-02-18 00:06:46 +0100 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-02-21 12:33:11 +0100 |
| commit | c79fd9b1616499dcb44e1408399cdfe54f3ccfe2 (patch) | |
| tree | a5922f52eeee1a75901d757332e6b988d825cab7 /recipes/openjdk/openjdk-6-6b24/cacao-loadavg.patch | |
| parent | 2fd114ae2977202ca2762f6ebb9be9c5d88072e2 (diff) | |
| download | openembedded-c79fd9b1616499dcb44e1408399cdfe54f3ccfe2.tar.gz | |
openjdk: backport 1.11.1 release from meta-java
* shark is disabled since 1.11
* rework patches
* rework inc files for jamvm
* bump PR
Diffstat (limited to 'recipes/openjdk/openjdk-6-6b24/cacao-loadavg.patch')
| -rw-r--r-- | recipes/openjdk/openjdk-6-6b24/cacao-loadavg.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes/openjdk/openjdk-6-6b24/cacao-loadavg.patch b/recipes/openjdk/openjdk-6-6b24/cacao-loadavg.patch new file mode 100644 index 0000000000..0fc1a81520 --- /dev/null +++ b/recipes/openjdk/openjdk-6-6b24/cacao-loadavg.patch @@ -0,0 +1,27 @@ +Index: cacao-cff92704c4e0/src/vm/os.hpp +=================================================================== +--- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.000000000 +0100 ++++ cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100 +@@ -425,7 +425,21 @@ + #if defined(HAVE_GETLOADAVG) + return ::getloadavg(loadavg, nelem); + #else +-# error getloadavg not available ++ FILE *LOADAVG; ++ double avg[3] = { 0.0, 0.0, 0.0 }; ++ int i, res = -1;; ++ ++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) { ++ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); ++ res = 0; ++ fclose(LOADAVG); ++ } ++ ++ for (i = 0; (i < nelem) && (i < 3); i++) { ++ loadavg[i] = avg[i]; ++ } ++ ++ return res; + #endif + } + |