diff options
| author | Marco Vanotti <mvanotti@users.noreply.github.com> | 2019-04-03 15:30:56 -0700 |
|---|---|---|
| committer | Julia Hansbrough <flowerhack@google.com> | 2019-04-03 15:30:56 -0700 |
| commit | 4949990eeac542550e992ee3275dccb5079031b4 (patch) | |
| tree | 5bcc53d3323980458c195ebb0d3a839d1a90e61f /sys | |
| parent | d6fc4177b78b02a7e37fef129f26ee66065ad4b4 (diff) | |
sys/fuchsia: Remove object_*_cookie syscalls. (#1099)
Those syscalls were removed from Zircon in a recent CL[0].
This commit runs make extract && make generate to update syscalls and
fidl interfaces.
[0]: https://fuchsia-review.googlesource.com/c/fuchsia/+/249349
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fuchsia/fidl_cobalt.txt | 4 | ||||
| -rw-r--r-- | sys/fuchsia/fidl_cobalt_amd64.const | 6 | ||||
| -rw-r--r-- | sys/fuchsia/fidl_cobalt_arm64.const | 6 | ||||
| -rw-r--r-- | sys/fuchsia/fidl_net.txt | 86 | ||||
| -rw-r--r-- | sys/fuchsia/gen/amd64.go | 63 | ||||
| -rw-r--r-- | sys/fuchsia/gen/arm64.go | 63 | ||||
| -rw-r--r-- | sys/fuchsia/objects.txt | 2 |
7 files changed, 137 insertions, 93 deletions
diff --git a/sys/fuchsia/fidl_cobalt.txt b/sys/fuchsia/fidl_cobalt.txt index 44f4ab774..b8ed33769 100644 --- a/sys/fuchsia/fidl_cobalt.txt +++ b/sys/fuchsia/fidl_cobalt.txt @@ -88,6 +88,10 @@ fuchsia_cobalt_ValueInLine [ fuchsia_cobalt_EventPayloadInLine [ event_countInLine fidl_union_member[fuchsia_cobalt_EventPayloadTag_event_count, fuchsia_cobalt_CountEventInLine] + elapsed_micros fidl_union_member[fuchsia_cobalt_EventPayloadTag_elapsed_micros, int64] + fps fidl_union_member[fuchsia_cobalt_EventPayloadTag_fps, int32] + memory_bytes_used fidl_union_member[fuchsia_cobalt_EventPayloadTag_memory_bytes_used, int64] + string_eventInLine fidl_union_member[fuchsia_cobalt_EventPayloadTag_string_event, fidl_string] int_histogramInLine fidl_union_member[fuchsia_cobalt_EventPayloadTag_int_histogram, fidl_vector] ] diff --git a/sys/fuchsia/fidl_cobalt_amd64.const b/sys/fuchsia/fidl_cobalt_amd64.const index f7700d2fd..14ae72942 100644 --- a/sys/fuchsia/fidl_cobalt_amd64.const +++ b/sys/fuchsia/fidl_cobalt_amd64.const @@ -1,7 +1,11 @@ # AUTOGENERATED FILE ZX_CHANNEL_MAX_MSG_BYTES = 65536 +fuchsia_cobalt_EventPayloadTag_elapsed_micros = 1 fuchsia_cobalt_EventPayloadTag_event_count = 0 -fuchsia_cobalt_EventPayloadTag_int_histogram = 1 +fuchsia_cobalt_EventPayloadTag_fps = 2 +fuchsia_cobalt_EventPayloadTag_int_histogram = 5 +fuchsia_cobalt_EventPayloadTag_memory_bytes_used = 3 +fuchsia_cobalt_EventPayloadTag_string_event = 4 fuchsia_cobalt_ReleaseStage_DEBUG = 99 fuchsia_cobalt_ReleaseStage_DOGFOOD = 10 fuchsia_cobalt_ReleaseStage_FISHFOOD = 20 diff --git a/sys/fuchsia/fidl_cobalt_arm64.const b/sys/fuchsia/fidl_cobalt_arm64.const index f7700d2fd..14ae72942 100644 --- a/sys/fuchsia/fidl_cobalt_arm64.const +++ b/sys/fuchsia/fidl_cobalt_arm64.const @@ -1,7 +1,11 @@ # AUTOGENERATED FILE ZX_CHANNEL_MAX_MSG_BYTES = 65536 +fuchsia_cobalt_EventPayloadTag_elapsed_micros = 1 fuchsia_cobalt_EventPayloadTag_event_count = 0 -fuchsia_cobalt_EventPayloadTag_int_histogram = 1 +fuchsia_cobalt_EventPayloadTag_fps = 2 +fuchsia_cobalt_EventPayloadTag_int_histogram = 5 +fuchsia_cobalt_EventPayloadTag_memory_bytes_used = 3 +fuchsia_cobalt_EventPayloadTag_string_event = 4 fuchsia_cobalt_ReleaseStage_DEBUG = 99 fuchsia_cobalt_ReleaseStage_DOGFOOD = 10 fuchsia_cobalt_ReleaseStage_FISHFOOD = 20 diff --git a/sys/fuchsia/fidl_net.txt b/sys/fuchsia/fidl_net.txt index b5c65784f..070399358 100644 --- a/sys/fuchsia/fidl_net.txt +++ b/sys/fuchsia/fidl_net.txt @@ -5,11 +5,11 @@ include <fuchsia/net/c/fidl.h> -fuchsia_net_IPv4AddressInLine { +fuchsia_net_Ipv4AddressInLine { addrInLine array[int8, 4] } [packed] -fuchsia_net_IPv6AddressInLine { +fuchsia_net_Ipv6AddressInLine { addrInLine array[int8, 16] } [packed] @@ -50,8 +50,8 @@ fuchsia_net_AddrInfoHandles { } [packed] fuchsia_net_IpAddressInLine [ - ipv4InLine fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_IPv4AddressInLine] - ipv6InLine fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_IPv6AddressInLine] + ipv4InLine fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_Ipv4AddressInLine] + ipv6InLine fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_Ipv6AddressInLine] ] fuchsia_net_ConnectivityOnNetworkReachableEventHandles { @@ -106,30 +106,17 @@ fdio_service_connect$fuchsia_net_SocketProvider(path ptr[in, string["/svc/fuchsi zx_channel_call$fuchsia_net_SocketProviderSocket(handle zx_chan_fuchsia_net_SocketProvider_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketProviderSocketRequest, fuchsia_net_SocketProviderSocketRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketProviderSocketResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) zx_channel_call$fuchsia_net_SocketProviderGetAddrInfo(handle zx_chan_fuchsia_net_SocketProvider_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketProviderGetAddrInfoRequest, fuchsia_net_SocketProviderGetAddrInfoRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketProviderGetAddrInfoResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) -fuchsia_net_SocketControlCloseRequest { - hdr fidl_message_header[506040350] -} [packed] - -fuchsia_net_SocketControlCloseRequestHandles { - void void -} [packed] - -fuchsia_net_SocketControlCloseResponseHandles { - void void -} [packed] - -fuchsia_net_SocketControlIoctlRequest { - hdr fidl_message_header[1157859964] - req int16 - inInLine fidl_vector - inOutOfLine array[int8] +fuchsia_net_SocketControlBindRequest { + hdr fidl_message_header[2092731140] + addrInLine fidl_vector + addrOutOfLine array[int8] } [packed] -fuchsia_net_SocketControlIoctlRequestHandles { +fuchsia_net_SocketControlBindRequestHandles { void void } [packed] -fuchsia_net_SocketControlIoctlResponseHandles { +fuchsia_net_SocketControlBindResponseHandles { void void } [packed] @@ -147,43 +134,41 @@ fuchsia_net_SocketControlConnectResponseHandles { void void } [packed] -fuchsia_net_SocketControlAcceptRequest { - hdr fidl_message_header[796734679] - flags_ int16 +fuchsia_net_SocketControlListenRequest { + hdr fidl_message_header[1117818704] + backlog int16 } [packed] -fuchsia_net_SocketControlAcceptRequestHandles { +fuchsia_net_SocketControlListenRequestHandles { void void } [packed] -fuchsia_net_SocketControlAcceptResponseHandles { +fuchsia_net_SocketControlListenResponseHandles { void void } [packed] -fuchsia_net_SocketControlBindRequest { - hdr fidl_message_header[2092731140] - addrInLine fidl_vector - addrOutOfLine array[int8] +fuchsia_net_SocketControlAcceptRequest { + hdr fidl_message_header[796734679] + flags_ int16 } [packed] -fuchsia_net_SocketControlBindRequestHandles { +fuchsia_net_SocketControlAcceptRequestHandles { void void } [packed] -fuchsia_net_SocketControlBindResponseHandles { +fuchsia_net_SocketControlAcceptResponseHandles { void void } [packed] -fuchsia_net_SocketControlListenRequest { - hdr fidl_message_header[1117818704] - backlog int16 +fuchsia_net_SocketControlCloseRequest { + hdr fidl_message_header[506040350] } [packed] -fuchsia_net_SocketControlListenRequestHandles { +fuchsia_net_SocketControlCloseRequestHandles { void void } [packed] -fuchsia_net_SocketControlListenResponseHandles { +fuchsia_net_SocketControlCloseResponseHandles { void void } [packed] @@ -241,18 +226,33 @@ fuchsia_net_SocketControlGetSockOptResponseHandles { void void } [packed] +fuchsia_net_SocketControlIoctlRequest { + hdr fidl_message_header[1157859964] + req int16 + inInLine fidl_vector + inOutOfLine array[int8] +} [packed] + +fuchsia_net_SocketControlIoctlRequestHandles { + void void +} [packed] + +fuchsia_net_SocketControlIoctlResponseHandles { + void void +} [packed] + resource zx_chan_fuchsia_net_SocketControl_client[zx_chan] resource zx_chan_fuchsia_net_SocketControl_server[zx_chan] zx_channel_create$fuchsia_net_SocketControl(options const[0], out0 ptr[out, zx_chan_fuchsia_net_SocketControl_client], out1 ptr[out, zx_chan_fuchsia_net_SocketControl_server]) fdio_service_connect$fuchsia_net_SocketControl(path ptr[in, string["/svc/"]], handle zx_chan_fuchsia_net_SocketControl_server) -zx_channel_call$fuchsia_net_SocketControlClose(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlCloseRequest, fuchsia_net_SocketControlCloseRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlCloseResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) -zx_channel_call$fuchsia_net_SocketControlIoctl(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlIoctlRequest, fuchsia_net_SocketControlIoctlRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlIoctlResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) -zx_channel_call$fuchsia_net_SocketControlConnect(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlConnectRequest, fuchsia_net_SocketControlConnectRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlConnectResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) -zx_channel_call$fuchsia_net_SocketControlAccept(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlAcceptRequest, fuchsia_net_SocketControlAcceptRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlAcceptResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) zx_channel_call$fuchsia_net_SocketControlBind(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlBindRequest, fuchsia_net_SocketControlBindRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlBindResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) +zx_channel_call$fuchsia_net_SocketControlConnect(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlConnectRequest, fuchsia_net_SocketControlConnectRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlConnectResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) zx_channel_call$fuchsia_net_SocketControlListen(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlListenRequest, fuchsia_net_SocketControlListenRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlListenResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) +zx_channel_call$fuchsia_net_SocketControlAccept(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlAcceptRequest, fuchsia_net_SocketControlAcceptRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlAcceptResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) +zx_channel_call$fuchsia_net_SocketControlClose(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlCloseRequest, fuchsia_net_SocketControlCloseRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlCloseResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) zx_channel_call$fuchsia_net_SocketControlGetSockName(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlGetSockNameRequest, fuchsia_net_SocketControlGetSockNameRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlGetSockNameResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) zx_channel_call$fuchsia_net_SocketControlGetPeerName(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlGetPeerNameRequest, fuchsia_net_SocketControlGetPeerNameRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlGetPeerNameResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) zx_channel_call$fuchsia_net_SocketControlSetSockOpt(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlSetSockOptRequest, fuchsia_net_SocketControlSetSockOptRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlSetSockOptResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) zx_channel_call$fuchsia_net_SocketControlGetSockOpt(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlGetSockOptRequest, fuchsia_net_SocketControlGetSockOptRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlGetSockOptResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) +zx_channel_call$fuchsia_net_SocketControlIoctl(handle zx_chan_fuchsia_net_SocketControl_client, options const[0], deadline zx_time, args ptr[in, fidl_call_args[fuchsia_net_SocketControlIoctlRequest, fuchsia_net_SocketControlIoctlRequestHandles, array[int8, ZX_CHANNEL_MAX_MSG_BYTES], fuchsia_net_SocketControlIoctlResponseHandles]], actual_bytes ptr[out, int32], actual_handles ptr[out, int32]) diff --git a/sys/fuchsia/gen/amd64.go b/sys/fuchsia/gen/amd64.go index a9a729d65..f98044f96 100644 --- a/sys/fuchsia/gen/amd64.go +++ b/sys/fuchsia/gen/amd64.go @@ -2378,15 +2378,34 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "size", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fidl_alloc_presence", FldName: "data", TypeSize: 8}}, Vals: []uint64{0, 18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615}}, }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_elapsed_micros, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_elapsed_micros, int64]", TypeSize: 16}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "data", TypeSize: 8}}}, + }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_event_count, fuchsia_cobalt_CountEventInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_event_count, fuchsia_cobalt_CountEventInLine]", TypeSize: 20}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}}, &StructType{Key: StructKey{Name: "fuchsia_cobalt_CountEventInLine"}, FldName: "data"}, }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_fps, int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_fps, int32]", TypeSize: 8}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 2}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "data", TypeSize: 4}}}, + }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_int_histogram, fidl_vector]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_int_histogram, fidl_vector]", TypeSize: 24}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 5}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, &StructType{Key: StructKey{Name: "fidl_vector"}, FldName: "data"}, }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_memory_bytes_used, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_memory_bytes_used, int64]", TypeSize: 16}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 3}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "data", TypeSize: 8}}}, + }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_string_event, fidl_string]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_string_event, fidl_string]", TypeSize: 24}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 4}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &StructType{Key: StructKey{Name: "fidl_string"}, FldName: "data"}, + }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_ValueTag_double_value, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_ValueTag_double_value, int64]", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 2}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, @@ -2406,13 +2425,13 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, &StructType{Key: StructKey{Name: "fidl_string"}, FldName: "data"}, }}}, - {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_IPv4AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_IPv4AddressInLine]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_Ipv4AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_Ipv4AddressInLine]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}}, - &StructType{Key: StructKey{Name: "fuchsia_net_IPv4AddressInLine"}, FldName: "data"}, + &StructType{Key: StructKey{Name: "fuchsia_net_Ipv4AddressInLine"}, FldName: "data"}, }}}, - {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_IPv6AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_IPv6AddressInLine]", TypeSize: 20}, Fields: []Type{ + {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_Ipv6AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_Ipv6AddressInLine]", TypeSize: 20}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 1}, - &StructType{Key: StructKey{Name: "fuchsia_net_IPv6AddressInLine"}, FldName: "data"}, + &StructType{Key: StructKey{Name: "fuchsia_net_Ipv6AddressInLine"}, FldName: "data"}, }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_net_stack_ForwardingDestinationTag_deviceId, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_stack_ForwardingDestinationTag_deviceId, int64]", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}}, @@ -2493,6 +2512,10 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "fuchsia_cobalt_EventPayloadInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_cobalt_EventPayloadInLine", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_event_count, fuchsia_cobalt_CountEventInLine]"}, FldName: "event_countInLine"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_elapsed_micros, int64]"}, FldName: "elapsed_micros"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_fps, int32]"}, FldName: "fps"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_memory_bytes_used, int64]"}, FldName: "memory_bytes_used"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_string_event, fidl_string]"}, FldName: "string_eventInLine"}, &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_int_histogram, fidl_vector]"}, FldName: "int_histogramInLine"}, }}}, {Key: StructKey{Name: "fuchsia_cobalt_ExperimentHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_cobalt_ExperimentHandles"}, Fields: []Type{ @@ -4037,16 +4060,16 @@ var structDescs_amd64 = []*KeyedStruct{ {Key: StructKey{Name: "fuchsia_net_ConnectivityOnNetworkReachableEventHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_ConnectivityOnNetworkReachableEventHandles", ArgDir: 1}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "void", ArgDir: 1}, Kind: 1}, }}}, - {Key: StructKey{Name: "fuchsia_net_IPv4AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IPv4AddressInLine", TypeSize: 4}, Fields: []Type{ + {Key: StructKey{Name: "fuchsia_net_IpAddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IpAddressInLine", TypeSize: 20}, Fields: []Type{ + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_Ipv4AddressInLine]"}, FldName: "ipv4InLine"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_Ipv6AddressInLine]"}, FldName: "ipv6InLine"}, + }}}, + {Key: StructKey{Name: "fuchsia_net_Ipv4AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_Ipv4AddressInLine", TypeSize: 4}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "addrInLine", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4}, }}}, - {Key: StructKey{Name: "fuchsia_net_IPv6AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IPv6AddressInLine", TypeSize: 16}, Fields: []Type{ + {Key: StructKey{Name: "fuchsia_net_Ipv6AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_Ipv6AddressInLine", TypeSize: 16}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "addrInLine", TypeSize: 16}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, }}}, - {Key: StructKey{Name: "fuchsia_net_IpAddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IpAddressInLine", TypeSize: 20}, Fields: []Type{ - &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_IPv4AddressInLine]"}, FldName: "ipv4InLine"}, - &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_IPv6AddressInLine]"}, FldName: "ipv6InLine"}, - }}}, {Key: StructKey{Name: "fuchsia_net_SocketControlAcceptRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_SocketControlAcceptRequest", TypeSize: 18}, Fields: []Type{ &StructType{Key: StructKey{Name: "fidl_message_header[796734679]"}, FldName: "hdr"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "flags_", TypeSize: 2}}}, @@ -6912,11 +6935,6 @@ var syscalls_amd64 = []*Syscall{ {Name: "zx_nanosleep", CallName: "zx_nanosleep", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_time", FldName: "deadline", TypeSize: 8}}, }}, - {Name: "zx_object_get_cookie", CallName: "zx_object_get_cookie", Args: []Type{ - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "scope", TypeSize: 4}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "cookie", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, - }}, {Name: "zx_object_get_info$ZX_INFO_CPU_STATS", CallName: "zx_object_get_info", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_root_resource", FldName: "root_resource", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "topic", TypeSize: 8}}, Val: 16}, @@ -7043,11 +7061,6 @@ var syscalls_amd64 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "value", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "size", TypeSize: 8}}, Buf: "value"}, }}, - {Name: "zx_object_set_cookie", CallName: "zx_object_set_cookie", Args: []Type{ - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "scope", TypeSize: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "cookie", TypeSize: 8}}}, - }}, {Name: "zx_object_set_profile", CallName: "zx_object_set_profile", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "profile", TypeSize: 4}}, @@ -7530,8 +7543,12 @@ var consts_amd64 = []ConstValue{ {Name: "ZX_VM_FLAG_SPECIFIC_OVERWRITE", Value: 32}, {Name: "ZX_WAIT_ASYNC_ONCE"}, {Name: "ZX_WAIT_ASYNC_REPEATING", Value: 1}, + {Name: "fuchsia_cobalt_EventPayloadTag_elapsed_micros", Value: 1}, {Name: "fuchsia_cobalt_EventPayloadTag_event_count"}, - {Name: "fuchsia_cobalt_EventPayloadTag_int_histogram", Value: 1}, + {Name: "fuchsia_cobalt_EventPayloadTag_fps", Value: 2}, + {Name: "fuchsia_cobalt_EventPayloadTag_int_histogram", Value: 5}, + {Name: "fuchsia_cobalt_EventPayloadTag_memory_bytes_used", Value: 3}, + {Name: "fuchsia_cobalt_EventPayloadTag_string_event", Value: 4}, {Name: "fuchsia_cobalt_ReleaseStage_DEBUG", Value: 99}, {Name: "fuchsia_cobalt_ReleaseStage_DOGFOOD", Value: 10}, {Name: "fuchsia_cobalt_ReleaseStage_FISHFOOD", Value: 20}, @@ -7553,4 +7570,4 @@ var consts_amd64 = []ConstValue{ {Name: "fuchsia_power_Status_OK"}, } -const revision_amd64 = "8a39145bebcae7aff1de7ff20c3914bdd32a70f9" +const revision_amd64 = "d6d650c4d4b7bf6dffb3ebb9e87b1519c0317583" diff --git a/sys/fuchsia/gen/arm64.go b/sys/fuchsia/gen/arm64.go index 7e9fb720b..809ef0d77 100644 --- a/sys/fuchsia/gen/arm64.go +++ b/sys/fuchsia/gen/arm64.go @@ -2378,15 +2378,34 @@ var structDescs_arm64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "size", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fidl_alloc_presence", FldName: "data", TypeSize: 8}}, Vals: []uint64{0, 18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615, 18446744073709551615}}, }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_elapsed_micros, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_elapsed_micros, int64]", TypeSize: 16}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "data", TypeSize: 8}}}, + }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_event_count, fuchsia_cobalt_CountEventInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_event_count, fuchsia_cobalt_CountEventInLine]", TypeSize: 20}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}}, &StructType{Key: StructKey{Name: "fuchsia_cobalt_CountEventInLine"}, FldName: "data"}, }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_fps, int32]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_fps, int32]", TypeSize: 8}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 2}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "data", TypeSize: 4}}}, + }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_int_histogram, fidl_vector]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_int_histogram, fidl_vector]", TypeSize: 24}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 5}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, &StructType{Key: StructKey{Name: "fidl_vector"}, FldName: "data"}, }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_memory_bytes_used, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_memory_bytes_used, int64]", TypeSize: 16}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 3}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "data", TypeSize: 8}}}, + }}}, + {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_string_event, fidl_string]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_string_event, fidl_string]", TypeSize: 24}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 4}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &StructType{Key: StructKey{Name: "fidl_string"}, FldName: "data"}, + }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_ValueTag_double_value, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_cobalt_ValueTag_double_value, int64]", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 2}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, @@ -2406,13 +2425,13 @@ var structDescs_arm64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, &StructType{Key: StructKey{Name: "fidl_string"}, FldName: "data"}, }}}, - {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_IPv4AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_IPv4AddressInLine]", TypeSize: 8}, Fields: []Type{ + {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_Ipv4AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_Ipv4AddressInLine]", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}}, - &StructType{Key: StructKey{Name: "fuchsia_net_IPv4AddressInLine"}, FldName: "data"}, + &StructType{Key: StructKey{Name: "fuchsia_net_Ipv4AddressInLine"}, FldName: "data"}, }}}, - {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_IPv6AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_IPv6AddressInLine]", TypeSize: 20}, Fields: []Type{ + {Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_Ipv6AddressInLine]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_Ipv6AddressInLine]", TypeSize: 20}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}, Val: 1}, - &StructType{Key: StructKey{Name: "fuchsia_net_IPv6AddressInLine"}, FldName: "data"}, + &StructType{Key: StructKey{Name: "fuchsia_net_Ipv6AddressInLine"}, FldName: "data"}, }}}, {Key: StructKey{Name: "fidl_union_member[fuchsia_net_stack_ForwardingDestinationTag_deviceId, int64]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fidl_union_member[fuchsia_net_stack_ForwardingDestinationTag_deviceId, int64]", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "tag", TypeSize: 4}}}, @@ -2493,6 +2512,10 @@ var structDescs_arm64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "fuchsia_cobalt_EventPayloadInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_cobalt_EventPayloadInLine", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_event_count, fuchsia_cobalt_CountEventInLine]"}, FldName: "event_countInLine"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_elapsed_micros, int64]"}, FldName: "elapsed_micros"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_fps, int32]"}, FldName: "fps"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_memory_bytes_used, int64]"}, FldName: "memory_bytes_used"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_string_event, fidl_string]"}, FldName: "string_eventInLine"}, &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_cobalt_EventPayloadTag_int_histogram, fidl_vector]"}, FldName: "int_histogramInLine"}, }}}, {Key: StructKey{Name: "fuchsia_cobalt_ExperimentHandles"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_cobalt_ExperimentHandles"}, Fields: []Type{ @@ -4037,16 +4060,16 @@ var structDescs_arm64 = []*KeyedStruct{ {Key: StructKey{Name: "fuchsia_net_ConnectivityOnNetworkReachableEventHandles", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_ConnectivityOnNetworkReachableEventHandles", ArgDir: 1}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "void", ArgDir: 1}, Kind: 1}, }}}, - {Key: StructKey{Name: "fuchsia_net_IPv4AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IPv4AddressInLine", TypeSize: 4}, Fields: []Type{ + {Key: StructKey{Name: "fuchsia_net_IpAddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IpAddressInLine", TypeSize: 20}, Fields: []Type{ + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_Ipv4AddressInLine]"}, FldName: "ipv4InLine"}, + &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_Ipv6AddressInLine]"}, FldName: "ipv6InLine"}, + }}}, + {Key: StructKey{Name: "fuchsia_net_Ipv4AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_Ipv4AddressInLine", TypeSize: 4}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "addrInLine", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4}, }}}, - {Key: StructKey{Name: "fuchsia_net_IPv6AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IPv6AddressInLine", TypeSize: 16}, Fields: []Type{ + {Key: StructKey{Name: "fuchsia_net_Ipv6AddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_Ipv6AddressInLine", TypeSize: 16}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "addrInLine", TypeSize: 16}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, }}}, - {Key: StructKey{Name: "fuchsia_net_IpAddressInLine"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_IpAddressInLine", TypeSize: 20}, Fields: []Type{ - &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv4, fuchsia_net_IPv4AddressInLine]"}, FldName: "ipv4InLine"}, - &StructType{Key: StructKey{Name: "fidl_union_member[fuchsia_net_IpAddressTag_ipv6, fuchsia_net_IPv6AddressInLine]"}, FldName: "ipv6InLine"}, - }}}, {Key: StructKey{Name: "fuchsia_net_SocketControlAcceptRequest"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuchsia_net_SocketControlAcceptRequest", TypeSize: 18}, Fields: []Type{ &StructType{Key: StructKey{Name: "fidl_message_header[796734679]"}, FldName: "hdr"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "flags_", TypeSize: 2}}}, @@ -6912,11 +6935,6 @@ var syscalls_arm64 = []*Syscall{ {Name: "zx_nanosleep", CallName: "zx_nanosleep", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_time", FldName: "deadline", TypeSize: 8}}, }}, - {Name: "zx_object_get_cookie", CallName: "zx_object_get_cookie", Args: []Type{ - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "scope", TypeSize: 4}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "cookie", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8, ArgDir: 1}}}}, - }}, {Name: "zx_object_get_info$ZX_INFO_CPU_STATS", CallName: "zx_object_get_info", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_root_resource", FldName: "root_resource", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "topic", TypeSize: 8}}, Val: 16}, @@ -7043,11 +7061,6 @@ var syscalls_arm64 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "value", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "size", TypeSize: 8}}, Buf: "value"}, }}, - {Name: "zx_object_set_cookie", CallName: "zx_object_set_cookie", Args: []Type{ - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "scope", TypeSize: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "cookie", TypeSize: 8}}}, - }}, {Name: "zx_object_set_profile", CallName: "zx_object_set_profile", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "handle", TypeSize: 4}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "zx_handle", FldName: "profile", TypeSize: 4}}, @@ -7530,8 +7543,12 @@ var consts_arm64 = []ConstValue{ {Name: "ZX_VM_FLAG_SPECIFIC_OVERWRITE", Value: 32}, {Name: "ZX_WAIT_ASYNC_ONCE"}, {Name: "ZX_WAIT_ASYNC_REPEATING", Value: 1}, + {Name: "fuchsia_cobalt_EventPayloadTag_elapsed_micros", Value: 1}, {Name: "fuchsia_cobalt_EventPayloadTag_event_count"}, - {Name: "fuchsia_cobalt_EventPayloadTag_int_histogram", Value: 1}, + {Name: "fuchsia_cobalt_EventPayloadTag_fps", Value: 2}, + {Name: "fuchsia_cobalt_EventPayloadTag_int_histogram", Value: 5}, + {Name: "fuchsia_cobalt_EventPayloadTag_memory_bytes_used", Value: 3}, + {Name: "fuchsia_cobalt_EventPayloadTag_string_event", Value: 4}, {Name: "fuchsia_cobalt_ReleaseStage_DEBUG", Value: 99}, {Name: "fuchsia_cobalt_ReleaseStage_DOGFOOD", Value: 10}, {Name: "fuchsia_cobalt_ReleaseStage_FISHFOOD", Value: 20}, @@ -7553,4 +7570,4 @@ var consts_arm64 = []ConstValue{ {Name: "fuchsia_power_Status_OK"}, } -const revision_arm64 = "5ab08273640c510138a91dd86566ef165515c1f1" +const revision_arm64 = "754794d4928bd434528018e077e9147502dac975" diff --git a/sys/fuchsia/objects.txt b/sys/fuchsia/objects.txt index 01a8293b7..04aa67960 100644 --- a/sys/fuchsia/objects.txt +++ b/sys/fuchsia/objects.txt @@ -9,8 +9,6 @@ resource koid[int64]: 0 # TODO: temporary disabled as it crashes kernel left and right. # zx_object_get_child(handle zx_handle, koid koid, rights flags[zx_rights], out ptr[out, zx_handle]) -zx_object_get_cookie(handle zx_handle, scope zx_handle, cookie ptr[out, int64]) -zx_object_set_cookie(handle zx_handle, scope zx_handle, cookie int64) zx_object_get_info$ZX_INFO_HANDLE_VALID(handle zx_handle, topic const[ZX_INFO_HANDLE_VALID], buffer const[0], buffer_size const[0], actual ptr[out, intptr], avail ptr[out, intptr]) zx_object_get_info$ZX_INFO_HANDLE_BASIC(handle zx_handle, topic const[ZX_INFO_HANDLE_BASIC], buffer ptr[out, zx_info_handle_basic], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr]) zx_object_get_info$ZX_INFO_PROCESS(handle zx_process, topic const[ZX_INFO_PROCESS], buffer ptr[out, zx_info_process], buffer_size bytesize[buffer], actual ptr[out, intptr], avail ptr[out, intptr]) |
