2014-08-19 8055153: nsk/stress/jck60/jck60014 crashes on sparc
roland [Tue, 19 Aug 2014 17:23:38 +0200] rev 26180
8055153: nsk/stress/jck60/jck60014 crashes on sparc Summary: missing control for LoadRange and LoadKlass nodes created during arraycopy node expansion Reviewed-by: kvn, iveresov
2014-08-19 8055503: Rollback 8054164 changeset
kvn [Tue, 19 Aug 2014 16:20:18 -0700] rev 26179
8055503: Rollback 8054164 changeset Reviewed-by: iveresov
2014-08-19 Merge
kvn [Tue, 19 Aug 2014 17:48:16 +0000] rev 26178
Merge
2014-08-14 8054164: solaris makefile
kvn [Wed, 13 Aug 2014 17:50:21 -0700] rev 26177
8054164: solaris makefile Reviewed-by: roland
2014-08-19 8048879: "unexpected yanked node" opto/postaloc.cpp:139
thartmann [Tue, 19 Aug 2014 07:36:11 +0200] rev 26176
8048879: "unexpected yanked node" opto/postaloc.cpp:139 Summary: MemBarAcquireNode prevents deletion of dead LoadNNode. Added condition to 'has_special_unique_user' to trigger deletion. Reviewed-by: kvn, iveresov
2014-08-15 Merge
kvn [Fri, 15 Aug 2014 12:27:50 -0700] rev 26175
Merge
2014-08-14 8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann [Thu, 14 Aug 2014 09:15:39 +0200] rev 26174
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes Summary: Because anonymous classes are not in the system dictionary, we have to set 'unloading_occurred' based on 'CLDG::do_unloading()'. Added jtreg test. Reviewed-by: kvn, coleenp
2014-08-14 8054883: Segmentation error while running program
iveresov [Wed, 13 Aug 2014 17:37:11 -0700] rev 26173
8054883: Segmentation error while running program Summary: Fix pattern matching of range check Reviewed-by: kvn
2014-08-13 8047952: Remove _FORTIFY_SOURCE from fastdebug and slowdebug builds
mduigou [Wed, 13 Aug 2014 23:33:33 +0000] rev 26172
8047952: Remove _FORTIFY_SOURCE from fastdebug and slowdebug builds Reviewed-by: dholmes
2014-08-13 8054927: Missing MemNode::acquire ordering in some volatile Load nodes
kvn [Wed, 13 Aug 2014 13:05:04 -0700] rev 26171
8054927: Missing MemNode::acquire ordering in some volatile Load nodes Summary: Fixed memory ordering parameter and added missing barriers for volatile loads. Reviewed-by: roland, iveresov
2014-08-13 Merge
roland [Wed, 13 Aug 2014 09:53:18 +0000] rev 26170
Merge
2014-08-11 8054224: Recursive method that was compiled by C1 is unable to catch StackOverflowError
roland [Mon, 11 Aug 2014 15:09:04 +0200] rev 26169
8054224: Recursive method that was compiled by C1 is unable to catch StackOverflowError Summary: do not update exception cache if exception is replaced when thrown Reviewed-by: kvn, iveresov
2014-08-13 8043913: remove legacy code in SPARC's VM_Version::platform_features
anoll [Wed, 13 Aug 2014 10:44:50 +0200] rev 26168
8043913: remove legacy code in SPARC's VM_Version::platform_features Summary: Kept only getisax(2) to determine platform features Reviewed-by: kvn, roland Contributed-by: Zoltan Majo <zoltan.majo@oracle.com>
2014-08-11 Merge
roland [Mon, 11 Aug 2014 13:02:44 +0000] rev 26167
Merge
2014-08-11 7173584: Implement arraycopy as a macro node
roland [Mon, 11 Aug 2014 14:12:51 +0200] rev 26166
7173584: Implement arraycopy as a macro node Summary: delay the conversion of arraycopy to stub calls to macro expansion Reviewed-by: kvn, iveresov
2014-08-11 8043284: Optimize signed integer comparison
thartmann [Mon, 11 Aug 2014 13:01:37 +0200] rev 26165
8043284: Optimize signed integer comparison Summary: Folding of BoolNode if input add/sub of CmpI overflows and we can prove that compared value is not in the two resulting ranges. Added test for CmpI and CmpU optimizations. Reviewed-by: kvn, rbackman, roland
2014-08-21 Merge
jmasa [Thu, 21 Aug 2014 10:51:31 -0700] rev 26164
Merge
2014-08-20 8055635: Missing include in g1RegionToSpaceMapper.hpp results in unresolved symbol of fastdebug build without precompiled headers
tschatzl [Wed, 20 Aug 2014 15:04:39 +0200] rev 26163
8055635: Missing include in g1RegionToSpaceMapper.hpp results in unresolved symbol of fastdebug build without precompiled headers Reviewed-by: mgerdin, ehelin
2014-08-20 8055525: Bigapp weblogic+medrec fails to startup after JDK-8038423
tschatzl [Wed, 20 Aug 2014 14:34:40 +0200] rev 26162
8055525: Bigapp weblogic+medrec fails to startup after JDK-8038423 Summary: If large pages are enabled and configured in Linux, the VM always pre-commits the entire space. The VM fails verification of the commit of the initial heap because some internal data structure marked all memory pages of the heap as committed during initialization. This makes the code think that we attempted a double-commit during first allocation of the heap. Remove the initial marking of memory pages of the heap to committed. Reviewed-by: mgerdin
2014-08-19 Merge
jmasa [Tue, 19 Aug 2014 13:44:55 -0700] rev 26161
Merge
2014-08-19 8038423: G1: Decommit memory within heap
tschatzl [Tue, 19 Aug 2014 14:09:10 +0200] rev 26160
8038423: G1: Decommit memory within heap Summary: Allow G1 to decommit memory of arbitrary regions within the heap and their associated auxiliary data structures card table, BOT, hot card cache, and mark bitmaps. Reviewed-by: mgerdin, brutisso, jwilhelm
2014-08-19 8044406: JVM crash with JDK8 (build 1.8.0-b132) with G1 GC
poonam [Mon, 18 Aug 2014 19:30:24 -0700] rev 26159
8044406: JVM crash with JDK8 (build 1.8.0-b132) with G1 GC Summary: Fill the last card that has been allocated into with a dummy object Reviewed-by: tschatzl, mgerdin
2014-08-18 Merge
tschatzl [Mon, 18 Aug 2014 15:43:29 +0000] rev 26158
Merge
2014-08-18 8054818: Refactor HeapRegionSeq to manage heap region and auxiliary data
tschatzl [Mon, 18 Aug 2014 16:10:44 +0200] rev 26157
8054818: Refactor HeapRegionSeq to manage heap region and auxiliary data Summary: Let HeapRegionSeq manage the heap region and auxiliary data to decrease the amount of responsibilities of G1CollectedHeap, and encapsulate this work from other code. Reviewed-by: jwilhelm, jmasa, mgerdin, brutisso
2014-08-18 Merge
mgerdin [Mon, 18 Aug 2014 14:49:42 +0000] rev 26156
Merge
2014-08-18 8055284: sanity/WhiteBox.java fails with NPE
mgerdin [Mon, 18 Aug 2014 16:19:57 +0200] rev 26155
8055284: sanity/WhiteBox.java fails with NPE Summary: Revert previous change, sanity/WhiteBox.java provides its own sun.hotspot.WhiteBox class. Reviewed-by: ehelin, brutisso Contributed-by: dmitry.fazunenko@oracle.com
2014-08-18 8054362: gc/g1/TestEagerReclaimHumongousRegions2.java timeout
tschatzl [Mon, 18 Aug 2014 15:41:57 +0200] rev 26154
8054362: gc/g1/TestEagerReclaimHumongousRegions2.java timeout Summary: Give the test a time limit of approximately one minute so that it exits early on slow machines. Reviewed-by: ehelin, dfazunen, brutisso
2014-08-18 Merge
stefank [Mon, 18 Aug 2014 12:25:36 +0000] rev 26153
Merge
2014-08-18 8055275: Several gc/class_unloading/ tests fail due to missed +UnlockDiagnosticVMOptions flag
stefank [Mon, 18 Aug 2014 14:12:48 +0200] rev 26152
8055275: Several gc/class_unloading/ tests fail due to missed +UnlockDiagnosticVMOptions flag Reviewed-by: mgerdin, jwilhelm
2014-08-15 Merge
jmasa [Fri, 15 Aug 2014 09:06:17 -0700] rev 26151
Merge
2013-11-21 8026303: CMS: JVM intermittently crashes with "FreeList of size 258 violates Conservation Principle" assert
jmasa [Thu, 21 Nov 2013 09:57:00 -0800] rev 26150
8026303: CMS: JVM intermittently crashes with "FreeList of size 258 violates Conservation Principle" assert Reviewed-by: tschatzl, brutisso
2014-08-19 Merge
zgu [Tue, 19 Aug 2014 10:04:29 -0400] rev 26149
Merge
2014-08-19 8055051: runtime/NMT/CommandLineEmptyArgument.java fails
gtriantafill [Tue, 19 Aug 2014 06:47:28 -0700] rev 26148
8055051: runtime/NMT/CommandLineEmptyArgument.java fails Summary: disable failing test Reviewed-by: ctornqvi, zgu
2014-08-18 8054711: [TESTBUG] Enable NMT2 tests after NMT2 is integrated
gtriantafill [Mon, 18 Aug 2014 11:56:12 -0700] rev 26147
8054711: [TESTBUG] Enable NMT2 tests after NMT2 is integrated Summary: enable tests for NMT2 Reviewed-by: ctornqvi, zgu
2014-08-19 8055061: assert at share/vm/services/virtualMemoryTracker.cpp:332 Error: ShouldNotReachHere() when running NMT tests
zgu [Tue, 19 Aug 2014 09:05:55 -0400] rev 26146
8055061: assert at share/vm/services/virtualMemoryTracker.cpp:332 Error: ShouldNotReachHere() when running NMT tests Summary: Handled CDS mapping region and added test for the scenario Reviewed-by: coleenp, ctornqvi
2014-08-19 Merge
zgu [Tue, 19 Aug 2014 08:42:46 -0400] rev 26145
Merge
2014-08-19 8055007: NMT2: emptyStack missing in minimal build
zgu [Tue, 19 Aug 2014 08:34:25 -0400] rev 26144
8055007: NMT2: emptyStack missing in minimal build Summary: Refactored emptyStack to a static member of NativeCallStack, which is accessible in minimal build. Reviewed-by: coleenp, dholmes
2014-08-15 Merge
coleenp [Fri, 15 Aug 2014 20:37:43 +0000] rev 26143
Merge
2014-08-15 8055231: ZERO variant build is broken
coleenp [Fri, 15 Aug 2014 15:25:24 -0400] rev 26142
8055231: ZERO variant build is broken Summary: Fix zero build. Reviewed-by: coleenp Contributed-by: Severin Gehwolf <sgehwolf@redhat.com>
2014-08-15 Merge
sspitsyn [Fri, 15 Aug 2014 11:25:55 -0700] rev 26141
Merge
2014-08-15 8032999: [TESTBUG] JT-Reg Runtime tests to be run as part of JPRT submit job
ctornqvi [Thu, 14 Aug 2014 18:14:07 -0700] rev 26140
8032999: [TESTBUG] JT-Reg Runtime tests to be run as part of JPRT submit job Summary: JPRT will now run most of the tests in /runtime Reviewed-by: dcubed, mseledtsov, zgu, mikael
2014-08-14 Merge
zgu [Thu, 14 Aug 2014 17:25:14 +0000] rev 26139
Merge
2014-08-14 8054547: Re-enable warning for incompatible java launcher
zgu [Thu, 14 Aug 2014 13:15:23 -0400] rev 26138
8054547: Re-enable warning for incompatible java launcher Summary: Re-enabled warning as launcher change reached promotion build Reviewed-by: hseigel, coleenp
2014-08-14 Merge
zgu [Thu, 14 Aug 2014 13:13:15 +0000] rev 26137
Merge
2014-08-14 8054368: nsk/jdi/VirtualMachine/exit/exit002 crash with detail tracking on (NMT2)
zgu [Thu, 14 Aug 2014 09:02:51 -0400] rev 26136
8054368: nsk/jdi/VirtualMachine/exit/exit002 crash with detail tracking on (NMT2) Summary: Dynamic allocate _reserved_regions instead of static object to avoid racing during process exit Reviewed-by: dholmes, coleenp
2014-08-13 8046070: Class Data Sharing clean up and refactoring
iklam [Tue, 12 Aug 2014 17:29:00 -0700] rev 26135
8046070: Class Data Sharing clean up and refactoring Summary: Cleaned up CDS to be more configurable, maintainable and extensible Reviewed-by: dholmes, coleenp, acorn, mchung
2014-08-29 Added tag jdk9-b28 for changeset fabe6090d37a
katleman [Fri, 29 Aug 2014 11:30:41 -0700] rev 26134
Added tag jdk9-b28 for changeset fabe6090d37a
2014-08-29 Merge
lana [Fri, 29 Aug 2014 11:56:35 -0700] rev 26133
Merge
2014-08-29 8055856: checkdeps build target doesn't work for cross-compilation builds
mchung [Fri, 29 Aug 2014 10:46:21 -0700] rev 26132
8055856: checkdeps build target doesn't work for cross-compilation builds 8056113: [build] tools.jar missing modules.xml Reviewed-by: ihse, erikj
2014-08-29 8014510: Fix sjavac on all platforms in jprt
erikj [Fri, 29 Aug 2014 13:30:42 +0200] rev 26131
8014510: Fix sjavac on all platforms in jprt Reviewed-by: ihse
2014-08-29 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis [Fri, 29 Aug 2014 12:02:20 +0200] rev 26130
8056246: Fix AIX build after the Modular Source Code change 8054834 Reviewed-by: erikj, ihse
2014-08-27 8055922: Work around sjavac limitation with public api tracking cross modules
erikj [Wed, 27 Aug 2014 11:19:01 +0200] rev 26129
8055922: Work around sjavac limitation with public api tracking cross modules Reviewed-by: ihse
2014-08-27 8056062: Additional minor cleanups from source restructure build changes
erikj [Wed, 27 Aug 2014 11:12:15 +0200] rev 26128
8056062: Additional minor cleanups from source restructure build changes Reviewed-by: alanb, tbell
2014-08-27 8056064: Fix corba locale build problem on windows
erikj [Wed, 27 Aug 2014 10:59:59 +0200] rev 26127
8056064: Fix corba locale build problem on windows Reviewed-by: alanb, tbell
2014-08-26 8055230: Rename attach provider implementation class be platform neutral
mchung [Tue, 26 Aug 2014 14:35:19 -0700] rev 26126
8055230: Rename attach provider implementation class be platform neutral Reviewed-by: alanb, chegar, dfuchs, dholmes, erikj, sla
2014-08-22 Merge
amurillo [Fri, 22 Aug 2014 10:03:17 -0700] rev 26125
Merge
2014-08-21 Merge
kvn [Thu, 21 Aug 2014 15:37:51 -0700] rev 26124
Merge
2014-08-13 8047952: Remove FORTIFY_SOURCE from fastdebug and slowdebug builds
mduigou [Wed, 13 Aug 2014 19:39:05 +0000] rev 26123
8047952: Remove FORTIFY_SOURCE from fastdebug and slowdebug builds Reviewed-by: dholmes
2014-08-05 8054013: run hotspot JTREG compiler tests only on fastdebug platforms and also on macosx
anoll [Tue, 05 Aug 2014 09:05:51 +0200] rev 26122
8054013: run hotspot JTREG compiler tests only on fastdebug platforms and also on macosx Summary: Modify hotspot/make/jprt.properties and make/jprt.properties on the top level to add/remove the relevant platforms. Reviewed-by: kvn, roland Contributed-by: Zoltan Majo <zoltan.majo@oracle.com>
2014-08-21 Merge
sspitsyn [Wed, 20 Aug 2014 17:05:59 -0700] rev 26121
Merge
2014-08-18 8032999: [TESTBUG] JT-Reg Runtime tests to be run as part of JPRT submit job
ctornqvi [Mon, 18 Aug 2014 14:30:35 -0700] rev 26120
8032999: [TESTBUG] JT-Reg Runtime tests to be run as part of JPRT submit job Summary: JPRT will now run most of the tests in /runtime Reviewed-by: dcubed, mseledtsov, zgu, mikael
2014-08-22 8055096: Remove explicit mx flag from javadoc command line
erikj [Fri, 22 Aug 2014 11:51:33 +0200] rev 26119
8055096: Remove explicit mx flag from javadoc command line Reviewed-by: tbell, mduigou
2014-08-21 8055331: cleaner handling of sub-process non-zero exit result.
mduigou [Thu, 21 Aug 2014 10:23:20 -0700] rev 26118
8055331: cleaner handling of sub-process non-zero exit result. Reviewed-by: tbell
2014-08-21 8055772: get_source.sh : version check assumes English localization
mduigou [Thu, 21 Aug 2014 10:22:52 -0700] rev 26117
8055772: get_source.sh : version check assumes English localization Reviewed-by: mduigou, tbell Contributed-by: bitterfoxc@gmail.com
2014-08-21 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj [Thu, 21 Aug 2014 12:22:42 +0200] rev 26116
8055095: Improve "do nothing" incremental build performance after modularized source code integration Reviewed-by: tbell
2014-08-21 8055188: General cleanup of minor issues from source restructure
erikj [Thu, 21 Aug 2014 11:05:01 +0200] rev 26115
8055188: General cleanup of minor issues from source restructure Reviewed-by: tbell
2014-08-29 Added tag jdk9-b28 for changeset a4a81944aedd
katleman [Fri, 29 Aug 2014 11:30:33 -0700] rev 26114
Added tag jdk9-b28 for changeset a4a81944aedd
2017-07-05 Added tag jdk9-b28 for changeset f4269e8f454e
duke [Wed, 05 Jul 2017 19:57:58 +0200] rev 26113
Added tag jdk9-b28 for changeset f4269e8f454e
2017-07-05 Merge jdk9-b28
duke [Wed, 05 Jul 2017 19:57:57 +0200] rev 26112
Merge
2017-07-05 Merge
duke [Wed, 05 Jul 2017 19:57:53 +0200] rev 26111
Merge
2014-08-28 Merge
lana [Thu, 28 Aug 2014 14:53:49 -0700] rev 26110
Merge
2014-08-19 8055501: [javac] ignore test/tools/javac/Paths/AbsolutePathTest.java
ksrini [Tue, 19 Aug 2014 15:34:01 -0700] rev 26109
8055501: [javac] ignore test/tools/javac/Paths/AbsolutePathTest.java Reviewed-by: jjg
2014-08-19 8055390: IntelliJ langtools project should reflect modular source tree
mcimadamore [Tue, 19 Aug 2014 12:13:43 +0100] rev 26108
8055390: IntelliJ langtools project should reflect modular source tree Summary: Adjust langtools.iml to point to the new source trees Reviewed-by: jfranck
2014-08-18 Merge
chegar [Mon, 18 Aug 2014 10:59:44 +0100] rev 26107
Merge
2014-08-15 8054556: javac should report the error for default usage as the primary error
pgovereau [Fri, 15 Aug 2014 11:02:14 -0400] rev 26106
8054556: javac should report the error for default usage as the primary error Reviewed-by: jjg
2014-08-14 8055039: Sjavac does not print compilation errors to the console
alundblad [Thu, 14 Aug 2014 14:17:17 +0200] rev 26105
8055039: Sjavac does not print compilation errors to the console Summary: Sjavac (client) now prints the result of the compilation on stdout/stderr. Reviewed-by: jfranck
2014-08-14 8054215: Use com.sun.tools.javac.util.Assert instead of 'assert'
alundblad [Thu, 14 Aug 2014 13:05:49 +0200] rev 26104
8054215: Use com.sun.tools.javac.util.Assert instead of 'assert' Summary: Replaced assert keyword with methods from com.sun.tools.javac.util.Assert Reviewed-by: jfranck
2014-08-13 8055076: fix test failures in classfile tests
jjg [Wed, 13 Aug 2014 15:47:58 -0700] rev 26103
8055076: fix test failures in classfile tests Reviewed-by: darcy
2014-08-13 Merge
emc [Wed, 13 Aug 2014 21:58:29 +0000] rev 26102
Merge
2014-08-12 8042251: Implement classfile tests for InnerClasses attribute.
aeremeev [Tue, 12 Aug 2014 13:24:40 +0400] rev 26101
8042251: Implement classfile tests for InnerClasses attribute. Reviewed-by: jjg, anazarov, shurailine
2014-08-13 8050429: Update/cleanup ToolBox
jjg [Wed, 13 Aug 2014 13:20:31 -0700] rev 26100
8050429: Update/cleanup ToolBox Reviewed-by: vromero
2014-08-13 8055054: Remove visitWildcard visitor method from erasure visitor
emc [Wed, 13 Aug 2014 14:25:46 -0400] rev 26099
8055054: Remove visitWildcard visitor method from erasure visitor Summary: Remove suspicious visitor method that should not be present Reviewed-by: mcimadamore
2014-08-13 8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad [Wed, 13 Aug 2014 14:44:59 +0200] rev 26098
8048457: Sjavac should not use portfiles, sockets, etc if background=false 8044131: Restructure client / server protocol code Summary: Changes protocol code to use Object input/output streams. Avoids spawning server if background=false. Refactors idleness checks, pooling and port file monitoring. Reviewed-by: jjg, jfranck
2014-08-13 8049130: Group 8d - golden files for annotations test in tools/java dir
sogoel [Tue, 12 Aug 2014 17:48:30 -0700] rev 26097
8049130: Group 8d - golden files for annotations test in tools/java dir Reviewed-by: jjg
2014-08-13 8049129: Group 8c - golden files for annotations test in tools/java dir
sogoel [Tue, 12 Aug 2014 17:39:56 -0700] rev 26096
8049129: Group 8c - golden files for annotations test in tools/java dir Reviewed-by: jjg
2014-08-13 8049127: Group 8b - golden files for annotations test in tools/java dir
sogoel [Tue, 12 Aug 2014 17:31:31 -0700] rev 26095
8049127: Group 8b - golden files for annotations test in tools/java dir Reviewed-by: jjg
2014-08-12 8054964: Add a test for invalid package annotations
sogoel [Tue, 12 Aug 2014 16:41:05 -0700] rev 26094
8054964: Add a test for invalid package annotations Reviewed-by: jjg
2014-08-11 Merge
lana [Mon, 11 Aug 2014 11:28:08 -0700] rev 26093
Merge
2014-08-11 Merge
lana [Mon, 11 Aug 2014 10:05:15 -0700] rev 26092
Merge
2014-08-11 8054044: [javadoc] javadoc tester must print out the javadoc run arguments.
ksrini [Mon, 11 Aug 2014 10:16:55 -0700] rev 26091
8054044: [javadoc] javadoc tester must print out the javadoc run arguments. Reviewed-by: jjg, sogoel
2014-08-10 Added tag jdk9-b26 for changeset 196b7a50a266
lana [Sat, 09 Aug 2014 21:27:42 -0700] rev 26090
Added tag jdk9-b26 for changeset 196b7a50a266
2014-08-08 8054465: Add --permit-artifact=bar to sjavac
ohrstrom [Sat, 09 Aug 2014 00:56:29 +0200] rev 26089
8054465: Add --permit-artifact=bar to sjavac Summary: Add --permit-artifact=bar to white-list files that have been written to the destination directory and that sjavac should not delete. Reviewed-by: jjg, alundblad
2014-08-08 8054474: Add --state-dir=bar to sjavac
ohrstrom [Fri, 08 Aug 2014 21:26:23 +0200] rev 26088
8054474: Add --state-dir=bar to sjavac Summary: Add --state-dir=bar to sjavac to control where sjavac stores the javac_state file. Reviewed-by: jjg, alundblad
2014-08-08 8054461: Add @file support to sjavac
ohrstrom [Fri, 08 Aug 2014 20:47:24 +0200] rev 26087
8054461: Add @file support to sjavac Summary: Add @file support to sjavac commandline. Reviewed-by: jjg, alundblad
2014-08-21 Added tag jdk9-b27 for changeset 83c19f00452c
katleman [Thu, 21 Aug 2014 14:16:28 -0700] rev 26086
Added tag jdk9-b27 for changeset 83c19f00452c
2017-07-05 Merge
duke [Wed, 05 Jul 2017 19:57:44 +0200] rev 26085
Merge
(0) -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 +30000 tip