pixelflut 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4e6890a9d13b0f4b2149dd49c8add1decaaa6876a62c1f9200d4c1b2d6f36ced
4
- data.tar.gz: 7364299d22932c514afea765f5cb13a3c4d85d8b6c649330d1761ce6733126d3
3
+ metadata.gz: 9a8c4704485bf4a35acc4f0b1c9b65ef293ded291aa5417968e4780774a83b41
4
+ data.tar.gz: '00348e57cbe2fcfda2df1fcd5746ea81dc5f0e06601bdff720d49ca6b69a94ed'
5
5
  SHA512:
6
- metadata.gz: be62c10bdbbb3f5e316e48143da7b5d9a2c3be7bebab0a33d8728df5d6459f254e69a83f99e93d18068f31835ca8bc25adf5356ba345c46dabb926faf08b367c
7
- data.tar.gz: 4210b816ff0cb3ed146c95e4301fc242d399b3d3065dbd9c9e1ebb829b9ab50ef683f95188ba5f7e6db927916eaace45061753b77ca19d7165d1001a366adb2d
6
+ metadata.gz: 8e26260e01d19e3f40d7da2e58f34549407f110b4ad6e0f7caba4906391e248363ddb54d2ee6386dddd8b0f2a3da228ae269e171044ef64adbc931f1c25d1a94
7
+ data.tar.gz: 9968b5a018fceb59827a2e1011f27ac2cbeb14dc1bf654956db6a8eab531d9e16f827304972ff5a7131b7c05c1b72360f174bfd9e091eacfd0f87cdf5be24c5c
data/README.md CHANGED
@@ -27,16 +27,16 @@ You'll find some help on the command line:
27
27
 
28
28
  ```
29
29
  $ pxf
30
- Usage: pxf [options] <image>
30
+ Usage: pxf [options] <png_image>
31
31
 
32
32
  Options:
33
33
  --host <address> target host address (default 127.0.0.1)
34
- -p, --port <port> target port (default 1337)
34
+ -p, --port <port> target port (default 1234)
35
35
  -c, --connections <count> count of connections (default 4)
36
36
  -x, --transpose-x <x> transpose image <x> pixels
37
37
  -y, --transpose-y <y> transpose image <y> pixels
38
- -m, --mode <mode> select pixel encoding (TEXT | BIN)
39
- -t, --threads use threads instead of processes
38
+ --encode-text encode pixel in text format (default)
39
+ --encode-bin encode pixel in binary format
40
40
  -h, --help print this help
41
41
  -v, --version print version information
42
42
  ```
data/bin/pxf CHANGED
@@ -2,10 +2,10 @@
2
2
  # frozen_string_literal: true
3
3
 
4
4
  $stdout.sync = $stderr.sync = true
5
- def me = Process.setproctitle(File.basename(Process.argv0))
5
+ @me = Process.setproctitle(File.basename(Process.argv0))
6
6
 
7
7
  puts(<<~HELP) || exit if ARGV.index('-h') || ARGV.index('--help')
8
- Usage: #{me} [options] <png_image>
8
+ Usage: #{@me} [options] <png_image>
9
9
 
10
10
  Options:
11
11
  --host <address> target host address (default 127.0.0.1)
@@ -15,29 +15,25 @@ puts(<<~HELP) || exit if ARGV.index('-h') || ARGV.index('--help')
15
15
  -y, --transpose-y <y> transpose image <y> pixels
16
16
  --encode-text encode pixel in text format (default)
17
17
  --encode-bin encode pixel in binary format
18
- --use-processes use seperate processes (default)
19
- --use-threads use threads instead of processes
20
18
  -h, --help print this help
21
19
  -v, --version print version information
22
20
  HELP
23
21
 
24
22
  if ARGV.index('-v') || ARGV.index('--version')
25
23
  require_relative('../lib/pixelflut/version')
26
- puts("#{me} - Pixelflut v#{Pixelflut::VERSION}") || exit
24
+ puts("#{@me} - Pixelflut v#{Pixelflut::VERSION}") || exit
27
25
  end
28
26
 
29
- def die!(msg, code: 1) = $stderr.puts("#{me}: #{msg}") || exit(code)
30
- die!("argument missing - try `#{me} --help`") if ARGV.empty?
27
+ def die!(msg, code: 1) = $stderr.puts("#{@me}: #{msg}") || exit(code)
28
+ die!("argument missing - try `#{@me} --help`") if ARGV.empty?
31
29
 
32
30
  require_relative('../lib/pixelflut')
33
31
 
34
32
  module Configuration
35
33
  class << self
36
- attr_reader :scheduler
37
-
38
- def address
34
+ def target
39
35
  require_relative('../lib/pixelflut/sender')
