Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart

Issue 2046703002: Add 'flog' service implementation. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fixes per feedback. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | mojo/services/flog/cpp/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
index 76dba45846f09d0e763c4ad63473d28f21a6d792..e45127c4082d6d5d25cdd671fdf1a7d3322b27e1 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
@@ -11,24 +11,18 @@ import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as servic
class FlogDescription extends bindings.Struct {
static const List<bindings.StructDataHeader> kVersions = const [
- const bindings.StructDataHeader(48, 0)
+ const bindings.StructDataHeader(24, 0)
];
- String label = null;
int logId = 0;
- int entryCount = 0;
- int startTimeUs = 0;
- int stopTimeUs = 0;
bool open = false;
+ String label = null;
FlogDescription() : super(kVersions.last.size);
FlogDescription.init(
- String this.label,
int this.logId,
- int this.entryCount,
- int this.startTimeUs,
- int this.stopTimeUs,
- bool this.open
+ bool this.open,
+ String this.label
) : super(kVersions.last.size);
static FlogDescription deserialize(bindings.Message message) {
@@ -66,27 +60,15 @@ class FlogDescription extends bindings.Struct {
}
if (mainDataHeader.version >= 0) {
- result.label = decoder0.decodeString(8, false);
- }
- if (mainDataHeader.version >= 0) {
-
- result.logId = decoder0.decodeUint32(16);
- }
- if (mainDataHeader.version >= 0) {
-
- result.entryCount = decoder0.decodeUint32(20);
- }
- if (mainDataHeader.version >= 0) {
-
- result.startTimeUs = decoder0.decodeInt64(24);
+ result.logId = decoder0.decodeUint32(8);
}
if (mainDataHeader.version >= 0) {
- result.stopTimeUs = decoder0.decodeInt64(32);
+ result.open = decoder0.decodeBool(12, 0);
}
if (mainDataHeader.version >= 0) {
- result.open = decoder0.decodeBool(40, 0);
+ result.label = decoder0.decodeString(16, false);
}
return result;
}
@@ -94,67 +76,40 @@ class FlogDescription extends bindings.Struct {
void encode(bindings.Encoder encoder) {
var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
try {
- encoder0.encodeString(label, 8, false);
- } on bindings.MojoCodecError catch(e) {
- e.message = "Error encountered while encoding field "
- "label of struct FlogDescription: $e";
- rethrow;
- }
- try {
- encoder0.encodeUint32(logId, 16);
+ encoder0.encodeUint32(logId, 8);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
"logId of struct FlogDescription: $e";
rethrow;
}
try {
- encoder0.encodeUint32(entryCount, 20);
- } on bindings.MojoCodecError catch(e) {
- e.message = "Error encountered while encoding field "
- "entryCount of struct FlogDescription: $e";
- rethrow;
- }
- try {
- encoder0.encodeInt64(startTimeUs, 24);
- } on bindings.MojoCodecError catch(e) {
- e.message = "Error encountered while encoding field "
- "startTimeUs of struct FlogDescription: $e";
- rethrow;
- }
- try {
- encoder0.encodeInt64(stopTimeUs, 32);
+ encoder0.encodeBool(open, 12, 0);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
- "stopTimeUs of struct FlogDescription: $e";
+ "open of struct FlogDescription: $e";
rethrow;
}
try {
- encoder0.encodeBool(open, 40, 0);
+ encoder0.encodeString(label, 16, false);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
- "open of struct FlogDescription: $e";
+ "label of struct FlogDescription: $e";
rethrow;
}
}
String toString() {
return "FlogDescription("
- "label: $label" ", "
"logId: $logId" ", "
- "entryCount: $entryCount" ", "
- "startTimeUs: $startTimeUs" ", "
- "stopTimeUs: $stopTimeUs" ", "
- "open: $open" ")";
+ "open: $open" ", "
+ "label: $label" ")";
}
Map toJson() {
Map map = new Map();
- map["label"] = label;
map["logId"] = logId;
- map["entryCount"] = entryCount;
- map["startTimeUs"] = startTimeUs;
- map["stopTimeUs"] = stopTimeUs;
map["open"] = open;
+ map["label"] = label;
return map;
}
}
@@ -433,6 +388,67 @@ class FlogChannelMessageEntryDetails extends bindings.Struct {
}
+class FlogChannelDeletionEntryDetails extends bindings.Struct {
+ static const List<bindings.StructDataHeader> kVersions = const [
+ const bindings.StructDataHeader(8, 0)
+ ];
+
+ FlogChannelDeletionEntryDetails() : super(kVersions.last.size);
+
+ FlogChannelDeletionEntryDetails.init(
+ ) : super(kVersions.last.size);
+
+ static FlogChannelDeletionEntryDetails deserialize(bindings.Message message) {
+ var decoder = new bindings.Decoder(message);
+ var result = decode(decoder);
+ if (decoder.excessHandles != null) {
+ decoder.excessHandles.forEach((h) => h.close());
+ }
+ return result;
+ }
+
+ static FlogChannelDeletionEntryDetails decode(bindings.Decoder decoder0) {
+ if (decoder0 == null) {
+ return null;
+ }
+ FlogChannelDeletionEntryDetails result = new FlogChannelDeletionEntryDetails();
+
+ var mainDataHeader = decoder0.decodeStructDataHeader();
+ if (mainDataHeader.version <= kVersions.last.version) {
+ // Scan in reverse order to optimize for more recent versions.
+ for (int i = kVersions.length - 1; i >= 0; --i) {
+ if (mainDataHeader.version >= kVersions[i].version) {
+ if (mainDataHeader.size == kVersions[i].size) {
+ // Found a match.
+ break;
+ }
+ throw new bindings.MojoCodecError(
+ 'Header size doesn\'t correspond to known version size.');
+ }
+ }
+ } else if (mainDataHeader.size < kVersions.last.size) {
+ throw new bindings.MojoCodecError(
+ 'Message newer than the last known version cannot be shorter than '
+ 'required by the last known version.');
+ }
+ return result;
+ }
+
+ void encode(bindings.Encoder encoder) {
+ encoder.getStructEncoderAtOffset(kVersions.last);
+ }
+
+ String toString() {
+ return "FlogChannelDeletionEntryDetails("")";
+ }
+
+ Map toJson() {
+ Map map = new Map();
+ return map;
+ }
+}
+
+
class _FlogServiceCreateLoggerParams extends bindings.Struct {
static const List<bindings.StructDataHeader> kVersions = const [
const bindings.StructDataHeader(24, 0)
@@ -1160,18 +1176,14 @@ class _FlogReaderGetEntriesParams extends bindings.Struct {
class FlogReaderGetEntriesResponseParams extends bindings.Struct {
static const List<bindings.StructDataHeader> kVersions = const [
- const bindings.StructDataHeader(24, 0)
+ const bindings.StructDataHeader(16, 0)
];
List<FlogEntry> entries = null;
- int entryCount = 0;
- bool open = false;
FlogReaderGetEntriesResponseParams() : super(kVersions.last.size);
FlogReaderGetEntriesResponseParams.init(
- List<FlogEntry> this.entries,
- int this.entryCount,
- bool this.open
+ List<FlogEntry> this.entries
) : super(kVersions.last.size);
static FlogReaderGetEntriesResponseParams deserialize(bindings.Message message) {
@@ -1220,14 +1232,6 @@ class FlogReaderGetEntriesResponseParams extends bindings.Struct {
}
}
}
- if (mainDataHeader.version >= 0) {
-
- result.entryCount = decoder0.decodeUint32(16);
- }
- if (mainDataHeader.version >= 0) {
-
- result.open = decoder0.decodeBool(20, 0);
- }
return result;
}
@@ -1247,34 +1251,16 @@ class FlogReaderGetEntriesResponseParams extends bindings.Struct {
"entries of struct FlogReaderGetEntriesResponseParams: $e";
rethrow;
}
- try {
- encoder0.encodeUint32(entryCount, 16);
- } on bindings.MojoCodecError catch(e) {
- e.message = "Error encountered while encoding field "
- "entryCount of struct FlogReaderGetEntriesResponseParams: $e";
- rethrow;
- }
- try {
- encoder0.encodeBool(open, 20, 0);
- } on bindings.MojoCodecError catch(e) {
- e.message = "Error encountered while encoding field "
- "open of struct FlogReaderGetEntriesResponseParams: $e";
- rethrow;
- }
}
String toString() {
return "FlogReaderGetEntriesResponseParams("
- "entries: $entries" ", "
- "entryCount: $entryCount" ", "
- "open: $open" ")";
+ "entries: $entries" ")";
}
Map toJson() {
Map map = new Map();
map["entries"] = entries;
- map["entryCount"] = entryCount;
- map["open"] = open;
return map;
}
}
@@ -1284,6 +1270,7 @@ class FlogReaderGetEntriesResponseParams extends bindings.Struct {
enum FlogEntryDetailsTag {
channelCreation,
channelMessage,
+ channelDeletion,
unknown
}
@@ -1291,11 +1278,13 @@ class FlogEntryDetails extends bindings.Union {
static final _tagToInt = const {
FlogEntryDetailsTag.channelCreation: 0,
FlogEntryDetailsTag.channelMessage: 1,
+ FlogEntryDetailsTag.channelDeletion: 2,
};
static final _intToTag = const {
0: FlogEntryDetailsTag.channelCreation,
1: FlogEntryDetailsTag.channelMessage,
+ 2: FlogEntryDetailsTag.channelDeletion,
};
var _data;
@@ -1324,6 +1313,17 @@ class FlogEntryDetails extends bindings.Union {
_tag = FlogEntryDetailsTag.channelMessage;
_data = value;
}
+ FlogChannelDeletionEntryDetails get channelDeletion {
+ if (_tag != FlogEntryDetailsTag.channelDeletion) {
+ throw new bindings.UnsetUnionTagError(_tag, FlogEntryDetailsTag.channelDeletion);
+ }
+ return _data;
+ }
+
+ set channelDeletion(FlogChannelDeletionEntryDetails value) {
+ _tag = FlogEntryDetailsTag.channelDeletion;
+ _data = value;
+ }
static FlogEntryDetails decode(bindings.Decoder decoder0, int offset) {
int size = decoder0.decodeUint32(offset);
@@ -1345,6 +1345,11 @@ class FlogEntryDetails extends bindings.Union {
var decoder1 = decoder0.decodePointer(offset + 8, false);
result.channelMessage = FlogChannelMessageEntryDetails.decode(decoder1);
break;
+ case FlogEntryDetailsTag.channelDeletion:
+
+ var decoder1 = decoder0.decodePointer(offset + 8, false);
+ result.channelDeletion = FlogChannelDeletionEntryDetails.decode(decoder1);
+ break;
default:
throw new bindings.MojoCodecError("Bad union tag: $tag");
}
@@ -1363,6 +1368,9 @@ class FlogEntryDetails extends bindings.Union {
case FlogEntryDetailsTag.channelMessage:
encoder0.encodeStruct(channelMessage, offset + 8, false);
break;
+ case FlogEntryDetailsTag.channelDeletion:
+ encoder0.encodeStruct(channelDeletion, offset + 8, false);
+ break;
default:
throw new bindings.MojoCodecError("Bad union tag: $_tag");
}
@@ -1377,6 +1385,9 @@ class FlogEntryDetails extends bindings.Union {
case FlogEntryDetailsTag.channelMessage:
result += "channelMessage";
break;
+ case FlogEntryDetailsTag.channelDeletion:
+ result += "channelDeletion";
+ break;
default:
result += "unknown";
}
@@ -2041,7 +2052,7 @@ abstract class FlogReader {
s.connectToService(url, p, name);
return p;
}
- void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries, int entryCount, bool open));
+ void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries));
}
abstract class FlogReaderInterface
@@ -2098,7 +2109,7 @@ class _FlogReaderProxyControl
return;
}
callbackMap.remove(message.header.requestId);
- callback(r.entries , r.entryCount , r.open );
+ callback(r.entries );
break;
default:
proxyError("Unexpected message type: ${message.header.type}");
@@ -2143,7 +2154,7 @@ class FlogReaderProxy
}
- void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries, int entryCount, bool open)) {
+ void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries)) {
if (impl != null) {
impl.getEntries(startIndex,maxCount,callback);
return;
@@ -2156,9 +2167,9 @@ class FlogReaderProxy
zonedCallback = callback;
} else {
Zone z = Zone.current;
- zonedCallback = ((List<FlogEntry> entries, int entryCount, bool open) {
+ zonedCallback = ((List<FlogEntry> entries) {
z.bindCallback(() {
- callback(entries, entryCount, open);
+ callback(entries);
})();
});
}
@@ -2195,11 +2206,9 @@ class _FlogReaderStubControl
Function _flogReaderGetEntriesResponseParamsResponder(
int requestId) {
- return (List<FlogEntry> entries, int entryCount, bool open) {
+ return (List<FlogEntry> entries) {
var result = new FlogReaderGetEntriesResponseParams();
result.entries = entries;
- result.entryCount = entryCount;
- result.open = open;
sendResponse(buildResponseWithId(
result,
_flogReaderMethodGetEntriesName,
@@ -2280,7 +2289,7 @@ class FlogReaderStub
}
- void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries, int entryCount, bool open)) {
+ void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries)) {
return impl.getEntries(startIndex,maxCount,callback);
}
}
« no previous file with comments | « no previous file | mojo/services/flog/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698