ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.256 by root, Sat Apr 21 16:56:32 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 76our $NEXT_TICK;
50our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
51 82
52our %CFG; 83our %CFG;
53 84
54our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 86our $RUNTIME;
56 87
57our %PLAYER; # all users 88our %PLAYER; # all users
58our %MAP; # all maps 89our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random";
61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 91
65# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 94
68binmode STDOUT; 95binmode STDOUT;
69binmode STDERR; 96binmode STDERR;
70 97
71# read virtual server time, if available 98# read virtual server time, if available
72unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
73 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
74 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
75 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
76} 103}
77 104
78mkdir cf::localdir; 105mkdir $_
79mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
80mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS;
83 107
84our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
109
110sub cf::map::normalise;
85 111
86############################################################################# 112#############################################################################
87 113
88=head2 GLOBAL VARIABLES 114=head2 GLOBAL VARIABLES
89 115
96=item $cf::RUNTIME 122=item $cf::RUNTIME
97 123
98The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
99every server tick. 125every server tick.
100 126
101=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
102 130
103The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
104be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
105 135
106=item $cf::NOW 136=item $cf::NOW
107 137
108The time of the last (current) server tick. 138The time of the last (current) server tick.
109 139
114=item %cf::CFG 144=item %cf::CFG
115 145
116Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 147from wherever your confdir points to.
118 148
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
120 150
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
123processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
124window of cpu time available, or simply to synchronise to the server tick.
125 154
126=back 155=back
127 156
128=cut 157=cut
129 158
130BEGIN { 159BEGIN {
131 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
132 my $msg = join "", @_; 161 my $msg = join "", @_;
133 utf8::encode $msg;
134 162
135 $msg .= "\n" 163 $msg .= "\n"
136 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
137 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
138 LOG llevError, $msg; 169 LOG llevError, $msg;
139 }; 170 };
140} 171}
141 172
142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 220 $d
190 } || "[unable to dump $_[0]: '$@']"; 221 } || "[unable to dump $_[0]: '$@']";
191} 222}
192 223
193use JSON::Syck (); # TODO# replace by JSON::PC once working 224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194 225
195=item $ref = cf::from_json $json 226=item $ref = cf::from_json $json
196 227
197Converts a JSON string into the corresponding perl data structure. 228Converts a JSON string into the corresponding perl data structure.
198 229
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 230=item $json = cf::to_json $ref
207 231
208Converts a perl data structure into its JSON representation. 232Converts a perl data structure into its JSON representation.
209
210=cut
211
212sub to_json($) {
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214 JSON::Syck::Dump $_[0]
215}
216 233
217=item cf::lock_wait $string 234=item cf::lock_wait $string
218 235
219Wait until the given lock is available. See cf::lock_acquire. 236Wait until the given lock is available. See cf::lock_acquire.
220 237
226returned. 243returned.
227 244
228Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
230 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
231=cut 252=cut
232 253
233our %LOCK; 254our %LOCK;
234 255
235sub lock_wait($) { 256sub lock_wait($) {
254 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
256 } 277 }
257} 278}
258 279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
284}
285
259sub freeze_mainloop { 286sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
261 288
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 289 my $guard = Coro::guard {
290 $TICK_WATCHER->start;
291 };
263 $TICK_WATCHER->stop; 292 $TICK_WATCHER->stop;
264 $guard 293 $guard
265} 294}
266 295
267=item cf::async { BLOCK } 296=item cf::async { BLOCK }
338 367
339 $coro 368 $coro
340} 369}
341 370
342sub write_runtime { 371sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 372 my $guard = cf::lock_acquire "write_runtime";
344 373
345 my $runtime = cf::localdir . "/runtime"; 374 my $runtime = "$LOCALDIR/runtime";
346 375
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 377 or return;
349 378
379 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 380 # 10 is the runtime save interval, for a monotonic clock
381 # 60 allows for the watchdog to kill the server.
382
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 383 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 384 and return;
353 385
386 # always fsync - this file is important
354 aio_fsync $fh 387 aio_fsync $fh
355 and return; 388 and return;
356 389
357 close $fh 390 close $fh
358 or return; 391 or return;
359 392
360 aio_rename "$runtime~", $runtime 393 aio_rename "$runtime~", $runtime
361 and return; 394 and return;
362 395
363 1 396 1
397}
398
399=item cf::datalog type => key => value, ...
400
401Log a datalog packet of the given type with the given key-value pairs.
402
403=cut
404
405sub datalog($@) {
406 my ($type, %kv) = @_;
407 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 408}
365 409
366=back 410=back
367 411
368=cut 412=cut
499our @CB_TYPE = (); # registry for type (cf-object class) based events 543our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 544our @CB_MAP = ();
501 545
502my %attachment; 546my %attachment;
503 547
548sub cf::attachable::thawer_merge {
549 # simply override everything except _meta
550 local $_[0]{_meta};
551 %{$_[0]} = %{$_[1]};
552}
553
504sub _attach_cb($$$$) { 554sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 555 my ($registry, $event, $prio, $cb) = @_;
506 556
507 use sort 'stable'; 557 use sort 'stable';
508 558
679# object support 729# object support
680 730
681sub reattach { 731sub reattach {
682 # basically do the same as instantiate, without calling instantiate 732 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 733 my ($obj) = @_;
734
735 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 736
685 my $registry = $obj->registry; 737 my $registry = $obj->registry;
686 738
687 @$registry = (); 739 @$registry = ();
688 740
735 $filename, length $$rdata, scalar @$objs; 787 $filename, length $$rdata, scalar @$objs;
736 788
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 790 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 791 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 792 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 793 close $fh;
742 794
743 if (@$objs) { 795 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 796 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 797 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 798 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 799 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 800 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 801 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 802 aio_rename "$filename.pst~", "$filename.pst";
751 } 803 }
752 } else { 804 } else {
753 aio_unlink "$filename.pst"; 805 aio_unlink "$filename.pst";
900 } or warn "$ext not loaded: $@"; 952 } or warn "$ext not loaded: $@";
901 } 953 }
902} 954}
903 955
904############################################################################# 956#############################################################################
905# load/save/clean perl data associated with a map
906
907*cf::mapsupport::on_clean = sub {
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 957
920=head2 CORE EXTENSIONS 958=head2 CORE EXTENSIONS
921 959
922Functions and methods that extend core crossfire objects. 960Functions and methods that extend core crossfire objects.
923 961
936Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
937 975
938=cut 976=cut
939 977
940sub playerdir($) { 978sub playerdir($) {
941 cf::localdir 979 "$PLAYERDIR/"
942 . "/"
943 . cf::playerdir
944 . "/"
945 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
946} 981}
947 982
948sub path($) { 983sub path($) {
949 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
950 985
951 (playerdir $login) . "/$login.pl" 986 (playerdir $login) . "/playerdata"
952} 987}
953 988
954sub find_active($) { 989sub find_active($) {
955 $cf::PLAYER{$_[0]} 990 $cf::PLAYER{$_[0]}
956 and $cf::PLAYER{$_[0]}->active 991 and $cf::PLAYER{$_[0]}->active
959 994
960sub exists($) { 995sub exists($) {
961 my ($login) = @_; 996 my ($login) = @_;
962 997
963 $cf::PLAYER{$login} 998 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 999 or cf::sync_job { !aio_stat path $login }
965} 1000}
966 1001
967sub find($) { 1002sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 1003 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 1004 my $login = $_[0];
970 1005
971 my $guard = cf::lock_acquire "user_find:$login"; 1006 my $guard = cf::lock_acquire "user_find:$login";
972 1007
973 $cf::PLAYER{$_[0]} || do { 1008 $cf::PLAYER{$_[0]} || do {
1009 # rename old playerfiles to new ones
1010 #TODO: remove when no longer required
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl";
1015
974 my $pl = load_pl path $login 1016 my $pl = load_pl path $login
975 or return; 1017 or return;
976 $cf::PLAYER{$login} = $pl 1018 $cf::PLAYER{$login} = $pl
977 } 1019 }
978 } 1020 }
1015 1057
1016=cut 1058=cut
1017 1059
1018sub quit_character { 1060sub quit_character {
1019 my ($pl) = @_; 1061 my ($pl) = @_;
1062
1063 my $name = $pl->ob->name;
1020 1064
1021 $pl->{deny_save} = 1; 1065 $pl->{deny_save} = 1;
1022 $pl->password ("*"); # this should lock out the player until we nuked the dir 1066 $pl->password ("*"); # this should lock out the player until we nuked the dir
1023 1067
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1029 my $path = playerdir $pl; 1073 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~"; 1074 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp; 1075 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name}; 1076 delete $cf::PLAYER{$pl->ob->name};
1033 $pl->destroy; 1077 $pl->destroy;
1078
1079 my $prefix = qr<^~\Q$name\E/>;
1080
1081 # nuke player maps
1082 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1083
1034 IO::AIO::aio_rmtree $temp; 1084 IO::AIO::aio_rmtree $temp;
1085}
1086
1087=item $pl->kick
1088
1089Kicks a player out of the game. This destroys the connection.
1090
1091=cut
1092
1093sub kick {
1094 my ($pl, $kicker) = @_;
1095
1096 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1097 $pl->killer ("kicked");
1098 $pl->ns->destroy;
1035} 1099}
1036 1100
1037=item cf::player::list_logins 1101=item cf::player::list_logins
1038 1102
1039Returns am arrayref of all valid playernames in the system, can take a 1103Returns am arrayref of all valid playernames in the system, can take a
1040while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1041 1105
1042=cut 1106=cut
1043 1107
1044sub list_logins { 1108sub list_logins {
1045 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1046 or return []; 1110 or return [];
1047 1111
1048 my @logins; 1112 my @logins;
1049 1113
1050 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
1067=cut 1131=cut
1068 1132
1069sub maps($) { 1133sub maps($) {
1070 my ($pl) = @_; 1134 my ($pl) = @_;
1071 1135
1136 $pl = ref $pl ? $pl->ob->name : $pl;
1137
1072 my $files = aio_readdir playerdir $pl 1138 my $files = aio_readdir playerdir $pl
1073 or return; 1139 or return;
1074 1140
1075 my @paths; 1141 my @paths;
1076 1142
1077 for (@$files) { 1143 for (@$files) {
1078 utf8::decode $_; 1144 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1145 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1146 next unless /^$PATH_SEP/o;
1081 1147
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1148 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1149 }
1084 1150
1085 \@paths 1151 \@paths
1086} 1152}
1087 1153
1088=item $player->ext_reply ($msgid, $msgtype, %msg) 1154=item $player->ext_reply ($msgid, %msg)
1089 1155
1090Sends an ext reply to the player. 1156Sends an ext reply to the player.
1091 1157
1092=cut 1158=cut
1093 1159
1094sub ext_reply($$$%) { 1160sub ext_reply($$%) {
1095 my ($self, $id, %msg) = @_; 1161 my ($self, $id, %msg) = @_;
1096 1162
1097 $msg{msgid} = $id; 1163 $msg{msgid} = $id;
1098 1164
1099 $self->send ("ext " . cf::to_json \%msg); 1165 $self->send ("ext " . cf::to_json \%msg);
1100} 1166}
1101 1167
1102package cf; 1168=item $player->ext_event ($type, %msg)
1169
1170Sends an ext event to the client.
1171
1172=cut
1173
1174sub ext_event($$%) {
1175 my ($self, $type, %msg) = @_;
1176
1177 $self->ns->ext_event ($type, %msg);
1178}
1179
1180=head3 cf::region
1181
1182=over 4
1183
1184=cut
1185
1186package cf::region;
1187
1188=item cf::region::find_by_path $path
1189
1190Tries to decuce the probable region for a map knowing only its path.
1191
1192=cut
1193
1194sub find_by_path($) {
1195 my ($path) = @_;
1196
1197 my ($match, $specificity);
1198
1199 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) {
1201 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity;
1203 }
1204 }
1205
1206 $match
1207}
1103 1208
1104=back 1209=back
1105
1106 1210
1107=head3 cf::map 1211=head3 cf::map
1108 1212
1109=over 4 1213=over 4
1110 1214
1114 1218
1115use Fcntl; 1219use Fcntl;
1116use Coro::AIO; 1220use Coro::AIO;
1117 1221
1118use overload 1222use overload
1119 '""' => \&as_string; 1223 '""' => \&as_string,
1224 fallback => 1;
1120 1225
1121our $MAX_RESET = 3600; 1226our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1227our $DEFAULT_RESET = 3000;
1123 1228
1124sub generate_random_map { 1229sub generate_random_map {
1125 my ($self, $rmp) = @_; 1230 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1231 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1232 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1233 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1234 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1235 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1242 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1243 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1244 )
1141} 1245}
1142 1246
1247=item cf::map->register ($regex, $prio)
1248
1249Register a handler for the map path matching the given regex at the
1250givne priority (higher is better, built-in handlers have priority 0, the
1251default).
1252
1253=cut
1254
1143sub register { 1255sub register {
1144 my (undef, $regex) = @_; 1256 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1257 my $pkg = caller;
1146 1258
1147 no strict; 1259 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1260 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1261
1150 $EXT_MAP{$pkg} = qr<$regex>; 1262 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1263}
1152 1264
1153# also paths starting with '/' 1265# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1266$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1267
1268sub thawer_merge {
1269 my ($self, $merge) = @_;
1270
1271 # we have to keep some variables in memory intact
1272 local $self->{path};
1273 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276
1277 $self->SUPER::thawer_merge ($merge);
1278}
1155 1279
1156sub normalise { 1280sub normalise {
1157 my ($path, $base) = @_; 1281 my ($path, $base) = @_;
1282
1283 $path = "$path"; # make sure its a string
1284
1285 $path =~ s/\.map$//;
1158 1286
1159 # map plan: 1287 # map plan:
1160 # 1288 #
1161 # /! non-realised random map exit (special hack!) 1289 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1290 # {... are special paths that are not being touched
1190 1318
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1319 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192 1320
1193 $path = normalise $path, $base; 1321 $path = normalise $path, $base;
1194 1322
1195 for my $pkg (keys %EXT_MAP) { 1323 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1324 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1325 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1326 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1327 $self->init; # pass $1 etc.
1200 return $self; 1328 return $self;
1201 } 1329 }
1202 } 1330 }
1203 1331
1204 Carp::carp "unable to resolve path '$path'."; 1332 Carp::carp "unable to resolve path '$path' (base '$base').";
1205 () 1333 ()
1206} 1334}
1207 1335
1208sub init { 1336sub init {
1209 my ($self) = @_; 1337 my ($self) = @_;
1220# the displayed name, this is a one way mapping 1348# the displayed name, this is a one way mapping
1221sub visible_name { 1349sub visible_name {
1222 &as_string 1350 &as_string
1223} 1351}
1224 1352
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1353# the original (read-only) location
1233sub load_path { 1354sub load_path {
1234 my ($self) = @_; 1355 my ($self) = @_;
1235 1356
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1237} 1358}
1238 1359
1239# the temporary/swap location 1360# the temporary/swap location
1240sub save_path { 1361sub save_path {
1241 my ($self) = @_; 1362 my ($self) = @_;
1242 1363
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1365 "$TMPDIR/$path.map"
1244} 1366}
1245 1367
1246# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1247sub uniq_path { 1369sub uniq_path {
1248 my ($self) = @_; 1370 my ($self) = @_;
1249 1371
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1373 "$UNIQUEDIR/$path"
1251} 1374}
1252 1375
1253# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1254# all maps in C++... 1377# all maps in C++...
1255sub change_all_map_light { 1378sub change_all_map_light {
1261 1384
1262sub unlink_save { 1385sub unlink_save {
1263 my ($self) = @_; 1386 my ($self) = @_;
1264 1387
1265 utf8::encode (my $save = $self->save_path); 1388 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1390 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1391}
1269 1392
1270sub load_header_from($) { 1393sub load_header_from($) {
1271 my ($self, $path) = @_; 1394 my ($self, $path) = @_;
1272 1395
1273 utf8::encode $path; 1396 utf8::encode $path;
1274 aio_open $path, O_RDONLY, 0 1397 #aio_open $path, O_RDONLY, 0
1275 or return; 1398 # or return;
1276 1399
1277 $self->_load_header ($path) 1400 $self->_load_header ($path)
1278 or return; 1401 or return;
1279 1402
1280 $self->{load_path} = $path; 1403 $self->{load_path} = $path;
1281 1404
1282 1 1405 1
1283} 1406}
1284 1407
1285sub load_orig { 1408sub load_header_orig {
1286 my ($self) = @_; 1409 my ($self) = @_;
1287 1410
1288 $self->load_header_from ($self->load_path) 1411 $self->load_header_from ($self->load_path)
1289} 1412}
1290 1413
1291sub load_temp { 1414sub load_header_temp {
1292 my ($self) = @_; 1415 my ($self) = @_;
1293 1416
1294 $self->load_header_from ($self->save_path) 1417 $self->load_header_from ($self->save_path)
1418}
1419
1420sub prepare_temp {
1421 my ($self) = @_;
1422
1423 $self->last_access ((delete $self->{last_access})
1424 || $cf::RUNTIME); #d#
1425 # safety
1426 $self->{instantiate_time} = $cf::RUNTIME
1427 if $self->{instantiate_time} > $cf::RUNTIME;
1428}
1429
1430sub prepare_orig {
1431 my ($self) = @_;
1432
1433 $self->{load_original} = 1;
1434 $self->{instantiate_time} = $cf::RUNTIME;
1435 $self->last_access ($cf::RUNTIME);
1436 $self->instantiate;
1295} 1437}
1296 1438
1297sub load_header { 1439sub load_header {
1298 my ($self) = @_; 1440 my ($self) = @_;
1299 1441
1300 if ($self->load_temp) { 1442 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1443 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1444 } else {
1307 $self->load_orig 1445 $self->load_header_orig
1308 or return; 1446 or return;
1309 1447 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 1448 }
1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1315 1452
1316 1 1453 1
1317} 1454}
1318 1455
1319sub find; 1456sub find;
1332 $map->{last_save} = $cf::RUNTIME; 1469 $map->{last_save} = $cf::RUNTIME;
1333 1470
1334 $map->load_header 1471 $map->load_header
1335 or return; 1472 or return;
1336 1473
1337 if ($map->should_reset) { 1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1477 $map->reset;
1339 undef $guard; 1478 undef $guard;
1340 $map = find $path 1479 return find $path;
1341 or return;
1342 } 1480 }
1343 1481
1344 $cf::MAP{$path} = $map 1482 $cf::MAP{$path} = $map
1345 } 1483 }
1346} 1484}
1485
1486sub pre_load { }
1487sub post_load { }
1347 1488
1348sub load { 1489sub load {
1349 my ($self) = @_; 1490 my ($self) = @_;
1350 1491
1492 local $self->{deny_reset} = 1; # loading can take a long time
1493
1351 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1352 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1353 1498
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1500
1356 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1357 1502
1358 $self->alloc; 1503 $self->alloc;
1359 $self->_load_objects ($self->{load_path}, 1)
1360 or return;
1361 1504
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1505 $self->pre_load;
1363 if delete $self->{load_original};
1364
1365 if (my $uniq = $self->uniq_path) {
1366 utf8::encode $uniq;
1367 if (aio_open $uniq, O_RDONLY, 0) {
1368 $self->clear_unique_items;
1369 $self->_load_objects ($uniq, 0);
1370 }
1371 }
1372
1373 Coro::cede;
1374
1375 # now do the right thing for maps
1376 $self->link_multipart_objects;
1377
1378 unless ($self->{deny_activate}) {
1379 $self->decay_objects;
1380 $self->fix_auto_apply;
1381 $self->update_buttons;
1382 Coro::cede; 1506 Coro::cede;
1383 $self->set_darkness_map; 1507
1508 $self->_load_objects ($self->{load_path}, 1)
1509 or return;
1510
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original};
1513
1514 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) {
1517 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0);
1519 }
1520 }
1521
1522 Coro::cede;
1523 # now do the right thing for maps
1524 $self->link_multipart_objects;
1384 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1526 unless $self->difficulty;
1386 Coro::cede; 1527 Coro::cede;
1528
1529 unless ($self->{deny_activate}) {
1530 $self->decay_objects;
1531 $self->fix_auto_apply;
1532 $self->update_buttons;
1533 Coro::cede;
1534 $self->set_darkness_map;
1535 Coro::cede;
1387 $self->activate; 1536 $self->activate;
1388 } 1537 }
1389 1538
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1539 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1542 }
1543
1544 $self->post_load;
1391} 1545}
1392 1546
1393sub customise_for { 1547sub customise_for {
1394 my ($self, $ob) = @_; 1548 my ($self, $ob) = @_;
1395 1549
1434 1588
1435 cf::sync_job { $map->load }; 1589 cf::sync_job { $map->load };
1436} 1590}
1437 1591
1438our %MAP_PREFETCH; 1592our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1593our $MAP_PREFETCHER = undef;
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1443 or next;
1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1449 }
1450};
1451 1594
1452sub find_async { 1595sub find_async {
1453 my ($path, $origin) = @_; 1596 my ($path, $origin) = @_;
1454 1597
1455 $path = normalise $path, $origin && $origin->{path}; 1598 $path = normalise $path, $origin && $origin->{path};
1456 1599
1457 if (my $map = $cf::MAP{$path}) { 1600 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1601 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1602 }
1460 1603
1461 $MAP_PREFETCH{$path} = 0; 1604 undef $MAP_PREFETCH{$path};
1605 $MAP_PREFETCHER ||= cf::async {
1606 while (%MAP_PREFETCH) {
1607 for my $path (keys %MAP_PREFETCH) {
1608 my $map = find $path
1609 or next;
1610 $map->load;
1611
1612 delete $MAP_PREFETCH{$path};
1613 }
1614 }
1615 undef $MAP_PREFETCHER;
1616 };
1462 $MAP_PREFETCHER->ready; 1617 $MAP_PREFETCHER->prio (6);
1463 1618
1464 () 1619 ()
1465} 1620}
1466 1621
1467sub save { 1622sub save {
1512 1667
1513sub reset_at { 1668sub reset_at {
1514 my ($self) = @_; 1669 my ($self) = @_;
1515 1670
1516 # TODO: safety, remove and allow resettable per-player maps 1671 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1672 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1673 return 1e99 if $self->{deny_reset};
1519 1674
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1675 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1676 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1677
1527 my ($self) = @_; 1682 my ($self) = @_;
1528 1683
1529 $self->reset_at <= $cf::RUNTIME 1684 $self->reset_at <= $cf::RUNTIME
1530} 1685}
1531 1686
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 1687sub reset {
1547 my ($self) = @_; 1688 my ($self) = @_;
1548 1689
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1690 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1691
1551 return if $self->players; 1692 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1693 return if $self->isa ("ext::map_per_player");#d#
1553 1694
1554 warn "resetting map ", $self->path;#d# 1695 warn "resetting map ", $self->path;#d#
1555 1696
1697 $self->in_memory (cf::MAP_SWAPPED);
1698
1699 # need to save uniques path
1700 unless ($self->{deny_save}) {
1701 my $uniq = $self->uniq_path; utf8::encode $uniq;
1702
1703 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1704 if $uniq;
1705 }
1706
1556 delete $cf::MAP{$self->path}; 1707 delete $cf::MAP{$self->path};
1708
1709 $self->clear;
1557 1710
1558 $_->clear_links_to ($self) for values %cf::MAP; 1711 $_->clear_links_to ($self) for values %cf::MAP;
1559 1712
1560 $self->unlink_save; 1713 $self->unlink_save;
1561 $self->destroy; 1714 $self->destroy;
1564my $nuke_counter = "aaaa"; 1717my $nuke_counter = "aaaa";
1565 1718
1566sub nuke { 1719sub nuke {
1567 my ($self) = @_; 1720 my ($self) = @_;
1568 1721
1722 delete $cf::MAP{$self->path};
1723
1724 $self->unlink_save;
1725
1726 bless $self, "cf::map";
1727 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1728 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1729 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1730 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1731
1732 $cf::MAP{$self->path} = $self;
1733
1572 $self->reset; # polite request, might not happen 1734 $self->reset; # polite request, might not happen
1573} 1735}
1574 1736
1575=item cf::map::unique_maps 1737=item cf::map::unique_maps
1576 1738
1578instantiated unique items. May block. 1740instantiated unique items. May block.
1579 1741
1580=cut 1742=cut
1581 1743
1582sub unique_maps() { 1744sub unique_maps() {
1583 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1745 my $files = aio_readdir $UNIQUEDIR
1584 or return; 1746 or return;
1585 1747
1586 my @paths; 1748 my @paths;
1587 1749
1588 for (@$files) { 1750 for (@$files) {
1589 utf8::decode $_; 1751 utf8::decode $_;
1590 next if /\.pst$/; 1752 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1753 next unless /^$PATH_SEP/o;
1592 1754
1593 push @paths, $_; 1755 push @paths, cf::map::normalise $_;
1594 } 1756 }
1595 1757
1596 \@paths 1758 \@paths
1597} 1759}
1598 1760
1692=cut 1854=cut
1693 1855
1694sub link_map { 1856sub link_map {
1695 unless ($LINK_MAP) { 1857 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 1858 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1859 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 1860 $LINK_MAP->load;
1699 } 1861 }
1700 1862
1701 $LINK_MAP 1863 $LINK_MAP
1702} 1864}
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1871 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1872
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1873 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1874 if $self->map;
1713 1875
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1876 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1877}
1716 1878
1717sub cf::object::player::leave_link { 1879sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1880 my ($self, $map, $x, $y) = @_;
1719 1881
1741 $map->load; 1903 $map->load;
1742 $map->load_diag; 1904 $map->load_diag;
1743 1905
1744 return unless $self->contr->active; 1906 return unless $self->contr->active;
1745 $self->activate_recursive; 1907 $self->activate_recursive;
1908
1909 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1910 $self->enter_map ($map, $x, $y);
1747} 1911}
1748 1912
1749cf::player->attach ( 1913cf::player->attach (
1750 on_logout => sub { 1914 on_logout => sub {
1763 # try to abort aborted map switching on player login :) 1927 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1928 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1929 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1930 $pl->ob->enter_link;
1767 (async { 1931 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef, 1932 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1933 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.", 1934 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED); 1935 cf::NDI_RED);
1936 # we need this sleep as the login has a concurrent enter_exit running
1937 # and this sleep increases chances of the player not ending up in scorn
1774 Coro::Timer::sleep 1; 1938 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1939 $pl->ob->leave_link;
1776 })->prio (2); 1940 })->prio (2);
1777 } 1941 }
1778 }, 1942 },
1786 my ($self, $path, $x, $y) = @_; 1950 my ($self, $path, $x, $y) = @_;
1787 1951
1788 $self->enter_link; 1952 $self->enter_link;
1789 1953
1790 (async { 1954 (async {
1955 my $map = eval {
1791 my $map = cf::map::find $path; 1956 my $map = cf::map::find $path;
1792 $map = $map->customise_for ($self) if $map; 1957 $map = $map->customise_for ($self) if $map;
1793 1958 $map
1794# warn "entering ", $map->path, " at ($x, $y)\n" 1959 } or
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1960 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1798 1961
1799 $self->leave_link ($map, $x, $y); 1962 $self->leave_link ($map, $x, $y);
1800 })->prio (1); 1963 })->prio (1);
1801} 1964}
1802 1965
1806 1969
1807sub parse_random_map_params { 1970sub parse_random_map_params {
1808 my ($spec) = @_; 1971 my ($spec) = @_;
1809 1972
1810 my $rmp = { # defaults 1973 my $rmp = { # defaults
1811 xsize => 10, 1974 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1975 ysize => (cf::rndm 15, 40),
1976 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1977 #layout => string,
1813 }; 1978 };
1814 1979
1815 for (split /\n/, $spec) { 1980 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1981 my ($k, $v) = split /\s+/, $_, 2;
1817 1982
1821 $rmp 1986 $rmp
1822} 1987}
1823 1988
1824sub prepare_random_map { 1989sub prepare_random_map {
1825 my ($exit) = @_; 1990 my ($exit) = @_;
1991
1992 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1993
1827 # all this does is basically replace the /! path by 1994 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1995 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1996 # that depends on the exit object
1830 1997
1831 my $rmp = parse_random_map_params $exit->msg; 1998 my $rmp = parse_random_map_params $exit->msg;
1832 1999
1833 if ($exit->map) { 2000 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 2001 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 2002 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 2003 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 2004 $rmp->{origin_y} = $exit->y;
1838 } 2005 }
1839 2006
1840 $rmp->{random_seed} ||= $exit->random_seed; 2007 $rmp->{random_seed} ||= $exit->random_seed;
1841 2008
1842 my $data = cf::to_json $rmp; 2009 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 2010 my $md5 = Digest::MD5::md5_hex $data;
2011 my $meta = "$RANDOMDIR/$md5.meta";
1844 2012
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2013 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 2014 aio_write $fh, 0, (length $data), $data, 0;
2015 undef $fh;
2016 aio_rename "$meta~", $meta;
1847 2017
1848 $exit->slaying ("?random/$md5"); 2018 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 2019 $exit->msg (undef);
1850 } 2020 }
1851} 2021}
1852 2022
1853sub cf::object::player::enter_exit { 2023sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 2024 my ($self, $exit) = @_;
1855 2025
1856 return unless $self->type == cf::PLAYER; 2026 return unless $self->type == cf::PLAYER;
2027
2028 if ($exit->slaying eq "/!") {
2029 #TODO: this should de-fi-ni-te-ly not be a sync-job
2030 # the problem is that $exit might not survive long enough
2031 # so it needs to be done right now, right here
2032 cf::sync_job { prepare_random_map $exit };
2033 }
2034
2035 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2036 my $hp = $exit->stats->hp;
2037 my $sp = $exit->stats->sp;
1857 2038
1858 $self->enter_link; 2039 $self->enter_link;
1859 2040
1860 (async { 2041 (async {
1861 $self->deactivate_recursive; # just to be sure 2042 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 2043 unless (eval {
1863 prepare_random_map $exit 2044 $self->goto ($slaying, $hp, $sp);
1864 if $exit->slaying eq "/!";
1865
1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1868 2045
1869 1; 2046 1;
1870 }) { 2047 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 2048 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 2049 . "I'll try to bring you back to the map you were before. "
1873 . "Please report this to the dungeon master!", 2050 . "Please report this to the dungeon master!",
1874 cf::NDI_UNIQUE | cf::NDI_RED); 2051 cf::NDI_UNIQUE | cf::NDI_RED);
1875 2052
1876 warn "ERROR in enter_exit: $@"; 2053 warn "ERROR in enter_exit: $@";
1877 $self->leave_link; 2054 $self->leave_link;
1878 } 2055 }
1879 })->prio (1); 2056 })->prio (1);
1892 2069
1893sub cf::client::send_drawinfo { 2070sub cf::client::send_drawinfo {
1894 my ($self, $text, $flags) = @_; 2071 my ($self, $text, $flags) = @_;
1895 2072
1896 utf8::encode $text; 2073 utf8::encode $text;
1897 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2074 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1898} 2075}
1899 2076
2077=item $client->ext_event ($type, %msg)
2078
2079Sends an exti event to the client.
2080
2081=cut
2082
2083sub cf::client::ext_event($$%) {
2084 my ($self, $type, %msg) = @_;
2085
2086 $msg{msgtype} = "event_$type";
2087 $self->send_packet ("ext " . cf::to_json \%msg);
2088}
1900 2089
1901=item $success = $client->query ($flags, "text", \&cb) 2090=item $success = $client->query ($flags, "text", \&cb)
1902 2091
1903Queues a query to the client, calling the given callback with 2092Queues a query to the client, calling the given callback with
1904the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2093the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1933 # get handled first 2122 # get handled first
1934 my $queue = delete $ns->{query_queue} 2123 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2124 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2125
1937 (shift @$queue)->[1]->($msg); 2126 (shift @$queue)->[1]->($msg);
2127 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2128
1939 push @{ $ns->{query_queue} }, @$queue; 2129 push @{ $ns->{query_queue} }, @$queue;
1940 2130
1941 if (@{ $ns->{query_queue} } == @$queue) { 2131 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2132 if (@$queue) {
2000 2190
2001# here we export the classes and methods available to script code 2191# here we export the classes and methods available to script code
2002 2192
2003=pod 2193=pod
2004 2194
2005The following fucntions and emthods are available within a safe environment: 2195The following functions and methods are available within a safe environment:
2006 2196
2007 cf::object contr pay_amount pay_player map 2197 cf::object contr pay_amount pay_player map
2008 cf::object::player player 2198 cf::object::player player
2009 cf::player peaceful 2199 cf::player peaceful
2010 cf::map trigger 2200 cf::map trigger
2095############################################################################# 2285#############################################################################
2096 2286
2097=head2 EXTENSION DATABASE SUPPORT 2287=head2 EXTENSION DATABASE SUPPORT
2098 2288
2099Crossfire maintains a very simple database for extension use. It can 2289Crossfire maintains a very simple database for extension use. It can
2100currently store anything that can be serialised using Storable, which 2290currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2101excludes objects. 2291convert to/from binary).
2102 2292
2103The parameter C<$family> should best start with the name of the extension 2293The parameter C<$family> should best start with the name of the extension
2104using it, it should be unique. 2294using it, it should be unique.
2105 2295
2106=over 4 2296=over 4
2107 2297
2108=item $hashref = cf::db_get $family
2109
2110Return a hashref for use by the extension C<$family>, which can be
2111modified. After modifications, you have to call C<cf::db_dirty> or
2112C<cf::db_sync>.
2113
2114=item $value = cf::db_get $family => $key 2298=item $value = cf::db_get $family => $key
2115 2299
2116Returns a single value from the database 2300Returns a single value from the database.
2117
2118=item cf::db_put $family => $hashref
2119
2120Stores the given family hashref into the database. Updates are delayed, if
2121you want the data to be synced to disk immediately, use C<cf::db_sync>.
2122 2301
2123=item cf::db_put $family => $key => $value 2302=item cf::db_put $family => $key => $value
2124 2303
2125Stores the given C<$value> in the family hash. Updates are delayed, if you 2304Stores the given C<$value> in the family.
2126want the data to be synced to disk immediately, use C<cf::db_sync>.
2127
2128=item cf::db_dirty
2129
2130Marks the database as dirty, to be updated at a later time.
2131
2132=item cf::db_sync
2133
2134Immediately write the database to disk I<if it is dirty>.
2135 2305
2136=cut 2306=cut
2137 2307
2138our $DB; 2308our $DB;
2139 2309
2140{ 2310sub db_init {
2141 my $path = cf::localdir . "/database.pst"; 2311 unless ($DB) {
2312 $DB = BDB::db_create $DB_ENV;
2142 2313
2143 sub db_load() { 2314 cf::sync_job {
2144 $DB = stat $path ? Storable::retrieve $path : { }; 2315 eval {
2145 } 2316 $DB->set_flags (BDB::CHKSUM);
2146 2317
2147 my $pid; 2318 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2148 2319 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2149 sub db_save() { 2320 cf::cleanup "db_open(db): $!" if $!;
2150 waitpid $pid, 0 if $pid; 2321 };
2151 if (0 == ($pid = fork)) { 2322 cf::cleanup "db_open(db): $@" if $@;
2152 $DB->{_meta}{version} = 1;
2153 Storable::nstore $DB, "$path~";
2154 rename "$path~", $path;
2155 cf::_exit 0 if defined $pid;
2156 } 2323 };
2157 }
2158
2159 my $dirty;
2160
2161 sub db_sync() {
2162 db_save if $dirty;
2163 undef $dirty;
2164 }
2165
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167 db_sync;
2168 }); 2324 }
2325}
2169 2326
2170 sub db_dirty() {
2171 $dirty = 1;
2172 $idle->start;
2173 }
2174
2175 sub db_get($;$) { 2327sub db_get($$) {
2176 @_ >= 2 2328 my $key = "$_[0]/$_[1]";
2177 ? $DB->{$_[0]}{$_[1]}
2178 : ($DB->{$_[0]} ||= { })
2179 }
2180 2329
2330 cf::sync_job {
2331 BDB::db_get $DB, undef, $key, my $data;
2332
2333 $! ? ()
2334 : $data
2335 }
2336}
2337
2181 sub db_put($$;$) { 2338sub db_put($$$) {
2182 if (@_ >= 3) { 2339 BDB::dbreq_pri 4;
2183 $DB->{$_[0]}{$_[1]} = $_[2]; 2340 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2184 } else { 2341}
2185 $DB->{$_[0]} = $_[1];
2186 }
2187 db_dirty;
2188 }
2189 2342
2190 cf::global->attach ( 2343=item cf::cache $id => [$paths...], $processversion => $process
2191 prio => 10000, 2344
2192 on_cleanup => sub { 2345Generic caching function that returns the value of the resource $id,
2193 db_sync; 2346caching and regenerating as required.
2347
2348This function can block.
2349
2350=cut
2351
2352sub cache {
2353 my ($id, $src, $processversion, $process) = @_;
2354
2355 my $meta =
2356 join "\x00",
2357 $processversion,
2358 map {
2359 aio_stat $_
2360 and Carp::croak "$_: $!";
2361
2362 ($_, (stat _)[7,9])
2363 } @$src;
2364
2365 my $dbmeta = db_get cache => "$id/meta";
2366 if ($dbmeta ne $meta) {
2367 # changed, we may need to process
2368
2369 my @data;
2370 my $md5;
2371
2372 for (0 .. $#$src) {
2373 0 <= aio_load $src->[$_], $data[$_]
2374 or Carp::croak "$src->[$_]: $!";
2194 }, 2375 }
2195 ); 2376
2377 # if processing is expensive, check
2378 # checksum first
2379 if (1) {
2380 $md5 =
2381 join "\x00",
2382 $processversion,
2383 map {
2384 Coro::cede;
2385 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2386 } 0.. $#$src;
2387
2388
2389 my $dbmd5 = db_get cache => "$id/md5";
2390 if ($dbmd5 eq $md5) {
2391 db_put cache => "$id/meta", $meta;
2392
2393 return db_get cache => "$id/data";
2394 }
2395 }
2396
2397 my $t1 = Time::HiRes::time;
2398 my $data = $process->(\@data);
2399 my $t2 = Time::HiRes::time;
2400
2401 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2402
2403 db_put cache => "$id/data", $data;
2404 db_put cache => "$id/md5" , $md5;
2405 db_put cache => "$id/meta", $meta;
2406
2407 return $data;
2408 }
2409
2410 db_get cache => "$id/data"
2196} 2411}
2412
2413=item fork_call { }, $args
2414
2415Executes the given code block with the given arguments in a seperate
2416process, returning the results. Everything must be serialisable with
2417Coro::Storable. May, of course, block. Note that the executed sub may
2418never block itself or use any form of Event handling.
2419
2420=cut
2421
2422sub fork_call(&@) {
2423 my ($cb, @args) = @_;
2424
2425# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2426# or die "socketpair: $!";
2427 pipe my $fh1, my $fh2
2428 or die "pipe: $!";
2429
2430 if (my $pid = fork) {
2431 close $fh2;
2432
2433 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2434 $res = Coro::Storable::thaw $res;
2435
2436 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2437
2438 die $$res unless "ARRAY" eq ref $res;
2439
2440 return wantarray ? @$res : $res->[-1];
2441 } else {
2442 local $SIG{__WARN__};
2443 eval {
2444 local $SIG{__DIE__};
2445 close $fh1;
2446
2447 my @res = eval { $cb->(@args) };
2448 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2449 };
2450
2451 warn $@ if $@;
2452 _exit 0;
2453 }
2454}
2455
2456
2197 2457
2198############################################################################# 2458#############################################################################
2199# the server's main() 2459# the server's init and main functions
2460
2461sub load_facedata($) {
2462 my ($path) = @_;
2463
2464 warn "loading facedata from $path\n";
2465
2466 my $facedata;
2467 0 < aio_load $path, $facedata
2468 or die "$path: $!";
2469
2470 $facedata = Coro::Storable::thaw $facedata;
2471
2472 $facedata->{version} == 2
2473 or cf::cleanup "$path: version mismatch, cannot proceed.";
2474
2475 {
2476 my $faces = $facedata->{faceinfo};
2477
2478 while (my ($face, $info) = each %$faces) {
2479 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2480 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2481 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2482 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2483 Coro::cede;
2484 }
2485
2486 while (my ($face, $info) = each %$faces) {
2487 next unless $info->{smooth};
2488 my $idx = cf::face::find $face
2489 or next;
2490 if (my $smooth = cf::face::find $info->{smooth}) {
2491 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2492 } else {
2493 warn "smooth face '$info->{smooth}' not found for face '$face'";
2494 }
2495 Coro::cede;
2496 }
2497 }
2498
2499 {
2500 my $anims = $facedata->{animinfo};
2501
2502 while (my ($anim, $info) = each %$anims) {
2503 cf::anim::set $anim, $info->{frames}, $info->{facings};
2504 Coro::cede;
2505 }
2506
2507 cf::anim::invalidate_all; # d'oh
2508 }
2509
2510 1
2511}
2512
2513sub reload_regions {
2514 load_resource_file "$MAPDIR/regions"
2515 or die "unable to load regions file\n";
2516}
2517
2518sub reload_facedata {
2519 load_facedata "$DATADIR/facedata"
2520 or die "unable to load facedata\n";
2521}
2522
2523sub reload_archetypes {
2524 load_resource_file "$DATADIR/archetypes"
2525 or die "unable to load archetypes\n";
2526}
2527
2528sub reload_treasures {
2529 load_resource_file "$DATADIR/treasures"
2530 or die "unable to load treasurelists\n";
2531}
2532
2533sub reload_resources {
2534 warn "reloading resource files...\n";
2535
2536 reload_regions;
2537 reload_facedata;
2538 reload_archetypes;
2539 reload_treasures;
2540
2541 warn "finished reloading resource files\n";
2542}
2543
2544sub init {
2545 reload_resources;
2546}
2200 2547
2201sub cfg_load { 2548sub cfg_load {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 2549 open my $fh, "<:utf8", "$CONFDIR/config"
2203 or return; 2550 or return;
2204 2551
2205 local $/; 2552 local $/;
2206 *CFG = YAML::Syck::Load <$fh>; 2553 *CFG = YAML::Syck::Load <$fh>;
2207 2554
2221 2568
2222sub main { 2569sub main {
2223 # we must not ever block the main coroutine 2570 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2571 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2573 (async {
2226 async { Event::one_event }; 2574 Event::one_event;
2575 })->prio (Coro::PRIO_MAX);
2227 }; 2576 };
2228 2577
2229 cfg_load; 2578 cfg_load;
2230 db_load; 2579 db_init;
2231 load_extensions; 2580 load_extensions;
2581
2582 $TICK_WATCHER->start;
2232 Event::loop; 2583 Event::loop;
2233} 2584}
2234 2585
2235############################################################################# 2586#############################################################################
2236# initialisation and cleanup 2587# initialisation and cleanup
2237 2588
2238# install some emergency cleanup handlers 2589# install some emergency cleanup handlers
2239BEGIN { 2590BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 2591 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 2592 Event->signal (
2593 reentrant => 0,
2242 data => WF_AUTOCANCEL, 2594 data => WF_AUTOCANCEL,
2243 signal => $signal, 2595 signal => $signal,
2596 prio => 0,
2244 cb => sub { 2597 cb => sub {
2245 cf::cleanup "SIG$signal"; 2598 cf::cleanup "SIG$signal";
2246 }, 2599 },
2247 ); 2600 );
2248 } 2601 }
2249} 2602}
2254 warn "enter emergency perl save\n"; 2607 warn "enter emergency perl save\n";
2255 2608
2256 cf::sync_job { 2609 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2610 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2611 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2612 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2613 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2614 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2615 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2616 $pl->valid or next;
2264 $pl->save; 2617 $pl->save;
2270 my $map = $cf::MAP{$path} or next; 2623 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 2624 $map->valid or next;
2272 $map->save; 2625 $map->save;
2273 } 2626 }
2274 warn "end emergency map save\n"; 2627 warn "end emergency map save\n";
2628
2629 warn "begin emergency database checkpoint\n";
2630 BDB::db_env_txn_checkpoint $DB_ENV;
2631 warn "end emergency database checkpoint\n";
2275 }; 2632 };
2276 2633
2277 warn "leave emergency perl save\n"; 2634 warn "leave emergency perl save\n";
2278} 2635}
2279 2636
2637sub post_cleanup {
2638 my ($make_core) = @_;
2639
2640 warn Carp::longmess "post_cleanup backtrace"
2641 if $make_core;
2642}
2643
2280sub reload() { 2644sub do_reload_perl() {
2281 # can/must only be called in main 2645 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2646 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2647 warn "can only reload from main coroutine";
2284 return; 2648 return;
2285 } 2649 }
2286 2650
2287 warn "reloading..."; 2651 warn "reloading...";
2288 2652
2289 warn "freezing server"; 2653 warn "entering sync_job";
2290 my $guard = freeze_mainloop; 2654
2655 cf::sync_job {
2656 cf::write_runtime; # external watchdog should not bark
2291 cf::emergency_save; 2657 cf::emergency_save;
2658 cf::write_runtime; # external watchdog should not bark
2292 2659
2293 warn "sync database to disk"; 2660 warn "syncing database to disk";
2294 cf::db_sync; 2661 BDB::db_env_txn_checkpoint $DB_ENV;
2295 IO::AIO::flush;
2296 2662
2297 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2663 # if anything goes wrong in here, we should simply crash as we already saved
2299 2664
2300 warn "cancel all watchers"; 2665 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2666 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2667 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2668 }
2304 2669
2670 warn "flushing outstanding aio requests";
2671 for (;;) {
2672 BDB::flush;
2673 IO::AIO::flush;
2674 Coro::cede;
2675 last unless IO::AIO::nreqs || BDB::nreqs;
2676 warn "iterate...";
2677 }
2678
2679 ++$RELOAD;
2680
2305 warn "cancel all extension coros"; 2681 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2682 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2683 %EXT_CORO = ();
2308 2684
2309 warn "remove commands"; 2685 warn "removing commands";
2310 %COMMAND = (); 2686 %COMMAND = ();
2311 2687
2312 warn "remove ext commands"; 2688 warn "removing ext commands";
2313 %EXTCMD = (); 2689 %EXTCMD = ();
2314 2690
2315 warn "unload/nuke all extensions"; 2691 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2692 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2693 warn "... unloading $pkg";
2318 2694
2319 if (my $cb = $pkg->can ("unload")) { 2695 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2696 eval {
2325 2701
2326 warn "... nuking $pkg"; 2702 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2703 Symbol::delete_package $pkg;
2328 } 2704 }
2329 2705
2330 warn "unload all perl modules loaded from $LIBDIR"; 2706 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2707 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2708 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2709
2334 warn "removing <$k>"; 2710 warn "... unloading $k";
2335 delete $INC{$k}; 2711 delete $INC{$k};
2336 2712
2337 $k =~ s/\.pm$//; 2713 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2714 $k =~ s/\//::/g;
2339 2715
2342 } 2718 }
2343 2719
2344 Symbol::delete_package $k; 2720 Symbol::delete_package $k;
2345 } 2721 }
2346 2722
2347 warn "get rid of safe::, as good as possible"; 2723 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2724 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2725 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2726
2351 warn "unload cf.pm \"a bit\""; 2727 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2728 delete $INC{"cf.pm"};
2729 delete $INC{"cf/pod.pm"};
2353 2730
2354 # don't, removes xs symbols, too, 2731 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2732 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2733 #Symbol::delete_package __PACKAGE__;
2357 2734
2735 warn "unload completed, starting to reload now";
2736
2358 warn "reloading cf.pm"; 2737 warn "reloading cf.pm";
2359 require cf; 2738 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2739 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2740
2362 warn "load config and database again"; 2741 warn "loading config and database again";
2363 cf::cfg_load; 2742 cf::cfg_load;
2364 cf::db_load;
2365 2743
2366 warn "load extensions"; 2744 warn "loading extensions";
2367 cf::load_extensions; 2745 cf::load_extensions;
2368 2746
2369 warn "reattach attachments to objects/players"; 2747 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2748 _global_reattach; # objects, sockets
2371 warn "reattach attachments to maps"; 2749 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2750 reattach $_ for values %MAP;
2373 }; 2751 warn "reattaching attachments to players";
2752 reattach $_ for values %PLAYER;
2374 2753
2375 if ($@) { 2754 warn "leaving sync_job";
2755
2756 1
2757 } or do {
2376 warn $@; 2758 warn $@;
2377 warn "error while reloading, exiting."; 2759 warn "error while reloading, exiting.";
2378 exit 1; 2760 exit 1;
2379 } 2761 };
2380 2762
2381 warn "reloaded"; 2763 warn "reloaded";
2382}; 2764};
2383 2765
2766our $RELOAD_WATCHER; # used only during reload
2767
2768sub reload_perl() {
2769 # doing reload synchronously and two reloads happen back-to-back,
2770 # coro crashes during coro_state_free->destroy here.
2771
2772 $RELOAD_WATCHER ||= Event->timer (
2773 reentrant => 0,
2774 after => 0,
2775 data => WF_AUTOCANCEL,
2776 cb => sub {
2777 do_reload_perl;
2778 undef $RELOAD_WATCHER;
2779 },
2780 );
2781}
2782
2384register_command "reload" => sub { 2783register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2784 my ($who, $arg) = @_;
2386 2785
2387 if ($who->flag (FLAG_WIZ)) { 2786 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload.");
2389 reload;
2390 $who->message ("end of reload."); 2787 $who->message ("reloading server.");
2788 async { reload_perl };
2391 } 2789 }
2392}; 2790};
2393 2791
2394unshift @INC, $LIBDIR; 2792unshift @INC, $LIBDIR;
2793
2794my $bug_warning = 0;
2795
2796our @WAIT_FOR_TICK;
2797our @WAIT_FOR_TICK_BEGIN;
2798
2799sub wait_for_tick {
2800 return unless $TICK_WATCHER->is_active;
2801 return if $Coro::current == $Coro::main;
2802
2803 my $signal = new Coro::Signal;
2804 push @WAIT_FOR_TICK, $signal;
2805 $signal->wait;
2806}
2807
2808sub wait_for_tick_begin {
2809 return unless $TICK_WATCHER->is_active;
2810 return if $Coro::current == $Coro::main;
2811
2812 my $signal = new Coro::Signal;
2813 push @WAIT_FOR_TICK_BEGIN, $signal;
2814 $signal->wait;
2815}
2395 2816
2396$TICK_WATCHER = Event->timer ( 2817$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2818 reentrant => 0,
2819 parked => 1,
2398 prio => 0, 2820 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2821 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2822 data => WF_AUTOCANCEL,
2401 cb => sub { 2823 cb => sub {
2824 if ($Coro::current != $Coro::main) {
2825 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2826 unless ++$bug_warning > 10;
2827 return;
2828 }
2829
2402 $NOW = Event::time; 2830 $NOW = Event::time;
2403 2831
2404 cf::server_tick; # one server iteration 2832 cf::server_tick; # one server iteration
2833
2405 $RUNTIME += $TICK; 2834 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2835 $NEXT_TICK += $TICK;
2407 2836
2408 $WAIT_FOR_TICK->broadcast; 2837 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2838 $NEXT_RUNTIME_WRITE = $NOW + 10;
2839 Coro::async_pool {
2840 write_runtime
2841 or warn "ERROR: unable to write runtime file: $!";
2842 };
2843 }
2844
2845# my $AFTER = Event::time;
2846# warn $AFTER - $NOW;#d#
2410 2847
2411 # if we are delayed by four ticks or more, skip them all 2848 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2413 2850
2414 $TICK_WATCHER->at ($NEXT_TICK); 2851 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 2852 $TICK_WATCHER->start;
2853
2854 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2855 $sig->send;
2856 }
2857 while (my $sig = shift @WAIT_FOR_TICK) {
2858 $sig->send;
2859 }
2860
2861 _post_tick;
2416 }, 2862 },
2417); 2863);
2418 2864
2865{
2419IO::AIO::max_poll_time $TICK * 0.2; 2866 BDB::max_poll_time $TICK * 0.1;
2420 2867 $BDB_POLL_WATCHER = Event->io (
2421Event->io ( 2868 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 2869 fd => BDB::poll_fileno,
2423 poll => 'r', 2870 poll => 'r',
2424 prio => 5, 2871 prio => 0,
2425 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb,
2427);
2428
2429Event->timer (
2430 data => WF_AUTOCANCEL, 2872 data => WF_AUTOCANCEL,
2431 after => 0, 2873 cb => \&BDB::poll_cb,
2432 interval => 10, 2874 );
2433 cb => sub { 2875 BDB::min_parallel 8;
2434 (Coro::unblock_sub { 2876
2435 write_runtime 2877 BDB::set_sync_prepare {
2436 or warn "ERROR: unable to write runtime file: $!"; 2878 my $status;
2879 my $current = $Coro::current;
2880 (
2881 sub {
2882 $status = $!;
2883 $current->ready; undef $current;
2884 },
2885 sub {
2886 Coro::schedule while defined $current;
2887 $! = $status;
2888 },
2889 )
2890 };
2891
2892 unless ($DB_ENV) {
2893 $DB_ENV = BDB::db_env_create;
2894
2895 cf::sync_job {
2896 eval {
2897 BDB::db_env_open
2898 $DB_ENV,
2899 $BDBDIR,
2900 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2901 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2902 0666;
2903
2904 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2905
2906 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2907 $DB_ENV->set_lk_detect;
2908 };
2909
2910 cf::cleanup "db_env_open(db): $@" if $@;
2437 })->(); 2911 };
2438 }, 2912 }
2439); 2913}
2914
2915{
2916 IO::AIO::min_parallel 8;
2917
2918 undef $Coro::AIO::WATCHER;
2919 IO::AIO::max_poll_time $TICK * 0.1;
2920 $AIO_POLL_WATCHER = Event->io (
2921 reentrant => 0,
2922 data => WF_AUTOCANCEL,
2923 fd => IO::AIO::poll_fileno,
2924 poll => 'r',
2925 prio => 6,
2926 cb => \&IO::AIO::poll_cb,
2927 );
2928}
2929
2930# load additional modules
2931use cf::pod;
2440 2932
2441END { cf::emergency_save } 2933END { cf::emergency_save }
2442 2934
24431 29351
2444 2936

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines