MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

if vm is not bootstrapped and no jb debugger support, so, script added from initial Scripts message,

Browse Source 
only jb debugger support reports sourceMapUrl and any breakpoint is not yet in action (we just connected and scripts were already parsed and executed),
so, we must invoke doFindSourceMap explicitly

updated netty (actually, we already use b8 version)
This commit is contained in:
Vladimir Krivosheev
2015-12-18 18:48:58 +01:00
parent c254d19d06
commit 96adb59270
10 changed files with 141 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/Netty.xml
Generated
+2 -2
View File
@@ -4,11 +4,11 @@
<root url="file://$PROJECT_DIR$/lib/annotations/netty"/>
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.0.Beta7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.0.Beta8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.0.Beta7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.0.Beta8-sources.jar!/" />
</SOURCES>
</library>
</component>
lib/annotations/netty/io/netty/channel/annotations.xml
+3
View File
@@ -1,4 +1,7 @@
<root>
<item name='io.netty.channel.ChannelInboundHandlerAdapter void channelActive(io.netty.channel.ChannelHandlerContext) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='io.netty.channel.ChannelInboundHandlerAdapter void channelInactive(io.netty.channel.ChannelHandlerContext) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
lib/netty-all-4.1.0.Beta7.jar
BIN
View File
Binary file not shown.
lib/netty-all-4.1.0.Beta8.jar
BIN
View File
Binary file not shown.
lib/required_for_dist.txt
+1 -1
View File
@@ -54,7 +54,7 @@ microba.jar
miglayout-swing.jar
nanoxml-2.2.3.jar
nekohtml-1.9.14.jar
netty-all-4.1.0.Beta7.jar
netty-all-4.1.0.Beta8.jar
oromatcher.jar
picocontainer.jar
protobuf-2.5.0.jar
lib/src/netty-all-4.1.0.Beta7-sources.jar → lib/src/netty-all-4.1.0.Beta8-sources.jar
BIN
View File
Binary file not shown.
platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
+70 -37
View File
@@ -97,45 +97,16 @@ public final class NettyUtil {
int maxAttemptCount,
@NotNull Condition<Void> stopCondition) throws Throwable {
int attemptCount = 0;
if (bootstrap.group() instanceof NioEventLoopGroup) {
while (true) {
ChannelFuture future = bootstrap.connect(remoteAddress).awaitUninterruptibly();
if (future.isSuccess()) {
return future.channel();
}
else if (stopCondition.value(null) || (promise != null && promise.getState() == Promise.State.REJECTED)) {
return null;
}
else if (maxAttemptCount == -1) {
//noinspection BusyWait
Thread.sleep(300);
attemptCount++;
}
else if (++attemptCount < maxAttemptCount) {
//noinspection BusyWait
Thread.sleep(attemptCount * MIN_START_TIME);
}
else {
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
Throwable cause = future.cause();
if (promise != null) {
if (cause == null) {
promise.setError("Cannot connect: unknown error");
}
else {
promise.setError(cause);
}
}
return null;
}
}
return connectNio(bootstrap, remoteAddress, promise, maxAttemptCount, stopCondition, attemptCount);
}
bootstrap.validate();
Socket socket;
while (true) {
try {
//noinspection SocketOpenedButNotSafelyClosed
//noinspection IOResourceOpenedButNotSafelyClosed,SocketOpenedButNotSafelyClosed
socket = new Socket(remoteAddress.getAddress(), remoteAddress.getPort());
break;
}
@@ -144,13 +115,15 @@ public final class NettyUtil {
return null;
}
else if (maxAttemptCount == -1) {
//noinspection BusyWait
Thread.sleep(300);
if (sleep(promise, 300)) {
return null;
}
attemptCount++;
}
else if (++attemptCount < maxAttemptCount) {
//noinspection BusyWait
Thread.sleep(attemptCount * MIN_START_TIME);
if (sleep(promise, attemptCount * MIN_START_TIME)) {
return null;
}
}
else {
if (promise != null) {
@@ -160,11 +133,71 @@ public final class NettyUtil {
}
}
}
OioSocketChannel channel = new OioSocketChannel(socket);
BootstrapUtil.initAndRegister(channel, bootstrap).sync();
return channel;
}
@Nullable
private static Channel connectNio(@NotNull Bootstrap bootstrap,
@NotNull InetSocketAddress remoteAddress,
@Nullable AsyncPromise<?> promise,
int maxAttemptCount,
@NotNull Condition<Void> stopCondition,
int attemptCount) {
while (true) {
ChannelFuture future = bootstrap.connect(remoteAddress).awaitUninterruptibly();
if (future.isSuccess()) {
if (!future.channel().isOpen()) {
continue;
}
return future.channel();
}
else if (stopCondition.value(null) || (promise != null && promise.getState() == Promise.State.REJECTED)) {
return null;
}
else if (maxAttemptCount == -1) {
if (sleep(promise, 300)) {
return null;
}
attemptCount++;
}
else if (++attemptCount < maxAttemptCount) {
if (sleep(promise, attemptCount * MIN_START_TIME)) {
return null;
}
}
else {
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
Throwable cause = future.cause();
if (promise != null) {
if (cause == null) {
promise.setError("Cannot connect: unknown error");
}
else {
promise.setError(cause);
}
}
return null;
}
}
}
private static boolean sleep(@Nullable AsyncPromise<?> promise, int time) {
try {
//noinspection BusyWait
Thread.sleep(time);
}
catch (InterruptedException ignored) {
if (promise != null) {
promise.setError("Interrupted");
}
return true;
}
return false;
}
private static boolean isAsWarning(@NotNull Throwable throwable) {
String message = throwable.getMessage();
if (message == null) {
platform/script-debugger/backend/src/util.kt
+51 -30
View File
@@ -20,8 +20,10 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.registry.Registry
import com.intellij.openapi.vfs.CharsetToolkit
import io.netty.buffer.ByteBuf
import io.netty.channel.Channel
import org.jetbrains.annotations.PropertyKey
import org.jetbrains.io.JsonReaderEx
import org.jetbrains.io.addListener
import java.io.File
import java.io.FileOutputStream
import java.nio.CharBuffer
@@ -33,6 +35,8 @@ internal class LogEntry(val message: Any, val marker: String) {
}
class MessagingLogger internal constructor(private val queue: ConcurrentLinkedQueue<LogEntry>) {
internal @Volatile var closed = false
fun add(inMessage: CharSequence, marker: String = "IN") {
queue.add(LogEntry(inMessage, marker))
}
@@ -40,9 +44,24 @@ class MessagingLogger internal constructor(private val queue: ConcurrentLinkedQu
fun add(outMessage: ByteBuf, marker: String = "OUT") {
queue.add(LogEntry(outMessage.copy(), marker))
}
fun close() {
closed = true
}
fun closeOnChannelClose(channel: Channel) {
channel.closeFuture().addListener {
try {
add("\"Closed\"", "Channel")
}
finally {
close()
}
}
}
}
fun createDebugLogger(@PropertyKey(resourceBundle = Registry.REGISTRY_BUNDLE) key: String, vm: AttachStateManager): MessagingLogger? {
fun createDebugLogger(@PropertyKey(resourceBundle = Registry.REGISTRY_BUNDLE) key: String): MessagingLogger? {
val debugFile = Registry.stringValue(key)
if (debugFile.isNullOrEmpty()) {
return null
@@ -60,42 +79,44 @@ fun createDebugLogger(@PropertyKey(resourceBundle = Registry.REGISTRY_BUNDLE) ke
val dateFormatter = SimpleDateFormat("HH.mm.ss,SSS")
o@ do {
while (true) {
val entry = queue.poll() ?: continue@o
while (true) {
val entry = queue.poll() ?: if (logger.closed) {
break
}
else {
continue
}
writer.write("""{"timestamp": "${dateFormatter.format(entry.time)}", """)
val message = entry.message
when (message) {
is CharSequence -> {
writer.write("\"${entry.marker}\": ")
writer.flush()
writer.write("""{"timestamp": "${dateFormatter.format(entry.time)}", """)
val message = entry.message
when (message) {
is CharSequence -> {
writer.write("\"${entry.marker}\": ")
writer.flush()
if (message is JsonReaderEx.CharSequenceBackedByChars) {
fileChannel.write(message.byteBuffer)
}
else {
fileChannel.write(CharsetToolkit.UTF8_CHARSET.encode(CharBuffer.wrap(message)))
}
writer.write("},\n")
writer.flush()
if (message is JsonReaderEx.CharSequenceBackedByChars) {
fileChannel.write(message.byteBuffer)
}
is ByteBuf -> {
writer.write("\"${entry.marker}\": ")
writer.flush()
message.getBytes(message.readerIndex(), out, message.readableBytes())
message.release()
writer.write("},\n")
writer.flush()
else {
fileChannel.write(CharsetToolkit.UTF8_CHARSET.encode(CharBuffer.wrap(message)))
}
else -> throw RuntimeException("Unknown message type")
writer.write("},\n")
writer.flush()
}
is ByteBuf -> {
writer.write("\"${entry.marker}\": ")
writer.flush()
message.getBytes(message.readerIndex(), out, message.readableBytes())
message.release()
writer.write("},\n")
writer.flush()
}
else -> throw RuntimeException("Unknown message type")
}
}
while (vm.isAttached)
writer.write("]")
out.close()
}
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ScopeVariablesGroup.kt
+6 -2
View File
@@ -43,8 +43,12 @@ class ScopeVariablesGroup(val scope: Scope, parentContext: VariableContext, call
promise
.done(node) {
callFrame.receiverVariable
.done(node) { node.addChildren(if (it == null) XValueChildrenList.EMPTY else XValueChildrenList.singleton(VariableView(it, context)), true) }
.rejected(node) { node.addChildren(XValueChildrenList.EMPTY, true) }
.done(node) {
node.addChildren(if (it == null) XValueChildrenList.EMPTY else XValueChildrenList.singleton(VariableView(it, context)), true)
}
.rejected(node) {
node.addChildren(XValueChildrenList.EMPTY, true)
}
}
}
}
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.kt
+8 -1
View File
@@ -47,7 +47,14 @@ fun processScopeVariables(scope: Scope,
context: VariableContext,
isLast: Boolean) = processVariables(context, scope.variablesHost.get(), node, { memberFilter, variables ->
val additionalVariables = memberFilter.additionalVariables
val properties = ArrayList<Variable>(variables.size + additionalVariables.size)
val exceptionValue = context.viewSupport.vm?.suspendContextManager?.context?.exceptionData?.exceptionValue
val properties = ArrayList<Variable>(variables.size + additionalVariables.size + (if (exceptionValue == null) 0 else 1))
exceptionValue?.let {
properties.add(VariableImpl("Exception", it))
}
val functions = SmartList<Variable>()
for (variable in variables) {
if (memberFilter.isMemberVisible(variable)) {