40
- Pixelflut::Sender.as_address(@host || '127.0.0.1', @port || 1234)
36
+ Pixelflut::Sender.target(@host || '127.0.0.1', @port || 1234)
41
37
  end
42
38
 
43
39
  private
@@ -69,10 +65,6 @@ module Configuration
69
65
  Pixelflut.encoding = 'text'
70
66
  when '--encode-bin'
71
67
  Pixelflut.encoding = 'bin'
72
- when '--use-threads'
73
- @scheduler = :threads
74
- when '--use-processes'
75
- @scheduler = :processes
76
68
  when '-x', '--transpose-x'
77
69
  Pixelflut.delta_x = ARGV.shift.to_i
78
70
  when '-y', '--transpose-y'
@@ -86,32 +78,24 @@ module Configuration
86
78
  die!('<image> missing') unless Pixelflut.file_name
87
79
  end
88
80
 
89
- def use_threads(address, data)
90
- puts("#{me}: start #{data.size} threads for #{data.sum(&:size)} bytes")
91
- Thread.report_on_exception = false
92
- data.map! { Thread.start { Pixelflut::Sender.send(address, it) } }
93
- GC.start
94
- data.each(&:join)
95
- end
96
-
97
- def use_processes(address, data)
98
- puts("#{me}: start #{data.size} processes for #{data.sum(&:size)} bytes")
99
- data.size.times do |i|
100
- next unless fork
101
- data = data[i]
102
- GC.start
103
- me = Process.setproctitle("#{me}-#{'0' if i < 9}#{i + 1}")
104
- Pixelflut::Sender.send(address, data) { puts("#{me}: #{it} bytes") }
105
- end
81
+ def send_part(index, data, address)
82
+ @me = Process.setproctitle("#{@me}-#{'0' if index < 9}#{index + 1}")
106
83
  GC.start
84
+ Pixelflut::Sender.send(address, data) { puts("#{@me}: #{it} bytes") }
107
85
  end
108
86
 
109
87
  begin
110
- if Configuration.scheduler == :threads
111
- use_threads(Configuration.address, Pixelflut.data)
112
- else
113
- use_processes(Configuration.address, Pixelflut.data)
114
- end
88
+ name, address = Configuration.target
89
+ data = Pixelflut.data
90
+ puts <<~INFO
91
+ ruby: #{RUBY_VERSION}
92
+ image: #{Pixelflut.file_name}
93
+ server: #{name}
94
+ data: #{data.sum(&:size)} bytes
95
+ encoding: #{Pixelflut.encoding}
96
+ processes: #{data.size}
97
+ INFO
98
+ data.each_with_index { |part, idx| send_part(idx, part, address) if fork }
115
99
  rescue Errno::ECONNREFUSED
116
100
  die!('unable to connect', code: 2)
117
101
  rescue Errno::EPIPE
@@ -2,13 +2,18 @@
2
2
 
3
3
  module Pixelflut
4
4
  module Sender
5
- def self.as_address(host, port)
5
+ def self.target(host, port)
6
6
  require('socket') unless defined?(Addrinfo)
7
7
  info = Addrinfo.tcp(host, port)
8
- Address.new(
9
- Socket.pack_sockaddr_in(info.ip_port, info.ip_address),
10
- info.ipv6? ? :INET6 : :INET
11
- )
8
+ address = info.ip_address
9
+ port = info.ip_port
10
+ [
11
+ address.index(':') ? "[#{address}]:#{port}" : "#{address}:#{port}",
12
+ Address.new(
13
+ Socket.pack_sockaddr_in(port, address),
14
+ info.ipv6? ? :INET6 : :INET
15
+ )
16
+ ]
12
17
  end
13
18
 
14
19
  def self.send(address, data)
@@ -22,7 +27,7 @@ module Pixelflut
22
27
  socket.connect(address.sockaddr_in)
23
28
  socket.setsockopt(:TCP, :NODELAY, 1)
24
29
  socket.setsockopt(:SOCKET, :KEEPALIVE, 0)
25
- socket.sync = socket.do_not_reverse_lookup = true
30
+ socket.do_not_reverse_lookup = true
26
31
  socket
27
32
  end
28
33
 
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Pixelflut
4
- VERSION = '1.1.1'
4
+ VERSION = '1.1.2'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pixelflut
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Blumtritt
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
62
62
  - !ruby/object:Gem::Version
63
63
  version: '0'
64
64
  requirements: []
65
- rubygems_version: 4.0.11
65
+ rubygems_version: 4.0.20
66
66
  specification_version: 4
67
67
  summary: A fast Pixelflut client written in Ruby.
68
68
  test_files: []