summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
diff options
context:
space:
mode:
authorSven Ebenfeld <sven.ebenfeld@gmail.com>2015-04-27 22:13:02 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-04-28 16:09:34 -0300
commitc84cbe25d21422121c5dcb622d8fb82ed9ac461b (patch)
treeba4c6d1ce418e411e186ab7e26befa67edaab76d /recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
parente65fdc9c690405f4a2b53474866f24f7c5e966f1 (diff)
downloadmeta-java-c84cbe25d21422121c5dcb622d8fb82ed9ac461b.tar.gz
openjdk-7: remove IcedTea 2.3.12, OpenJDK 7u25b30
We have now updated to IcedTea 2.5.4, so we can remove the old version. Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch')
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
deleted file mode 100644
index 7da41fd..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200
5@@ -4325,7 +4325,22 @@
6 // Linux doesn't yet have a (official) notion of processor sets,
7 // so just return the system wide load average.
8 int os::loadavg(double loadavg[], int nelem) {
9- return ::getloadavg(loadavg, nelem);
10+
11+ FILE *LOADAVG;
12+ double avg[3] = { 0.0, 0.0, 0.0 };
13+ int i, res = -1;;
14+
15+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
16+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
17+ res = 0;
18+ fclose(LOADAVG);
19+ }
20+
21+ for (i = 0; (i < nelem) && (i < 3); i++) {
22+ loadavg[i] = avg[i];
23+ }
24+
25+ return res;
26 }
27
28 void os::pause() {