… | |
… | |
10 | use Event; |
10 | use Event; |
11 | use Opcode; |
11 | use Opcode; |
12 | use Safe; |
12 | use Safe; |
13 | use Safe::Hole; |
13 | use Safe::Hole; |
14 | |
14 | |
15 | use Coro 3.64 (); |
15 | use Coro 4.1 (); |
16 | use Coro::State; |
16 | use Coro::State; |
17 | use Coro::Handle; |
17 | use Coro::Handle; |
18 | use Coro::Event; |
18 | use Coro::Event; |
19 | use Coro::Timer; |
19 | use Coro::Timer; |
20 | use Coro::Signal; |
20 | use Coro::Signal; |
… | |
… | |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
32 | use IO::AIO 2.32 (); |
32 | use IO::AIO 2.51 (); |
33 | use Time::HiRes; |
33 | use Time::HiRes; |
34 | use Compress::LZF; |
34 | use Compress::LZF; |
35 | use Digest::MD5 (); |
35 | use Digest::MD5 (); |
36 | |
36 | |
37 | # configure various modules to our taste |
37 | # configure various modules to our taste |
… | |
… | |
373 | } |
373 | } |
374 | } |
374 | } |
375 | } |
375 | } |
376 | |
376 | |
377 | if (@SLOT_QUEUE) { |
377 | if (@SLOT_QUEUE) { |
378 | # we do not use wait_For_tick() as it returns immediately when tick is inactive |
378 | # we do not use wait_for_tick() as it returns immediately when tick is inactive |
379 | push @cf::WAIT_FOR_TICK, $signal; |
379 | push @cf::WAIT_FOR_TICK, $signal; |
380 | $signal->wait; |
380 | $signal->wait; |
381 | } else { |
381 | } else { |
382 | Coro::schedule; |
382 | Coro::schedule; |
383 | } |
383 | } |
… | |
… | |
427 | my $time = Event::time; |
427 | my $time = Event::time; |
428 | |
428 | |
429 | # this is the main coro, too bad, we have to block |
429 | # this is the main coro, too bad, we have to block |
430 | # till the operation succeeds, freezing the server :/ |
430 | # till the operation succeeds, freezing the server :/ |
431 | |
431 | |
|
|
432 | LOG llevError | logBacktrace, Carp::longmess "sync job";#d# |
|
|
433 | |
432 | # TODO: use suspend/resume instead |
434 | # TODO: use suspend/resume instead |
433 | # (but this is cancel-safe) |
435 | # (but this is cancel-safe) |
434 | my $freeze_guard = freeze_mainloop; |
436 | my $freeze_guard = freeze_mainloop; |
435 | |
437 | |
436 | my $busy = 1; |
438 | my $busy = 1; |
… | |
… | |
1044 | close $fh; |
1046 | close $fh; |
1045 | |
1047 | |
1046 | if (@$objs) { |
1048 | if (@$objs) { |
1047 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1049 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1048 | chmod SAVE_MODE, $fh; |
1050 | chmod SAVE_MODE, $fh; |
1049 | my $data = Storable::nfreeze { version => 1, objs => $objs }; |
1051 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1050 | aio_write $fh, 0, (length $data), $data, 0; |
1052 | aio_write $fh, 0, (length $data), $data, 0; |
1051 | aio_fsync $fh if $cf::USE_FSYNC; |
1053 | aio_fsync $fh if $cf::USE_FSYNC; |
1052 | close $fh; |
1054 | close $fh; |
1053 | aio_rename "$filename.pst~", "$filename.pst"; |
1055 | aio_rename "$filename.pst~", "$filename.pst"; |
1054 | } |
1056 | } |
… | |
… | |
1085 | |
1087 | |
1086 | unless (aio_stat "$filename.pst") { |
1088 | unless (aio_stat "$filename.pst") { |
1087 | (aio_load "$filename.pst", $av) >= 0 |
1089 | (aio_load "$filename.pst", $av) >= 0 |
1088 | or return; |
1090 | or return; |
1089 | |
1091 | |
1090 | $av = eval { (Storable::thaw $av)->{objs} }; |
1092 | my $st = eval { Coro::Storable::thaw $av } |
|
|
1093 | || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove |
|
|
1094 | $av = $st->{objs}; |
1091 | } |
1095 | } |
1092 | |
1096 | |
1093 | utf8::decode (my $decname = $filename); |
1097 | utf8::decode (my $decname = $filename); |
1094 | warn sprintf "loading %s (%d,%d)\n", |
1098 | warn sprintf "loading %s (%d,%d)\n", |
1095 | $decname, length $data, scalar @{$av || []}; |
1099 | $decname, length $data, scalar @{$av || []}; |
… | |
… | |
2273 | =cut |
2277 | =cut |
2274 | |
2278 | |
2275 | sub deref { |
2279 | sub deref { |
2276 | my ($ref) = @_; |
2280 | my ($ref) = @_; |
2277 | |
2281 | |
2278 | # temporary compatibility#TODO#remove |
|
|
2279 | $ref =~ s{^<}{player/<}; |
|
|
2280 | |
|
|
2281 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
2282 | if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) { |
2282 | my ($uuid, $name) = ($1, $2); |
2283 | my ($uuid, $name) = ($1, $2); |
2283 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
2284 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
2284 | or return; |
2285 | or return; |
2285 | $pl->ob->uuid eq $uuid |
2286 | $pl->ob->uuid eq $uuid |
2286 | or return; |
2287 | or return; |
… | |
… | |
3626 | $AIO_POLL_WATCHER = Event->io ( |
3627 | $AIO_POLL_WATCHER = Event->io ( |
3627 | reentrant => 0, |
3628 | reentrant => 0, |
3628 | data => WF_AUTOCANCEL, |
3629 | data => WF_AUTOCANCEL, |
3629 | fd => IO::AIO::poll_fileno, |
3630 | fd => IO::AIO::poll_fileno, |
3630 | poll => 'r', |
3631 | poll => 'r', |
3631 | prio => 6, |
3632 | prio => 0, |
3632 | cb => \&IO::AIO::poll_cb, |
3633 | cb => \&IO::AIO::poll_cb, |
3633 | ); |
3634 | ); |
3634 | } |
3635 | } |
3635 | |
3636 | |
3636 | my $_log_backtrace; |
3637 | my $_log_backtrace; |