ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-14 14:42:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1094 from corda/thomas/os-merge-2018-06-27

Browse Source 
OS merge
This commit is contained in:
Thomas Schroeter 2018-06-27 14:40:14 +01:00 committed by GitHub
commit 75354d2961
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
View File

@ -87,7 +87,7 @@ class NetworkBootstrapper
val numParallelProcesses = Runtime.getRuntime().availableProcessors()
val timePerNode = 40.seconds // On the test machine, generating the node info takes 7 seconds for a single node.
val tExpected = maxOf(timePerNode, timePerNode * nodeDirs.size.toLong() / numParallelProcesses.toLong())
val warningTimer = Timer("WarnOnSlowMachines", false).schedule(tExpected.toMillis()) {
val warningTimer = Timer("WarnOnSlowMachines", true).schedule(tExpected.toMillis()) {
println("... still waiting. If this is taking longer than usual, check the node logs.")
}
val executor = Executors.newFixedThreadPool(numParallelProcesses)

31
tools/demobench/build.gradle
View File

@ -9,17 +9,19 @@
*/
buildscript {
ext.tornadofx_version = '1.7.15'
ext.jna_version = '4.1.0'
ext.purejavacomm_version = '0.0.18'
ext.controlsfx_version = '8.40.12'
ext {
tornadofx_version = '1.7.15'
jna_version = '4.1.0'
purejavacomm_version = '0.0.18'
controlsfx_version = '8.40.12'
ext.java_home = System.properties.'java.home'
ext.pkg_source = "$buildDir/packagesrc"
ext.pkg_outDir = "$buildDir/javapackage"
ext.dist_source = "$pkg_source/demobench-$version"
ext.pkg_version = version.indexOf('-') >= 0 ? version.substring(0, version.indexOf('-')) : version
ext.pkg_macosxKeyUserName = 'R3CEV'
java_home = System.properties.'java.home'
pkg_source = "$buildDir/packagesrc"
pkg_outDir = "$buildDir/javapackage"
dist_source = "$pkg_source/demobench-$version"
pkg_version = version.indexOf('-') >= 0 ? version.substring(0, version.indexOf('-')) : version
pkg_macosxKeyUserName = 'R3CEV'
}
repositories {
mavenLocal()
@ -50,6 +52,13 @@ repositories {
}
}
configurations {
compile {
// We don't need Hibernate just for its @Type annotation.
exclude group: 'org.hibernate', module: 'hibernate-core'
}
}
dependencies {
// TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's.
compile "no.tornado:tornadofx:$tornadofx_version"
@ -84,7 +93,7 @@ dependencies {
testCompile "junit:junit:$junit_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testCompile "org.assertj:assertj-core:${assertj_version}"
testCompile "org.assertj:assertj-core:$assertj_version"
}
jar {

11
tools/explorer/build.gradle
View File

@ -25,6 +25,13 @@ processResources {
from file("$rootDir/config/dev/log4j2.xml")
}
configurations {
compile {
// We don't need Hibernate just for its @Type annotation.
exclude group: 'org.hibernate', module: 'hibernate-core'
}
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
@ -67,12 +74,12 @@ dependencies {
compile 'com.yuvimasory:orange-extensions:1.3.0'
}
task(runDemoNodes, dependsOn: 'classes', type: JavaExec) {
task runDemoNodes(dependsOn: 'classes', type: JavaExec) {
main = 'net.corda.explorer.MainKt'
classpath = sourceSets.main.runtimeClasspath
}
task(runSimulationNodes, dependsOn: 'classes', type: JavaExec) {
task runSimulationNodes(dependsOn: 'classes', type: JavaExec) {
main = 'net.corda.explorer.MainKt'
classpath = sourceSets.main.runtimeClasspath
args '-S'