OLD | NEW |
1 // Copyright 2016 the V8 project authors. All rights reserved. | 1 // Copyright 2016 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/inspector/v8-console-message.h" | 5 #include "src/inspector/v8-console-message.h" |
6 | 6 |
| 7 #include "src/debug/debug-interface.h" |
7 #include "src/inspector/inspected-context.h" | 8 #include "src/inspector/inspected-context.h" |
8 #include "src/inspector/protocol/Protocol.h" | 9 #include "src/inspector/protocol/Protocol.h" |
9 #include "src/inspector/string-util.h" | 10 #include "src/inspector/string-util.h" |
10 #include "src/inspector/v8-console-agent-impl.h" | 11 #include "src/inspector/v8-console-agent-impl.h" |
11 #include "src/inspector/v8-inspector-impl.h" | 12 #include "src/inspector/v8-inspector-impl.h" |
12 #include "src/inspector/v8-inspector-session-impl.h" | 13 #include "src/inspector/v8-inspector-session-impl.h" |
13 #include "src/inspector/v8-runtime-agent-impl.h" | 14 #include "src/inspector/v8-runtime-agent-impl.h" |
14 #include "src/inspector/v8-stack-trace-impl.h" | 15 #include "src/inspector/v8-stack-trace-impl.h" |
15 | 16 |
16 #include "include/v8-inspector.h" | 17 #include "include/v8-inspector.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 return protocol::Runtime::ConsoleAPICalled::TypeEnum::Assert; | 52 return protocol::Runtime::ConsoleAPICalled::TypeEnum::Assert; |
52 case ConsoleAPIType::kTimeEnd: | 53 case ConsoleAPIType::kTimeEnd: |
53 return protocol::Runtime::ConsoleAPICalled::TypeEnum::TimeEnd; | 54 return protocol::Runtime::ConsoleAPICalled::TypeEnum::TimeEnd; |
54 case ConsoleAPIType::kCount: | 55 case ConsoleAPIType::kCount: |
55 return protocol::Runtime::ConsoleAPICalled::TypeEnum::Count; | 56 return protocol::Runtime::ConsoleAPICalled::TypeEnum::Count; |
56 } | 57 } |
57 return protocol::Runtime::ConsoleAPICalled::TypeEnum::Log; | 58 return protocol::Runtime::ConsoleAPICalled::TypeEnum::Log; |
58 } | 59 } |
59 | 60 |
60 const unsigned maxConsoleMessageCount = 1000; | 61 const unsigned maxConsoleMessageCount = 1000; |
| 62 const int maxConsoleMessageV8Size = 10 * 1024 * 1024; |
61 const unsigned maxArrayItemsLimit = 10000; | 63 const unsigned maxArrayItemsLimit = 10000; |
62 const unsigned maxStackDepthLimit = 32; | 64 const unsigned maxStackDepthLimit = 32; |
63 | 65 |
64 class V8ValueStringBuilder { | 66 class V8ValueStringBuilder { |
65 public: | 67 public: |
66 static String16 toString(v8::Local<v8::Value> value, | 68 static String16 toString(v8::Local<v8::Value> value, |
67 v8::Local<v8::Context> context) { | 69 v8::Local<v8::Context> context) { |
68 V8ValueStringBuilder builder(context); | 70 V8ValueStringBuilder builder(context); |
69 if (!builder.append(value)) return String16(); | 71 if (!builder.append(value)) return String16(); |
70 return builder.toString(); | 72 return builder.toString(); |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 std::unique_ptr<V8ConsoleMessage> message( | 366 std::unique_ptr<V8ConsoleMessage> message( |
365 new V8ConsoleMessage(V8MessageOrigin::kConsole, timestamp, String16())); | 367 new V8ConsoleMessage(V8MessageOrigin::kConsole, timestamp, String16())); |
366 if (stackTrace && !stackTrace->isEmpty()) { | 368 if (stackTrace && !stackTrace->isEmpty()) { |
367 message->m_url = toString16(stackTrace->topSourceURL()); | 369 message->m_url = toString16(stackTrace->topSourceURL()); |
368 message->m_lineNumber = stackTrace->topLineNumber(); | 370 message->m_lineNumber = stackTrace->topLineNumber(); |
369 message->m_columnNumber = stackTrace->topColumnNumber(); | 371 message->m_columnNumber = stackTrace->topColumnNumber(); |
370 } | 372 } |
371 message->m_stackTrace = std::move(stackTrace); | 373 message->m_stackTrace = std::move(stackTrace); |
372 message->m_type = type; | 374 message->m_type = type; |
373 message->m_contextId = contextId; | 375 message->m_contextId = contextId; |
374 for (size_t i = 0; i < arguments.size(); ++i) | 376 for (size_t i = 0; i < arguments.size(); ++i) { |
375 message->m_arguments.push_back(std::unique_ptr<v8::Global<v8::Value>>( | 377 message->m_arguments.push_back(std::unique_ptr<v8::Global<v8::Value>>( |
376 new v8::Global<v8::Value>(isolate, arguments.at(i)))); | 378 new v8::Global<v8::Value>(isolate, arguments.at(i)))); |
| 379 message->m_v8Size += |
| 380 v8::debug::EstimatedValueSize(isolate, arguments.at(i)); |
| 381 } |
377 if (arguments.size()) | 382 if (arguments.size()) |
378 message->m_message = V8ValueStringBuilder::toString(arguments[0], context); | 383 message->m_message = V8ValueStringBuilder::toString(arguments[0], context); |
379 | 384 |
380 V8ConsoleAPIType clientType = V8ConsoleAPIType::kLog; | 385 V8ConsoleAPIType clientType = V8ConsoleAPIType::kLog; |
381 v8::Isolate::MessageErrorLevel clientLevel = v8::Isolate::kMessageInfo; | 386 v8::Isolate::MessageErrorLevel clientLevel = v8::Isolate::kMessageInfo; |
382 if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount || | 387 if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount || |
383 type == ConsoleAPIType::kTimeEnd) { | 388 type == ConsoleAPIType::kTimeEnd) { |
384 clientType = V8ConsoleAPIType::kDebug; | 389 clientType = V8ConsoleAPIType::kDebug; |
385 clientLevel = v8::Isolate::kMessageDebug; | 390 clientLevel = v8::Isolate::kMessageDebug; |
386 } else if (type == ConsoleAPIType::kError || | 391 } else if (type == ConsoleAPIType::kError || |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
423 new V8ConsoleMessage(V8MessageOrigin::kException, timestamp, message)); | 428 new V8ConsoleMessage(V8MessageOrigin::kException, timestamp, message)); |
424 consoleMessage->setLocation(url, lineNumber, columnNumber, | 429 consoleMessage->setLocation(url, lineNumber, columnNumber, |
425 std::move(stackTrace), scriptId); | 430 std::move(stackTrace), scriptId); |
426 consoleMessage->m_exceptionId = exceptionId; | 431 consoleMessage->m_exceptionId = exceptionId; |
427 consoleMessage->m_detailedMessage = detailedMessage; | 432 consoleMessage->m_detailedMessage = detailedMessage; |
428 if (contextId && !exception.IsEmpty()) { | 433 if (contextId && !exception.IsEmpty()) { |
429 consoleMessage->m_contextId = contextId; | 434 consoleMessage->m_contextId = contextId; |
430 consoleMessage->m_arguments.push_back( | 435 consoleMessage->m_arguments.push_back( |
431 std::unique_ptr<v8::Global<v8::Value>>( | 436 std::unique_ptr<v8::Global<v8::Value>>( |
432 new v8::Global<v8::Value>(isolate, exception))); | 437 new v8::Global<v8::Value>(isolate, exception))); |
| 438 consoleMessage->m_v8Size += |
| 439 v8::debug::EstimatedValueSize(isolate, exception); |
433 } | 440 } |
434 return consoleMessage; | 441 return consoleMessage; |
435 } | 442 } |
436 | 443 |
437 // static | 444 // static |
438 std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForRevokedException( | 445 std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForRevokedException( |
439 double timestamp, const String16& messageText, | 446 double timestamp, const String16& messageText, |
440 unsigned revokedExceptionId) { | 447 unsigned revokedExceptionId) { |
441 std::unique_ptr<V8ConsoleMessage> message(new V8ConsoleMessage( | 448 std::unique_ptr<V8ConsoleMessage> message(new V8ConsoleMessage( |
442 V8MessageOrigin::kRevokedException, timestamp, messageText)); | 449 V8MessageOrigin::kRevokedException, timestamp, messageText)); |
443 message->m_revokedExceptionId = revokedExceptionId; | 450 message->m_revokedExceptionId = revokedExceptionId; |
444 return message; | 451 return message; |
445 } | 452 } |
446 | 453 |
447 void V8ConsoleMessage::contextDestroyed(int contextId) { | 454 void V8ConsoleMessage::contextDestroyed(int contextId) { |
448 if (contextId != m_contextId) return; | 455 if (contextId != m_contextId) return; |
449 m_contextId = 0; | 456 m_contextId = 0; |
450 if (m_message.isEmpty()) m_message = "<message collected>"; | 457 if (m_message.isEmpty()) m_message = "<message collected>"; |
451 Arguments empty; | 458 Arguments empty; |
452 m_arguments.swap(empty); | 459 m_arguments.swap(empty); |
| 460 m_v8Size = 0; |
453 } | 461 } |
454 | 462 |
455 // ------------------------ V8ConsoleMessageStorage ---------------------------- | 463 // ------------------------ V8ConsoleMessageStorage ---------------------------- |
456 | 464 |
457 V8ConsoleMessageStorage::V8ConsoleMessageStorage(V8InspectorImpl* inspector, | 465 V8ConsoleMessageStorage::V8ConsoleMessageStorage(V8InspectorImpl* inspector, |
458 int contextGroupId) | 466 int contextGroupId) |
459 : m_inspector(inspector), | 467 : m_inspector(inspector), m_contextGroupId(contextGroupId) {} |
460 m_contextGroupId(contextGroupId), | |
461 m_expiredCount(0) {} | |
462 | 468 |
463 V8ConsoleMessageStorage::~V8ConsoleMessageStorage() { clear(); } | 469 V8ConsoleMessageStorage::~V8ConsoleMessageStorage() { clear(); } |
464 | 470 |
465 void V8ConsoleMessageStorage::addMessage( | 471 void V8ConsoleMessageStorage::addMessage( |
466 std::unique_ptr<V8ConsoleMessage> message) { | 472 std::unique_ptr<V8ConsoleMessage> message) { |
467 int contextGroupId = m_contextGroupId; | 473 int contextGroupId = m_contextGroupId; |
468 V8InspectorImpl* inspector = m_inspector; | 474 V8InspectorImpl* inspector = m_inspector; |
469 if (message->type() == ConsoleAPIType::kClear) clear(); | 475 if (message->type() == ConsoleAPIType::kClear) clear(); |
470 | 476 |
471 V8InspectorSessionImpl* session = | 477 V8InspectorSessionImpl* session = |
472 inspector->sessionForContextGroup(contextGroupId); | 478 inspector->sessionForContextGroup(contextGroupId); |
473 if (session) { | 479 if (session) { |
474 if (message->origin() == V8MessageOrigin::kConsole) | 480 if (message->origin() == V8MessageOrigin::kConsole) |
475 session->consoleAgent()->messageAdded(message.get()); | 481 session->consoleAgent()->messageAdded(message.get()); |
476 session->runtimeAgent()->messageAdded(message.get()); | 482 session->runtimeAgent()->messageAdded(message.get()); |
477 } | 483 } |
478 if (!inspector->hasConsoleMessageStorage(contextGroupId)) return; | 484 if (!inspector->hasConsoleMessageStorage(contextGroupId)) return; |
479 | 485 |
480 DCHECK(m_messages.size() <= maxConsoleMessageCount); | 486 DCHECK(m_messages.size() <= maxConsoleMessageCount); |
481 if (m_messages.size() == maxConsoleMessageCount) { | 487 if (m_messages.size() == maxConsoleMessageCount) { |
482 ++m_expiredCount; | 488 m_estimatedSize -= m_messages.front()->estimatedSize(); |
483 m_messages.pop_front(); | 489 m_messages.pop_front(); |
484 } | 490 } |
| 491 while (m_estimatedSize + message->estimatedSize() > maxConsoleMessageV8Size && |
| 492 !m_messages.empty()) { |
| 493 m_estimatedSize -= m_messages.front()->estimatedSize(); |
| 494 m_messages.pop_front(); |
| 495 } |
| 496 |
485 m_messages.push_back(std::move(message)); | 497 m_messages.push_back(std::move(message)); |
| 498 m_estimatedSize += m_messages.back()->estimatedSize(); |
486 } | 499 } |
487 | 500 |
488 void V8ConsoleMessageStorage::clear() { | 501 void V8ConsoleMessageStorage::clear() { |
489 m_messages.clear(); | 502 m_messages.clear(); |
490 m_expiredCount = 0; | 503 m_estimatedSize = 0; |
491 if (V8InspectorSessionImpl* session = | 504 if (V8InspectorSessionImpl* session = |
492 m_inspector->sessionForContextGroup(m_contextGroupId)) | 505 m_inspector->sessionForContextGroup(m_contextGroupId)) |
493 session->releaseObjectGroup("console"); | 506 session->releaseObjectGroup("console"); |
494 } | 507 } |
495 | 508 |
496 void V8ConsoleMessageStorage::contextDestroyed(int contextId) { | 509 void V8ConsoleMessageStorage::contextDestroyed(int contextId) { |
497 for (size_t i = 0; i < m_messages.size(); ++i) | 510 m_estimatedSize = 0; |
| 511 for (size_t i = 0; i < m_messages.size(); ++i) { |
498 m_messages[i]->contextDestroyed(contextId); | 512 m_messages[i]->contextDestroyed(contextId); |
| 513 m_estimatedSize += m_messages[i]->estimatedSize(); |
| 514 } |
499 } | 515 } |
500 | 516 |
501 } // namespace v8_inspector | 517 } // namespace v8_inspector |
OLD | NEW |