Skip to content

Commit 551d69c

Browse files
committed
Move Profuse_7_8.Struct signature to Profuse_signatures.
1 parent b0d3750 commit 551d69c

File tree

2 files changed

+117
-99
lines changed

2 files changed

+117
-99
lines changed

lib/profuse_7_8.mli

Lines changed: 3 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -11,79 +11,9 @@ end
1111

1212
type 'a structure = 'a Types.structure
1313

14-
module Struct : sig
15-
module T = Types.Struct
16-
module Kstatfs : sig
17-
module T = T.Kstatfs
18-
19-
val store :
20-
blocks:Unsigned.uint64 ->
21-
bfree:Unsigned.uint64 ->
22-
bavail:Unsigned.uint64 ->
23-
files:Unsigned.uint64 ->
24-
ffree:Unsigned.uint64 ->
25-
bsize:Unsigned.uint32 ->
26-
namelen:Unsigned.uint32 ->
27-
frsize:Unsigned.uint32 ->
28-
T.t structure -> unit
29-
30-
val create :
31-
blocks:Unsigned.uint64 ->
32-
bfree:Unsigned.uint64 ->
33-
bavail:Unsigned.uint64 ->
34-
files:Unsigned.uint64 ->
35-
ffree:Unsigned.uint64 ->
36-
bsize:Unsigned.uint32 ->
37-
namelen:Unsigned.uint32 ->
38-
frsize:Unsigned.uint32 ->
39-
unit -> T.t structure
40-
end
41-
42-
module File_lock : sig
43-
module T = T.File_lock
44-
end
45-
46-
module Attr : sig
47-
module T = T.Attr
48-
49-
val store :
50-
ino:Unsigned.uint64 ->
51-
size:Unsigned.uint64 ->
52-
blocks:Unsigned.uint64 ->
53-
atime:Unsigned.uint64 ->
54-
mtime:Unsigned.uint64 ->
55-
ctime:Unsigned.uint64 ->
56-
atimensec:Unsigned.uint32 ->
57-
mtimensec:Unsigned.uint32 ->
58-
ctimensec:Unsigned.uint32 ->
59-
mode:Unsigned.uint32 ->
60-
nlink:Unsigned.uint32 ->
61-
uid:Unsigned.uint32 ->
62-
gid:Unsigned.uint32 ->
63-
rdev:Unsigned.uint32 ->
64-
T.t structure -> unit
65-
66-
val create :
67-
ino:Unsigned.uint64 ->
68-
size:Unsigned.uint64 ->
69-
blocks:Unsigned.uint64 ->
70-
atime:Unsigned.uint64 ->
71-
mtime:Unsigned.uint64 ->
72-
ctime:Unsigned.uint64 ->
73-
atimensec:Unsigned.uint32 ->
74-
mtimensec:Unsigned.uint32 ->
75-
ctimensec:Unsigned.uint32 ->
76-
mode:Unsigned.uint32 ->
77-
nlink:Unsigned.uint32 ->
78-
uid:Unsigned.uint32 ->
79-
gid:Unsigned.uint32 ->
80-
rdev:Unsigned.uint32 ->
81-
unit -> T.t structure
82-
83-
val describe : host:Host.t -> T.t structure -> string
84-
85-
end
86-
end
14+
module Struct : Profuse_signatures.Signatures_7_8_struct
15+
with module T = Types.Struct
16+
and type host_t := Host.t
8717

8818
module In : Profuse_signatures.Signatures_7_8_in
8919
with module Struct := Types.Struct

lib/profuse_signatures.ml

Lines changed: 114 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,82 @@ module Signatures_7_8 =
765765
struct
766766
type 'a structure = 'a Ctypes.structure
767767

