Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 0e6c820

Browse files
author
iivlev
committed
Changing wireId parameter to 32 bit
Adressing issue: #585
1 parent 62bb60f commit 0e6c820

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

bindings/cpp/event.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ StandardEvents::CreateZoneEventType& StandardEvents::GetCreateZoneEvent() {
166166
return event;
167167
}
168168

169-
void StandardEvents::DefineEvent(EventBuffer* event_buffer, uint16_t wire_id,
169+
void StandardEvents::DefineEvent(EventBuffer* event_buffer, uint32_t wire_id,
170170
uint16_t event_class, uint32_t flags,
171171
const char* name, const char* args) {
172-
static EventEnabled<uint16_t, uint16_t, uint32_t, const char*, const char*>
172+
static EventEnabled<uint32_t, uint16_t, uint32_t, const char*, const char*>
173173
event{1, EventClass::kInstance,
174174
EventFlags::kBuiltin | EventFlags::kInternal,
175175
"wtf.event#define:wireId,eventClass,flags,name,args"};

bindings/cpp/include/wtf/event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ class StandardEvents {
355355
static ScopeLeaveEventType& GetScopeLeaveEvent();
356356
static CreateZoneEventType& GetCreateZoneEvent();
357357

358-
static void DefineEvent(EventBuffer* event_buffer, uint16_t wire_id,
358+
static void DefineEvent(EventBuffer* event_buffer, uint32_t wire_id,
359359
uint16_t event_class, uint32_t flags,
360360
const char* name, const char* args);
361361
static void ScopeLeave(EventBuffer* event_buffer);

src/wtf/db/sources/chunkeddatasource.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ wtf.db.sources.ChunkedDataSource.prototype.setupBinaryDispatchTable_ =
233233

234234
// Add builtin events.
235235
eventTypeTable.defineType(wtf.db.EventType.createInstance(
236-
'wtf.event#define(uint16 wireId, uint16 eventClass, uint32 flags, ' +
236+
'wtf.event#define(uint32 wireId, uint16 eventClass, uint32 flags, ' +
237237
'ascii name, ascii args)',
238238
wtf.data.EventFlag.BUILTIN | wtf.data.EventFlag.INTERNAL));
239239
this.eventWireTable_[1] = eventTypeTable.getByName('wtf.event#define');
@@ -370,7 +370,11 @@ wtf.db.sources.ChunkedDataSource.prototype.processLegacyEventBuffer_ =
370370
while (buffer.offset < buffer.capacity) {
371371
// Read common event header.
372372
var offset = buffer.offset;
373-
var eventWireId = (data[offset++] << 8) | data[offset++];
373+
var eventWireId =
374+
(((data[offset++] << 24) >>> 0) |
375+
(data[offset++] << 16) |
376+
(data[offset++] << 8) |
377+
data[offset++]) >>> 0;
374378
var time =
375379
(((data[offset++] << 24) >>> 0) |
376380
(data[offset++] << 16) |

src/wtf/trace/builtinevents.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ wtf.trace.BuiltinEvents = {
2727
* This can occur multiple times in a stream and duplicates should be ignored.
2828
*/
2929
defineEvent: wtf.trace.events.createInstance(
30-
'wtf.event#define(uint16 wireId, uint16 eventClass, uint32 flags, ' +
30+
'wtf.event#define(uint32 wireId, uint16 eventClass, uint32 flags, ' +
3131
'ascii name, ascii args)',
3232
wtf.data.EventFlag.BUILTIN | wtf.data.EventFlag.INTERNAL),
3333

src/wtf/trace/eventtype.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ wtf.trace.EventType = function(name, eventClass, flags, opt_args) {
9090
* @type {number}
9191
* @private
9292
*/
93-
wtf.trace.EventType.MAX_EVENT_WIRE_ID_ = 0xFFFF;
93+
wtf.trace.EventType.MAX_EVENT_WIRE_ID_ = 0xFFFFFFFF;
9494

9595

9696
/**

0 commit comments

Comments
 (0)