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/icedtea-hotspot-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/icedtea-hotspot-loadavg.patch')
| -rw-r--r-- | recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch b/recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch new file mode 100644 index 0000000000..7da41fdc08 --- /dev/null +++ b/recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch @@ -0,0 +1,28 @@ +Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp +=================================================================== +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200 +@@ -4325,7 +4325,22 @@ + // Linux doesn't yet have a (official) notion of processor sets, + // so just return the system wide load average. + int os::loadavg(double loadavg[], int nelem) { +- return ::getloadavg(loadavg, nelem); ++ ++ 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; + } + + void os::pause() { |