Skip to content

Commit a155b34

Browse files
aardvark179aardvark179
committed
Tidy up unused constants and update Darwin aarch64.
1 parent 359314e commit a155b34

File tree

6 files changed

+8
-42
lines changed

6 files changed

+8
-42
lines changed

‎src/main/java/org/truffleruby/platform/DarwinAArch64NativeConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ public static void load(NativeConfiguration configuration, RubyContext context)
402402
configuration.config("platform.fcntl.F_GLOBAL_NOCACHE", 55);
403403
configuration.config("platform.fcntl.F_ALLOCATECONTIG", 2);
404404
configuration.config("platform.fcntl.F_ALLOCATEALL", 4);
405+
configuration.config("platform.poll.POLLIN", 1);
406+
configuration.config("platform.poll.POLLPRI", 2);
407+
configuration.config("platform.poll.POLLOUT", 4);
405408
configuration.config("platform.socket.AF_APPLETALK", 16);
406409
configuration.config("platform.socket.PF_APPLETALK", 16);
407410
configuration.config("platform.socket.AF_INET", 2);

‎src/main/java/org/truffleruby/platform/DarwinAMD64NativeConfiguration.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,6 @@ public static void load(NativeConfiguration configuration, RubyContext context)
196196
configuration.config("platform.msghdr.msg_flags.offset", 44);
197197
configuration.config("platform.msghdr.msg_flags.size", 4);
198198
configuration.config("platform.msghdr.msg_flags.type", string(context, "int"));
199-
configuration.config("platform.pollfd.sizeof", 8);
200-
configuration.config("platform.pollfd.fd.offset", 0);
201-
configuration.config("platform.pollfd.fd.size", 4);
202-
configuration.config("platform.pollfd.fd.type", string(context, "int"));
203-
configuration.config("platform.pollfd.events.offset", 4);
204-
configuration.config("platform.pollfd.events.size", 2);
205-
configuration.config("platform.pollfd.events.type", string(context, "short"));
206-
configuration.config("platform.pollfd.revents.offset", 6);
207-
configuration.config("platform.pollfd.revents.size", 2);
208-
configuration.config("platform.pollfd.revents.type", string(context, "short"));
209199
configuration.config("platform.servent.sizeof", 32);
210200
configuration.config("platform.servent.s_name.offset", 0);
211201
configuration.config("platform.servent.s_name.size", 8);
@@ -413,6 +403,7 @@ public static void load(NativeConfiguration configuration, RubyContext context)
413403
configuration.config("platform.fcntl.F_ALLOCATECONTIG", 2);
414404
configuration.config("platform.fcntl.F_ALLOCATEALL", 4);
415405
configuration.config("platform.poll.POLLIN", 1);
406+
configuration.config("platform.poll.POLLPRI", 2);
416407
configuration.config("platform.poll.POLLOUT", 4);
417408
configuration.config("platform.socket.AF_APPLETALK", 16);
418409
configuration.config("platform.socket.PF_APPLETALK", 16);

‎src/main/java/org/truffleruby/platform/LinuxAArch64NativeConfiguration.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,6 @@ public static void load(NativeConfiguration configuration, RubyContext context)
196196
configuration.config("platform.msghdr.msg_flags.offset", 48);
197197
configuration.config("platform.msghdr.msg_flags.size", 4);
198198
configuration.config("platform.msghdr.msg_flags.type", string(context, "int"));
199-
configuration.config("platform.pollfd.sizeof", 8);
200-
configuration.config("platform.pollfd.fd.offset", 0);
201-
configuration.config("platform.pollfd.fd.size", 4);
202-
configuration.config("platform.pollfd.fd.type", string(context, "int"));
203-
configuration.config("platform.pollfd.events.offset", 4);
204-
configuration.config("platform.pollfd.events.size", 2);
205-
configuration.config("platform.pollfd.events.type", string(context, "short"));
206-
configuration.config("platform.pollfd.revents.offset", 6);
207-
configuration.config("platform.pollfd.revents.size", 2);
208-
configuration.config("platform.pollfd.revents.type", string(context, "short"));
209199
configuration.config("platform.servent.sizeof", 32);
210200
configuration.config("platform.servent.s_name.offset", 0);
211201
configuration.config("platform.servent.s_name.size", 8);
@@ -424,6 +414,7 @@ public static void load(NativeConfiguration configuration, RubyContext context)
424414
configuration.config("platform.fcntl.F_UNLCK", 2);
425415
configuration.config("platform.fcntl.F_WRLCK", 1);
426416
configuration.config("platform.poll.POLLIN", 1);
417+
configuration.config("platform.poll.POLLPRI", 2);
427418
configuration.config("platform.poll.POLLOUT", 4);
428419
configuration.config("platform.socket.AF_APPLETALK", 5);
429420
configuration.config("platform.socket.PF_APPLETALK", 5);

‎src/main/java/org/truffleruby/platform/LinuxAMD64NativeConfiguration.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,6 @@ public static void load(NativeConfiguration configuration, RubyContext context)
196196
configuration.config("platform.msghdr.msg_flags.offset", 48);
197197
configuration.config("platform.msghdr.msg_flags.size", 4);
198198
configuration.config("platform.msghdr.msg_flags.type", string(context, "int"));
199-
configuration.config("platform.pollfd.sizeof", 8);
200-
configuration.config("platform.pollfd.fd.offset", 0);
201-
configuration.config("platform.pollfd.fd.size", 4);
202-
configuration.config("platform.pollfd.fd.type", string(context, "int"));
203-
configuration.config("platform.pollfd.events.offset", 4);
204-
configuration.config("platform.pollfd.events.size", 2);
205-
configuration.config("platform.pollfd.events.type", string(context, "short"));
206-
configuration.config("platform.pollfd.revents.offset", 6);
207-
configuration.config("platform.pollfd.revents.size", 2);
208-
configuration.config("platform.pollfd.revents.type", string(context, "short"));
209199
configuration.config("platform.servent.sizeof", 32);
210200
configuration.config("platform.servent.s_name.offset", 0);
211201
configuration.config("platform.servent.s_name.size", 8);
@@ -424,6 +414,7 @@ public static void load(NativeConfiguration configuration, RubyContext context)
424414
configuration.config("platform.fcntl.F_UNLCK", 2);
425415
configuration.config("platform.fcntl.F_WRLCK", 1);
426416
configuration.config("platform.poll.POLLIN", 1);
417+
configuration.config("platform.poll.POLLPRI", 2);
427418
configuration.config("platform.poll.POLLOUT", 4);
428419
configuration.config("platform.socket.AF_APPLETALK", 5);
429420
configuration.config("platform.socket.PF_APPLETALK", 5);

‎src/main/ruby/truffleruby/core/truffle/io_operations.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ module Truffle
1212
module IOOperations
1313

1414
POLLIN = Truffle::Config['platform.poll.POLLIN']
15+
POLLPRI = Truffle::Config['platform.poll.POLLPRI']
1516
POLLOUT = Truffle::Config['platform.poll.POLLOUT']
1617

17-
POLLFD_SIZE = Truffle::Config['platform.pollfd.sizeof']
18-
POLLFD_FD_OFFSET = Truffle::Config['platform.pollfd.fd.offset']
19-
POLLFD_EVENTS_OFFSET = Truffle::Config['platform.pollfd.events.offset']
20-
2118
def self.print(io, args, last_line_storage)
2219
if args.empty?
2320
raise 'last_line_binding is required' if Primitive.nil? last_line_storage

‎tool/generate-native-config.rb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -563,13 +563,6 @@ def constants(name)
563563
s.field :msg_flags
564564
end
565565

566-
struct 'pollfd' do |s|
567-
s.include 'poll.h'
568-
s.field 'fd'
569-
s.field 'events'
570-
s.field 'revents'
571-
end
572-
573566
struct 'servent' do |s|
574567
s.include 'netdb.h'
575568
s.field :s_name
@@ -646,7 +639,7 @@ def constants(name)
646639
constants 'poll' do |cg|
647640
cg.include 'poll.h'
648641
cg.consts %w[
649-
POLLIN POLLOUT
642+
POLLIN POLLPRI POLLOUT
650643
]
651644
end
652645

0 commit comments

Comments
 (0)