| … | |
… | |
| 4 | use strict; |
4 | use strict; |
| 5 | |
5 | |
| 6 | use Symbol; |
6 | use Symbol; |
| 7 | use List::Util; |
7 | use List::Util; |
| 8 | use Socket; |
8 | use Socket; |
| 9 | use Storable; |
|
|
| 10 | use Event; |
9 | use Event; |
| 11 | use Opcode; |
10 | use Opcode; |
| 12 | use Safe; |
11 | use Safe; |
| 13 | use Safe::Hole; |
12 | use Safe::Hole; |
|
|
13 | use Storable (); |
| 14 | |
14 | |
| 15 | use Coro 4.1 (); |
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; |
| … | |
… | |
| 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# |
432 | LOG llevError, Carp::longmess "sync job";#d# |
| 433 | |
433 | |
| 434 | # TODO: use suspend/resume instead |
434 | # TODO: use suspend/resume instead |
| 435 | # (but this is cancel-safe) |
435 | # (but this is cancel-safe) |
| 436 | my $freeze_guard = freeze_mainloop; |
436 | my $freeze_guard = freeze_mainloop; |
| 437 | |
437 | |
| … | |
… | |
| 971 | # |
971 | # |
| 972 | |
972 | |
| 973 | sub _can_merge { |
973 | sub _can_merge { |
| 974 | my ($ob1, $ob2) = @_; |
974 | my ($ob1, $ob2) = @_; |
| 975 | |
975 | |
|
|
976 | return 1;#d# |
|
|
977 | |
|
|
978 | #todo#d# kill yourself and do some recursive checking manually without storable |
|
|
979 | sync_job { |
|
|
980 | my $guard = Coro::Storable::guard; |
| 976 | local $Storable::canonical = 1; |
981 | local $Storable::canonical = 1; |
| 977 | my $fob1 = Storable::freeze $ob1; |
982 | my $fob1 = Storable::freeze $ob1; |
| 978 | my $fob2 = Storable::freeze $ob2; |
983 | my $fob2 = Storable::freeze $ob2; |
| 979 | |
|
|
| 980 | $fob1 eq $fob2 |
984 | $fob1 eq $fob2 |
|
|
985 | } |
| 981 | } |
986 | } |
| 982 | |
987 | |
| 983 | sub reattach { |
988 | sub reattach { |
| 984 | # basically do the same as instantiate, without calling instantiate |
989 | # basically do the same as instantiate, without calling instantiate |
| 985 | my ($obj) = @_; |
990 | my ($obj) = @_; |
| … | |
… | |
| 1046 | close $fh; |
1051 | close $fh; |
| 1047 | |
1052 | |
| 1048 | if (@$objs) { |
1053 | if (@$objs) { |
| 1049 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1054 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
| 1050 | chmod SAVE_MODE, $fh; |
1055 | chmod SAVE_MODE, $fh; |
| 1051 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1056 | my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; |
| 1052 | aio_write $fh, 0, (length $data), $data, 0; |
1057 | aio_write $fh, 0, (length $data), $data, 0; |
| 1053 | aio_fsync $fh if $cf::USE_FSYNC; |
1058 | aio_fsync $fh if $cf::USE_FSYNC; |
| 1054 | close $fh; |
1059 | close $fh; |
| 1055 | aio_rename "$filename.pst~", "$filename.pst"; |
1060 | aio_rename "$filename.pst~", "$filename.pst"; |
| 1056 | } |
1061 | } |
| … | |
… | |
| 2896 | =pod |
2901 | =pod |
| 2897 | |
2902 | |
| 2898 | The following functions and methods are available within a safe environment: |
2903 | The following functions and methods are available within a safe environment: |
| 2899 | |
2904 | |
| 2900 | cf::object |
2905 | cf::object |
| 2901 | contr pay_amount pay_player map x y force_find force_add |
2906 | contr pay_amount pay_player map x y force_find force_add destroy |
| 2902 | insert remove name archname title slaying race decrease_ob_nr |
2907 | insert remove name archname title slaying race decrease_ob_nr |
| 2903 | |
2908 | |
| 2904 | cf::object::player |
2909 | cf::object::player |
| 2905 | player |
2910 | player |
| 2906 | |
2911 | |
| … | |
… | |
| 2913 | =cut |
2918 | =cut |
| 2914 | |
2919 | |
| 2915 | for ( |
2920 | for ( |
| 2916 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2921 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
| 2917 | insert remove inv name archname title slaying race |
2922 | insert remove inv name archname title slaying race |
| 2918 | decrease_ob_nr)], |
2923 | decrease_ob_nr destroy)], |
| 2919 | ["cf::object::player" => qw(player)], |
2924 | ["cf::object::player" => qw(player)], |
| 2920 | ["cf::player" => qw(peaceful)], |
2925 | ["cf::player" => qw(peaceful)], |
| 2921 | ["cf::map" => qw(trigger)], |
2926 | ["cf::map" => qw(trigger)], |
| 2922 | ) { |
2927 | ) { |
| 2923 | no strict 'refs'; |
2928 | no strict 'refs'; |
