Attachment 192364 Details for Bug 227392 – New port java/ohc shar archive

New port java/ohc shar archive

ohc.shar (text/plain), 12.82 KB, created by Angelo Polo on 2018-04-09 16:21:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Angelo Polo

Created: 2018-04-09 16:21:13 UTC

Size: 12.82 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	ohc
>#	ohc/files
>#	ohc/files/patch-ohc-core_src_test_java_org_caffinitas_ohc_tables_UnsTest.java
>#	ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_linked_UnsExt7.java
>#	ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_tables_Uns.java
>#	ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_linked_Uns.java
>#	ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_tables_UnsExt7.java
>#	ohc/files/patch-ohc-core_src_test_java_org_caffinitas_ohc_linked_UnsTest.java
>#	ohc/pkg-plist
>#	ohc/Makefile
>#	ohc/distinfo
>#	ohc/pkg-descr
>#
>echo c - ohc
>mkdir -p ohc > /dev/null 2>&1
>echo c - ohc/files
>mkdir -p ohc/files > /dev/null 2>&1
>echo x - ohc/files/patch-ohc-core_src_test_java_org_caffinitas_ohc_tables_UnsTest.java
>sed 's/^X//' >ohc/files/patch-ohc-core_src_test_java_org_caffinitas_ohc_tables_UnsTest.java << '85cd1b6f99f0e16c8df50506e24d0d5b'
>X--- ohc-core/src/test/java/org/caffinitas/ohc/tables/UnsTest.java.orig	2018-04-08 18:49:03 UTC
>X+++ ohc-core/src/test/java/org/caffinitas/ohc/tables/UnsTest.java
>X@@ -390,17 +390,18 @@ public class UnsTest
>X         {
>X             for (int i = 0; i < 120; i++)
>X             {
>X-                long v = Uns.getLong(adr, i);
>X+                String loop = "at loop #" + i;
>X+                long v = Uns.getInt(adr, i);
>X                 Uns.increment(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 1);
>X+                assertEquals(Uns.getInt(adr, i), v + 1, loop);
>X                 Uns.increment(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 2);
>X+                assertEquals(Uns.getInt(adr, i), v + 2, loop);
>X                 Uns.increment(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 3);
>X+                assertEquals(Uns.getInt(adr, i), v + 3, loop);
>X                 Uns.decrement(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 2);
>X+                assertEquals(Uns.getInt(adr, i), v + 2, loop);
>X                 Uns.decrement(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 1);
>X+                assertEquals(Uns.getInt(adr, i), v + 1, loop);
>X             }
>X 
>X             Uns.putLong(adr, 8, 1);
>85cd1b6f99f0e16c8df50506e24d0d5b
>echo x - ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_linked_UnsExt7.java
>sed 's/^X//' >ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_linked_UnsExt7.java << '4ef40909ebc5dd2e429afe2cbe111882'
>X--- ohc-core/src/main/java/org/caffinitas/ohc/linked/UnsExt7.java.orig	2016-04-12 19:48:04 UTC
>X+++ ohc-core/src/main/java/org/caffinitas/ohc/linked/UnsExt7.java
>X@@ -28,8 +28,8 @@ final class UnsExt7 extends UnsExt
>X 
>X     long getAndPutLong(long address, long offset, long value)
>X     {
>X-        long r = unsafe.getLong(null, address + offset);
>X-        unsafe.putLong(null, address + offset, value);
>X+        long r = unsafe.getLong(address + offset);
>X+        unsafe.putLong(address + offset, value);
>X         return r;
>X     }
>X 
>4ef40909ebc5dd2e429afe2cbe111882
>echo x - ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_tables_Uns.java
>sed 's/^X//' >ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_tables_Uns.java << 'bc8afa049ebb98c8f5174ecd730e0742'
>X--- ohc-core/src/main/java/org/caffinitas/ohc/tables/Uns.java.orig	2016-04-12 19:48:04 UTC
>X+++ ohc-core/src/main/java/org/caffinitas/ohc/tables/Uns.java
>X@@ -224,49 +224,49 @@ final class Uns
>X     static void putLong(long address, long offset, long value)
>X     {
>X         validate(address, offset, 8L);
>X-        unsafe.putLong(null, address + offset, value);
>X+        unsafe.putLong(address + offset, value);
>X     }
>X 
>X     static long getLong(long address, long offset)
>X     {
>X         validate(address, offset, 8L);
>X-        return unsafe.getLong(null, address + offset);
>X+        return unsafe.getLong(address + offset);
>X     }
>X 
>X     static void putInt(long address, long offset, int value)
>X     {
>X         validate(address, offset, 4L);
>X-        unsafe.putInt(null, address + offset, value);
>X+        unsafe.putInt(address + offset, value);
>X     }
>X 
>X     static int getInt(long address, long offset)
>X     {
>X         validate(address, offset, 4L);
>X-        return unsafe.getInt(null, address + offset);
>X+        return unsafe.getInt(address + offset);
>X     }
>X 
>X     static void putShort(long address, long offset, short value)
>X     {
>X         validate(address, offset, 2L);
>X-        unsafe.putShort(null, address + offset, value);
>X+        unsafe.putShort(address + offset, value);
>X     }
>X 
>X     static short getShort(long address, long offset)
>X     {
>X         validate(address, offset, 2L);
>X-        return unsafe.getShort(null, address + offset);
>X+        return unsafe.getShort(address + offset);
>X     }
>X 
>X     static void putByte(long address, long offset, byte value)
>X     {
>X         validate(address, offset, 1L);
>X-        unsafe.putByte(null, address + offset, value);
>X+        unsafe.putByte(address + offset, value);
>X     }
>X 
>X     static byte getByte(long address, long offset)
>X     {
>X         validate(address, offset, 1L);
>X-        return unsafe.getByte(null, address + offset);
>X+        return unsafe.getByte(address + offset);
>X     }
>X 
>X     static boolean decrement(long address, long offset)
>bc8afa049ebb98c8f5174ecd730e0742
>echo x - ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_linked_Uns.java
>sed 's/^X//' >ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_linked_Uns.java << 'a8f972d076ac8ad91f23d34b096ce750'
>X--- ohc-core/src/main/java/org/caffinitas/ohc/linked/Uns.java.orig	2016-04-12 19:48:04 UTC
>X+++ ohc-core/src/main/java/org/caffinitas/ohc/linked/Uns.java
>X@@ -233,49 +233,49 @@ final class Uns
>X     static void putLong(long address, long offset, long value)
>X     {
>X         validate(address, offset, 8L);
>X-        unsafe.putLong(null, address + offset, value);
>X+        unsafe.putLong(address + offset, value);
>X     }
>X 
>X     static long getLong(long address, long offset)
>X     {
>X         validate(address, offset, 8L);
>X-        return unsafe.getLong(null, address + offset);
>X+        return unsafe.getLong(address + offset);
>X     }
>X 
>X     static void putInt(long address, long offset, int value)
>X     {
>X         validate(address, offset, 4L);
>X-        unsafe.putInt(null, address + offset, value);
>X+        unsafe.putInt(address + offset, value);
>X     }
>X 
>X     static int getInt(long address, long offset)
>X     {
>X         validate(address, offset, 4L);
>X-        return unsafe.getInt(null, address + offset);
>X+        return unsafe.getInt(address + offset);
>X     }
>X 
>X     static void putShort(long address, long offset, short value)
>X     {
>X         validate(address, offset, 2L);
>X-        unsafe.putShort(null, address + offset, value);
>X+        unsafe.putShort(address + offset, value);
>X     }
>X 
>X     static short getShort(long address, long offset)
>X     {
>X         validate(address, offset, 2L);
>X-        return unsafe.getShort(null, address + offset);
>X+        return unsafe.getShort(address + offset);
>X     }
>X 
>X     static void putByte(long address, long offset, byte value)
>X     {
>X         validate(address, offset, 1L);
>X-        unsafe.putByte(null, address + offset, value);
>X+        unsafe.putByte(address + offset, value);
>X     }
>X 
>X     static byte getByte(long address, long offset)
>X     {
>X         validate(address, offset, 1L);
>X-        return unsafe.getByte(null, address + offset);
>X+        return unsafe.getByte(address + offset);
>X     }
>X 
>X     static boolean decrement(long address, long offset)
>a8f972d076ac8ad91f23d34b096ce750
>echo x - ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_tables_UnsExt7.java
>sed 's/^X//' >ohc/files/patch-ohc-core_src_main_java_org_caffinitas_ohc_tables_UnsExt7.java << '79722282eba005998d516fde54cf677c'
>X--- ohc-core/src/main/java/org/caffinitas/ohc/tables/UnsExt7.java.orig	2016-04-12 19:48:04 UTC
>X+++ ohc-core/src/main/java/org/caffinitas/ohc/tables/UnsExt7.java
>X@@ -26,8 +26,8 @@ final class UnsExt7 extends UnsExt
>X 
>X     long getAndPutLong(long address, long offset, long value)
>X     {
>X-        long r = unsafe.getLong(null, address + offset);
>X-        unsafe.putLong(null, address + offset, value);
>X+        long r = unsafe.getLong(address + offset);
>X+        unsafe.putLong(address + offset, value);
>X         return r;
>X     }
>X 
>79722282eba005998d516fde54cf677c
>echo x - ohc/files/patch-ohc-core_src_test_java_org_caffinitas_ohc_linked_UnsTest.java
>sed 's/^X//' >ohc/files/patch-ohc-core_src_test_java_org_caffinitas_ohc_linked_UnsTest.java << '5b5ca3a120bd621d987de2a648926c05'
>X--- ohc-core/src/test/java/org/caffinitas/ohc/linked/UnsTest.java.orig	2018-04-08 18:48:49 UTC
>X+++ ohc-core/src/test/java/org/caffinitas/ohc/linked/UnsTest.java
>X@@ -390,17 +390,18 @@ public class UnsTest
>X         {
>X             for (int i = 0; i < 120; i++)
>X             {
>X-                long v = Uns.getLong(adr, i);
>X+                String loop = "at loop #" + i;
>X+                long v = Uns.getInt(adr, i);
>X                 Uns.increment(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 1);
>X+                assertEquals(Uns.getInt(adr, i), v + 1, loop);
>X                 Uns.increment(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 2);
>X+                assertEquals(Uns.getInt(adr, i), v + 2, loop);
>X                 Uns.increment(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 3);
>X+                assertEquals(Uns.getInt(adr, i), v + 3, loop);
>X                 Uns.decrement(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 2);
>X+                assertEquals(Uns.getInt(adr, i), v + 2, loop);
>X                 Uns.decrement(adr, i);
>X-                assertEquals(Uns.getLong(adr, i), v + 1);
>X+                assertEquals(Uns.getInt(adr, i), v + 1, loop);
>X             }
>X 
>X             Uns.putLong(adr, 8, 1);
>5b5ca3a120bd621d987de2a648926c05
>echo x - ohc/pkg-plist
>sed 's/^X//' >ohc/pkg-plist << '23bcf6c22af3584ccdc57447632ac959'
>X%%JAVAJARDIR%%/ohc-core.jar
>X%%JAVAJARDIR%%/ohc-core-j8.jar
>23bcf6c22af3584ccdc57447632ac959
>echo x - ohc/Makefile
>sed 's/^X//' >ohc/Makefile << 'fd8f240a63f68d6c266bbf1835639163'
>X# $FreeBSD$
>X
>XPORTNAME=	ohc
>XPORTVERSION=	0.4.4
>XCATEGORIES=	java devel
>XMASTER_SITES=	LOCAL:maven
>XDISTFILES+=	${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
>X
>XMAINTAINER=	language.devel@gmail.com
>XCOMMENT=	Off-heap-cache for Java
>X
>XLICENSE=	APACHE20
>X
>XP_B_DEPENDS=	snappyjava>0:archivers/snappy-java \
>X		${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33
>XPATCH_DEPENDS=	${P_B_DEPENDS}
>XBUILD_DEPENDS=	${P_B_DEPENDS}
>XRUN_DEPENDS=	snappyjava>0:archivers/snappy-java
>X
>XOPTIONS_DEFINE=	TESTS
>XTESTS_DESC=	Compile and run tests and benchmarking
>X
>XUSE_GITHUB=	yes
>XGH_ACCOUNT=	snazy
>X
>XJAVA_VERSION=	1.8
>XJAVA_VENDOR=	openjdk
>XUSE_JAVA=	yes
>XREINPLACE_ARGS=	-i ''
>X
>X.include <bsd.port.options.mk>
>X
>X.if ${PORT_OPTIONS:MTESTS}
>XNOTESTS_FLAG=	
>X.else
>XNOTESTS_FLAG=	-Dmaven.test.skip=true
>X.endif
>X
>Xpost-patch:
>X	SNAPPY_VERSION=$$( ${PKG_QUERY} '%v' snappyjava ) ; \
>X		cd ${WRKSRC} ; \
>X		${REINPLACE_CMD} "s|version.org.xerial.snappy>1.1.1.7<|version.org.xerial.snappy>$$SNAPPY_VERSION<|" pom.xml ; \
>X		${LOCALBASE}/share/java/maven33/bin/mvn install:install-file -Dfile=${JAVAJARDIR}/snappy-java.jar -DgroupId=org.xerial.snappy -DartifactId=snappy-java -Dversion=$$SNAPPY_VERSION -Dpackaging=jar -Dmaven.repo.local=${WRKDIR}/repository --offline
>X
>Xpost-patch-TESTS-off:
>X	${REINPLACE_CMD} "s|<module>ohc-benchmark</module>||" ${WRKSRC}/pom.xml
>X	${REINPLACE_CMD} "s|<module>ohc-jmh</module>||" ${WRKSRC}/pom.xml
>X
>Xdo-build:
>X	cd ${WRKSRC} ; ${LOCALBASE}/share/java/maven33/bin/mvn clean install -Dmaven.repo.local=${WRKDIR}/repository --offline ${NOTESTS_FLAG}
>X
>Xdo-install:
>X	${INSTALL_DATA} ${WRKSRC}/ohc-core/target/ohc-core-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/ohc-core.jar
>X	${INSTALL_DATA} ${WRKSRC}/ohc-core-j8/target/ohc-core-j8-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/ohc-core-j8.jar
>X
>X.include <bsd.port.mk>
>fd8f240a63f68d6c266bbf1835639163
>echo x - ohc/distinfo
>sed 's/^X//' >ohc/distinfo << 'e6a72dd81bc6ddfc978def57dfada992'
>XTIMESTAMP = 1523051538
>XSHA256 (ohc-0.4.4-maven-repository.tar.gz) = 5f821a92c14c02f07511941b5e57afd5a0f6ff3369cee0e6236a9d6d988a6402
>XSIZE (ohc-0.4.4-maven-repository.tar.gz) = 56596902
>XSHA256 (snazy-ohc-0.4.4_GH0.tar.gz) = 9da469b8e533b21666e3b8f09fde722baa0464bffa5984cb8f39720beaeeaa34
>XSIZE (snazy-ohc-0.4.4_GH0.tar.gz) = 128537
>e6a72dd81bc6ddfc978def57dfada992
>echo x - ohc/pkg-descr
>sed 's/^X//' >ohc/pkg-descr << '653878802fa3cd210b60e6a2952d854c'
>XAn off-heap cache library for Java.
>X
>XWWW: https://github.com/snazy/ohc
>653878802fa3cd210b60e6a2952d854c
>exit
>

Actions: View

Attachments on bug 227392: 192364 | 215236