Mercurial > touhou
annotate pytouhou/network.py @ 484:699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
| author | Thibaut Girka <thib@sitedethib.com> |
|---|---|
| date | Thu, 29 Dec 2011 10:35:54 +0100 |
| parents | 216107767b8a |
| children | c099802e2435 |
| rev | line source |
|---|---|
| 475 | 1 import socket |
| 2 import struct | |
| 3 from select import select | |
|
483
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
4 import time |
| 475 | 5 |
|
483
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
6 MSG_STRUCT = struct.Struct('!IHH') |
| 475 | 7 |
| 8 class Network(object): | |
|
479
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
9 def __init__(self, port=8080, dest=None, selected_player=0): |
| 475 | 10 self.frame = 0 |
| 11 self.keystate = 0 | |
| 12 self.old_keystate = 0 | |
| 13 | |
|
479
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
14 self.selected_player = selected_player |
|
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
15 |
| 475 | 16 self.remote_addr = dest |
| 17 self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) | |
| 18 self.sock.bind(('', port)) | |
| 19 | |
| 20 | |
|
484
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
21 def read_message(self): |
|
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
22 message = None |
| 475 | 23 |
|
483
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
24 start_time = time.time() |
|
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
25 delta = 1./60. |
|
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
26 |
|
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
27 rlist, wlist, xlist = select([self.sock], [], [], delta) |
| 475 | 28 while rlist: |
| 29 msg, addr = rlist[0].recvfrom(MSG_STRUCT.size) | |
| 30 # Check whether the message comes from the right address | |
|
484
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
31 if self.frame == 0 or addr == self.remote_addr: |
| 475 | 32 self.remote_addr = addr |
| 33 | |
|
483
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
34 frame, keystate, old_keystate = MSG_STRUCT.unpack(msg) |
| 475 | 35 |
| 36 # Check for well-formedness | |
|
483
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
37 if frame in (self.frame, self.frame + 1): |
|
484
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
38 message = (frame, keystate, old_keystate) |
| 475 | 39 else: |
| 40 print('Mismatch', self.remote_addr, addr) | |
| 41 | |
|
484
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
42 # If no valid message has been read, wait for one as long as possible |
|
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
43 # else, read as much as we can without blocking. |
|
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
44 delta = 0 if message else max(0, 1./60. - (time.time() - start_time)) |
|
483
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
45 rlist, wlist, xlist = select(rlist, [], [], delta) |
|
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
46 |
|
484
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
47 return message |
| 475 | 48 |
| 49 | |
| 50 def send_message(self): | |
| 51 frame, keystate, old_keystate = self.frame, self.keystate, self.old_keystate | |
| 52 if self.remote_addr is not None: | |
|
483
216107767b8a
Remove useless checksum, and wait as long as possible for valid packets (do not stop waiting on invalid packets)
Thibaut Girka <thib@sitedethib.com>
parents:
482
diff
changeset
|
53 self.sock.sendto(MSG_STRUCT.pack(frame, keystate, old_keystate), self.remote_addr) |
| 475 | 54 |
| 55 | |
|
479
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
56 def run_game_iter(self, game, keystate, other_keystate): |
|
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
57 keystates = [other_keystate, other_keystate] |
|
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
58 keystates[self.selected_player] = keystate |
|
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
59 game.run_iter(keystates) |
|
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
60 |
|
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
61 |
| 475 | 62 def run_iter(self, game, keystate): |
| 63 if self.frame < game.frame: | |
| 64 self.old_keystate, self.keystate = self.keystate, keystate | |
| 65 self.frame = game.frame | |
| 66 | |
|
480
d666856acb52
Hopefully improve performance
Thibaut Girka <thib@sitedethib.com>
parents:
479
diff
changeset
|
67 self.send_message() |
|
d666856acb52
Hopefully improve performance
Thibaut Girka <thib@sitedethib.com>
parents:
479
diff
changeset
|
68 |
|
484
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
69 # Follow one valid update |
|
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
70 message = self.read_message() |
|
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
71 if message: |
|
699c8e8c7738
Don't stick with the remote user unless the game has started, avoid skipping to prevent desynchro
Thibaut Girka <thib@sitedethib.com>
parents:
483
diff
changeset
|
72 frame, keystate, old_keystate = message |
| 475 | 73 if frame == game.frame: |
|
479
1de67f332f00
Fix several synchro issues
Thibaut Girka <thib@sitedethib.com>
parents:
478
diff
changeset
|
74 self.run_game_iter(game, self.keystate, keystate) |
| 475 | 75 elif frame == game.frame + 1: |
|
482
f6e44398afa5
Fix a synchro issue... again...
Thibaut Girka <thib@sitedethib.com>
parents:
481
diff
changeset
|
76 self.run_game_iter(game, self.keystate, old_keystate) |
| 475 | 77 |