768+
module Struct = struct
769+
module type Kstatfs = sig
770+
module Types : Types_7_8_struct
771+
module T = Types.Kstatfs
772+
773+
val store :
774+
blocks:Unsigned.uint64 ->
775+
bfree:Unsigned.uint64 ->
776+
bavail:Unsigned.uint64 ->
777+
files:Unsigned.uint64 ->
778+
ffree:Unsigned.uint64 ->
779+
bsize:Unsigned.uint32 ->
780+
namelen:Unsigned.uint32 ->
781+
frsize:Unsigned.uint32 ->
782+
T.t structure -> unit
783+
784+
val create :
785+
blocks:Unsigned.uint64 ->
786+
bfree:Unsigned.uint64 ->
787+
bavail:Unsigned.uint64 ->
788+
files:Unsigned.uint64 ->
789+
ffree:Unsigned.uint64 ->
790+
bsize:Unsigned.uint32 ->
791+
namelen:Unsigned.uint32 ->
792+
frsize:Unsigned.uint32 ->
793+
unit -> T.t structure
794+
end
795+
796+
module type File_lock = sig
797+
module Types : Types_7_8_struct
798+
module T = Types.File_lock
799+
end
800+
801+
module type Attr = sig
802+
module Types : Types_7_8_struct
803+
module T = Types.Attr
804+
805+
val store :
806+
ino:Unsigned.uint64 ->
807+
size:Unsigned.uint64 ->
808+
blocks:Unsigned.uint64 ->
809+
atime:Unsigned.uint64 ->
810+
mtime:Unsigned.uint64 ->
811+
ctime:Unsigned.uint64 ->
812+
atimensec:Unsigned.uint32 ->
813+
mtimensec:Unsigned.uint32 ->
814+
ctimensec:Unsigned.uint32 ->
815+
mode:Unsigned.uint32 ->
816+
nlink:Unsigned.uint32 ->
817+
uid:Unsigned.uint32 ->
818+
gid:Unsigned.uint32 ->
819+
rdev:Unsigned.uint32 ->
820+
T.t structure -> unit
821+
822+
val create :
823+
ino:Unsigned.uint64 ->
824+
size:Unsigned.uint64 ->
825+
blocks:Unsigned.uint64 ->
826+
atime:Unsigned.uint64 ->
827+
mtime:Unsigned.uint64 ->
828+
ctime:Unsigned.uint64 ->
829+
atimensec:Unsigned.uint32 ->
830+
mtimensec:Unsigned.uint32 ->
831+
ctimensec:Unsigned.uint32 ->
832+
mode:Unsigned.uint32 ->
833+
nlink:Unsigned.uint32 ->
834+
uid:Unsigned.uint32 ->
835+
gid:Unsigned.uint32 ->
836+
rdev:Unsigned.uint32 ->
837+
unit -> T.t structure
838+
839+
type host_t
840+
val describe : host:host_t -> T.t structure -> string
841+
end
842+
end
843+
768844
module In = struct
769845
module type Opcode = sig
770846
module Struct : Types_7_8_struct
@@ -1025,79 +1101,91 @@ struct
10251101
end
10261102
end
10271103

1104+
module type Signatures_7_8_struct = sig
1105+
module T : Types_7_8_struct
1106+
type host_t
1107+
1108+
module Kstatfs : Signatures_7_8.Struct.Kstatfs
1109+
with module Types := T
1110+
module File_lock : Signatures_7_8.Struct.File_lock
1111+
with module Types := T
1112+
module Attr : Signatures_7_8.Struct.Attr
1113+
with module Types := T
1114+
with type host_t := host_t
1115+
end
1116+
1117+
10281118
module type Signatures_7_8_in = sig
10291119
module Struct : Types_7_8_struct
10301120
module T : Types_7_8_in with module Struct := Struct
1031-
open Signatures_7_8
1032-
open In
10331121

10341122
type chan
10351123
type ('h, 'b) packet
10361124

1037-
module Opcode : Opcode
1125+
module Opcode : Signatures_7_8.In.Opcode
10381126
with module Struct := Struct
10391127
with module Types := T
1040-
module Hdr : Hdr with type opcode_t := Opcode.t
1128+
module Hdr : Signatures_7_8.In.Hdr with type opcode_t := Opcode.t
10411129
with module Struct := Struct
10421130
with module Types := T
1043-
module Init : Init
1131+
module Init : Signatures_7_8.In.Init
10441132
with module Struct := Struct
10451133
with module Types := T
1046-
module Open : Open
1134+
module Open : Signatures_7_8.In.Open
10471135
with module Struct := Struct
10481136
with module Types := T
1049-
module Read : Read
1137+
module Read : Signatures_7_8.In.Read
10501138
with module Struct := Struct
10511139
with module Types := T
1052-
module Release : Release
1140+
module Release : Signatures_7_8.In.Release
10531141
with module Struct := Struct
10541142
with module Types := T
1055-
module Access : Access
1143+
module Access : Signatures_7_8.In.Access
10561144
with module Struct := Struct
10571145
with module Types := T
1058-
module Forget : Forget
1146+
module Forget : Signatures_7_8.In.Forget
10591147
with module Struct := Struct
10601148
with module Types := T
1061-
module Flush : Flush
1149+
module Flush : Signatures_7_8.In.Flush
10621150
with module Struct := Struct
10631151
with module Types := T
1064-
module Create : Create
1152+
module Create : Signatures_7_8.In.Create
10651153
with module Struct := Struct
10661154
with module Types := T
1067-
module Mknod : Mknod
1155+
module Mknod : Signatures_7_8.In.Mknod
10681156
with module Struct := Struct
10691157
with module Types := T
1070-
module Mkdir : Mkdir
1158+
module Mkdir : Signatures_7_8.In.Mkdir
10711159
with module Struct := Struct
10721160
with module Types := T
1073-
module Rename : Rename
1161+
module Rename : Signatures_7_8.In.Rename
10741162
with module Struct := Struct
10751163
with module Types := T
1076-
module Link : Link
1164+
module Link : Signatures_7_8.In.Link
10771165
with module Struct := Struct
10781166
with module Types := T
1079-
module Write : Write
1167+
module Write : Signatures_7_8.In.Write
10801168
with module Struct := Struct
10811169
with module Types := T
1082-
module Fsync : Fsync
1170+
module Fsync : Signatures_7_8.In.Fsync
10831171
with module Struct := Struct
10841172
with module Types := T
1085-
module Lk : Lk
1173+
module Lk : Signatures_7_8.In.Lk
10861174
with module Struct := Struct
10871175
with module Types := T
1088-
module Interrupt : Interrupt
1176+
module Interrupt : Signatures_7_8.In.Interrupt
10891177
with module Struct := Struct
10901178
with module Types := T
1091-
module Bmap : Bmap
1179+
module Bmap : Signatures_7_8.In.Bmap
10921180
with module Struct := Struct
10931181
with module Types := T
1094-
module Setattr : Setattr with type hdr_t := Hdr.T.t
1182+
module Setattr : Signatures_7_8.In.Setattr with type hdr_t := Hdr.T.t
10951183
with module Struct := Struct
10961184
with module Types := T
1097-
module Getxattr : Getxattr with type hdr_t := Hdr.T.t
1185+
module Getxattr : Signatures_7_8.In.Getxattr with type hdr_t := Hdr.T.t
10981186
with module Struct := Struct
10991187
with module Types := T
1100-
module Setxattr : Setxattr with type hdr_t := Hdr.T.t
1188+
module Setxattr : Signatures_7_8.In.Setxattr with type hdr_t := Hdr.T.t
11011189
with module Struct := Struct
11021190
with module Types := T
11031191
module Message : sig
@@ -1119,7 +1207,7 @@ module type Signatures_7_8_in = sig
11191207
| Readlink
11201208
| Open of Open.T.t Ctypes.structure
11211209
| Read of Read.T.t Ctypes.structure
1122-
| Write of Write.T.t structure * char Ctypes.ptr
1210+
| Write of Write.T.t Ctypes.structure * char Ctypes.ptr
11231211
| Statfs
11241212
| Flush of Flush.T.t Ctypes.structure
11251213
| Release of Release.T.t Ctypes.structure
@@ -1140,7 +1228,7 @@ module type Signatures_7_8_in = sig
11401228
| Destroy
11411229
| Other of Opcode.t
11421230
| Unknown of int32
1143-
include Message with type t := t
1231+
include Signatures_7_8.In.Message with type t := t
11441232
and type hdr_t := Hdr.T.t
11451233
and type chan := chan
11461234
and type ('h, 'b) packet := ('h, 'b) packet

0 commit comments

Comments
 (0)