MEChat 1.2.1 → 1.2.5.pre.pause

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556b83c0aefa9cb6249f2c754d1935c62b6b8b111bae62033ccedc8ea5550675
-  data.tar.gz: f38270047e1275ea3f9a88efc5d000d201bbe5e714c999eaabae6c1f572a21e2
+  metadata.gz: bf2ec999b660eded80cb27be27389b5f5ed3cdbbb9413c794e349bfe743d6ec4
+  data.tar.gz: 9c33f89aabb6acc8e801c833947c4c4cc917990a98fb63d9ce077e861f473fcf
 SHA512:
-  metadata.gz: 8b187f484fa46fc5f3be32f4fbaec2cb03492bc62f37d92c6b520d205a362bfc7cbe9453f041957c4811223ae1352d9a40d29f73a79400c4333f72da444f9081
-  data.tar.gz: 1aff1558b26d02df3ca12a896675b8fd2d7898839c9c599a2db3df9b4b38a908cee9c73e5d9d9ed83ca9e0eb60152ddf772da129a651770150b0467c8e7b0bf1
+  metadata.gz: 90018a9598629f8e7af04f2a874a715ef9fa4bd38e93194683edd7cd7f57fc6829384aefec9b260b4a7f093542067dd1e0b3056960a61c4152cfb01fbf8affc8
+  data.tar.gz: 279a0a25e925d743405863dcbf68e392a579d469e2bb6d28b85a55a90dc66140ce7985c13fc3af08014779bf91df954c3a177aa054a780d304fdd3e4a53bc7be

data/Chat.rb

@@ -36,10 +36,21 @@ class Chat < DistributedChat::ChatService::Service
   def request_critical_section(req,_call)
     request = {:ip => Addrinfo.getaddrinfo(req.username.split(":")[0..-2].join(":"),req.username.split(":")[-1].to_i)[0], :message => req}
     if $crit_section === 0
+      @logger.info "Sent reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am not in critical section"
       send_reply ip: request[:ip]
     elsif $crit_section < 2 && request[:message].timestamp < $alg.clock
+      @logger.info "Sent reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am entering critical section but my request is newer"
       send_reply ip: request[:ip]
+    elsif $crit_section < 2 && request[:message].timestamp === $alg.clock
+      if request[:ip].ip_address + ":" + request[:ip].ip_port.to_s < @ip.ip_address + ":" + @port.to_s
+        @logger.info "Sent reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am entering critical section but my request is newer"
+        send_reply ip: request[:ip]
+      else
+        @logger.info "Delayed reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am entering critical section but my request is older"
+        $alg.requests << request
+      end
     else
+      @logger.info "Delayed reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am in critical section"
       $alg.requests << request
     end
     DistributedChat::Response.new status_code: 0

data/client.rb

@@ -70,16 +70,11 @@ class Client
     while new_msg != "exit"
     $crit_section = 1
     request_critical_section
-    sleepdur = 0
     while $alg.replies.length < $nodes.length
-      sleepdur += 0.1
-      @logger.info "#{@ip.ip_address}:#{$port.to_s} waiting for replies"
       sleep 0.1
-      if sleepdur % 5 == 0
-        puts "Waiting for replies. #{$alg.replies.length}/#{$nodes.length} replies received"
-      end
     end
     $crit_section = 2
+    gets
     $nodes.each do |node|
       chat = DistributedChat::ChatService::Stub.new("#{node.address}:#{node.port}", :this_channel_is_insecure)
       chat.send_message(DistributedChat::Request.new(username: "#{@ip.ip_address}:#{$port.to_s}", message: new_msg, timestamp: $alg.clock))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MEChat
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.5.pre.pause
 platform: ruby
 authors:
 - Lukas Kaufmann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -140,9 +140,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: