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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.231 by root, Wed Apr 4 00:02:06 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.3 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
26use YAML::Syck ();
23use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 37
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
33 40
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 44
36our %COMMAND = (); 45our %COMMAND = ();
37our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
38 47
39our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 49our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
43 52
53our $RELOAD; # number of reloads so far
44our @EVENT; 54our @EVENT;
45our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
46 56
47our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 58our $TICK_WATCHER;
59our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 61our $NEXT_TICK;
50our $NOW; 62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
51 67
52our %CFG; 68our %CFG;
53 69
54our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 71our $RUNTIME;
56 72
57our %PLAYER; # all users 73our %PLAYER; # all users
58our %MAP; # all maps 74our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 75our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
61 78
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81
82# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 84
65binmode STDOUT; 85binmode STDOUT;
66binmode STDERR; 86binmode STDERR;
67 87
68# read virtual server time, if available 88# read virtual server time, if available
75mkdir cf::localdir; 95mkdir cf::localdir;
76mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
80 101
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 102our $EMERGENCY_POSITION;
103
104sub cf::map::normalise;
84 105
85############################################################################# 106#############################################################################
86 107
87=head2 GLOBAL VARIABLES 108=head2 GLOBAL VARIABLES
88 109
187 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
188 $d 209 $d
189 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
190} 211}
191 212
192use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
193 214
194=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
195 216
196Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
197 218
198=cut
199
200sub from_json($) {
201 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
202 JSON::Syck::Load $_[0]
203}
204
205=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
206 220
207Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
208
209=cut
210
211sub to_json($) {
212 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
213 JSON::Syck::Dump $_[0]
214}
215 222
216=item cf::lock_wait $string 223=item cf::lock_wait $string
217 224
218Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
219 226
256} 263}
257 264
258sub freeze_mainloop { 265sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
260 267
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 268 my $guard = Coro::guard {
269 $TICK_WATCHER->start;
270 };
262 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
263 $guard 272 $guard
264} 273}
265 274
266=item cf::async { BLOCK } 275=item cf::async { BLOCK }
337 346
338 $coro 347 $coro
339} 348}
340 349
341sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
342 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
343 354
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 356 or return;
346 357
358 my $value = $cf::RUNTIME + 90 + 10;
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 359 # 10 is the runtime save interval, for a monotonic clock
360 # 60 allows for the watchdog to kill the server.
361
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 363 and return;
350 364
365 # always fsync - this file is important
351 aio_fsync $fh 366 aio_fsync $fh
352 and return; 367 and return;
353 368
354 close $fh 369 close $fh
355 or return; 370 or return;
358 and return; 373 and return;
359 374
360 1 375 1
361} 376}
362 377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387}
388
363=back 389=back
364 390
365=cut 391=cut
366
367#############################################################################
368
369package cf::path;
370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
383sub new {
384 my ($class, $path, $base) = @_;
385
386 return $path if ref $path;
387
388 my $self = {};
389
390 # {... are special paths that are not being touched
391 # ?xxx/... are special absolute paths
392 # ?random/... random maps
393 # /! non-realised random map exit
394 # /... normal maps
395 # ~/... per-player maps without a specific player (DO NOT USE)
396 # ~user/... per-player map of a specific user
397
398 $path =~ s/$PATH_SEP/\//go;
399
400 if ($path =~ /^{/) {
401 # fine as it is
402 } else {
403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
405 $self->{user_rel} = 1;
406
407 if (defined $1) {
408 $self->{user} = $1;
409 } elsif ($base =~ m{^~([^/]+)/}) {
410 $self->{user} = $1;
411 } else {
412 warn "cannot resolve user-relative path without user <$path,$base>\n";
413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
420 } elsif ($path =~ /^\//) {
421 # /...
422 # already absolute
423 } else {
424 # relative
425 $base =~ s{[^/]+/?$}{};
426 return $class->new ("$base/$path");
427 }
428
429 for ($path) {
430 redo if s{/\.?/}{/};
431 redo if s{/[^/]+/\.\./}{/};
432 }
433 }
434
435 $self->{path} = $path;
436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
458}
459
460# the name / primary key / in-game path
461sub as_string {
462 my ($self) = @_;
463
464 $self->{user_rel} ? "~$self->{user}$self->{path}"
465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
466 : $self->{path}
467}
468
469# the displayed name, this is a one way mapping
470sub visible_name {
471 &as_string
472}
473
474# escape the /'s in the path
475sub _escaped_path {
476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 392
523############################################################################# 393#############################################################################
524 394
525=head2 ATTACHABLE OBJECTS 395=head2 ATTACHABLE OBJECTS
526 396
652our @CB_TYPE = (); # registry for type (cf-object class) based events 522our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 523our @CB_MAP = ();
654 524
655my %attachment; 525my %attachment;
656 526
527sub cf::attachable::thawer_merge {
528 # simply override everything except _meta
529 local $_[0]{_meta};
530 %{$_[0]} = %{$_[1]};
531}
532
657sub _attach_cb($$$$) { 533sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 534 my ($registry, $event, $prio, $cb) = @_;
659 535
660 use sort 'stable'; 536 use sort 'stable';
661 537
832# object support 708# object support
833 709
834sub reattach { 710sub reattach {
835 # basically do the same as instantiate, without calling instantiate 711 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 712 my ($obj) = @_;
713
714 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 715
838 my $registry = $obj->registry; 716 my $registry = $obj->registry;
839 717
840 @$registry = (); 718 @$registry = ();
841 719
888 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
889 767
890 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
891 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
892 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
893 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
894 close $fh; 772 close $fh;
895 773
896 if (@$objs) { 774 if (@$objs) {
897 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
898 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
899 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
900 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
901 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
902 close $fh; 780 close $fh;
903 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
904 } 782 }
905 } else { 783 } else {
906 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
1028 "package $pkg; use strict; use utf8;\n" 906 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 907 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 908 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 909 . "\n};\n1";
1032 910
1033 eval $source 911 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 912 my $msg = $@ ? "$path: $@\n"
1035 : "extension disabled.\n"; 913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
1036 921
1037 push @EXTS, $pkg; 922 push @EXTS, $pkg;
1038} 923}
1039 924
1040sub load_extensions { 925sub load_extensions {
1046 } or warn "$ext not loaded: $@"; 931 } or warn "$ext not loaded: $@";
1047 } 932 }
1048} 933}
1049 934
1050############################################################################# 935#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 936
1066=head2 CORE EXTENSIONS 937=head2 CORE EXTENSIONS
1067 938
1068Functions and methods that extend core crossfire objects. 939Functions and methods that extend core crossfire objects.
1069 940
1105 976
1106sub exists($) { 977sub exists($) {
1107 my ($login) = @_; 978 my ($login) = @_;
1108 979
1109 $cf::PLAYER{$login} 980 $cf::PLAYER{$login}
1110 or cf::sync_job { !aio_stat $login } 981 or cf::sync_job { !aio_stat path $login }
1111} 982}
1112 983
1113sub find($) { 984sub find($) {
1114 return $cf::PLAYER{$_[0]} || do { 985 return $cf::PLAYER{$_[0]} || do {
1115 my $login = $_[0]; 986 my $login = $_[0];
1161 1032
1162=cut 1033=cut
1163 1034
1164sub quit_character { 1035sub quit_character {
1165 my ($pl) = @_; 1036 my ($pl) = @_;
1037
1038 my $name = $pl->ob->name;
1166 1039
1167 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1168 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1169 1042
1170 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1175 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1176 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1177 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1178 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1179 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1180 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1181} 1074}
1182 1075
1183=item cf::player::list_logins 1076=item cf::player::list_logins
1184 1077
1185Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
1205 \@logins 1098 \@logins
1206} 1099}
1207 1100
1208=item $player->maps 1101=item $player->maps
1209 1102
1210Returns an arrayref of cf::path's of all maps that are private for this 1103Returns an arrayref of map paths that are private for this
1211player. May block. 1104player. May block.
1212 1105
1213=cut 1106=cut
1214 1107
1215sub maps($) { 1108sub maps($) {
1216 my ($pl) = @_; 1109 my ($pl) = @_;
1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1217 1112
1218 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1219 or return; 1114 or return;
1220 1115
1221 my @paths; 1116 my @paths;
1223 for (@$files) { 1118 for (@$files) {
1224 utf8::decode $_; 1119 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1227 1122
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1123 push @paths, cf::map::normalise "~$pl/$_";
1229 } 1124 }
1230 1125
1231 \@paths 1126 \@paths
1232} 1127}
1233 1128
1234=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1235 1130
1236Sends an ext reply to the player. 1131Sends an ext reply to the player.
1237 1132
1238=cut 1133=cut
1239 1134
1240sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1241 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1242 1137
1243 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 delete $msg{msgid};
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1244 1155
1245 $self->send ("ext " . cf::to_json \%msg); 1156 $self->send ("ext " . cf::to_json \%msg);
1246} 1157}
1247 1158
1248package cf; 1159package cf;
1259package cf::map; 1170package cf::map;
1260 1171
1261use Fcntl; 1172use Fcntl;
1262use Coro::AIO; 1173use Coro::AIO;
1263 1174
1175use overload
1176 '""' => \&as_string,
1177 fallback => 1;
1178
1264our $MAX_RESET = 3600; 1179our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1180our $DEFAULT_RESET = 3000;
1266 1181
1267sub generate_random_map { 1182sub generate_random_map {
1268 my ($path, $rmp) = @_; 1183 my ($self, $rmp) = @_;
1269
1270 # mit "rum" bekleckern, nicht 1184 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1185 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1186 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1187 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1188 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1189 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1190 $rmp->{xsize}, $rmp->{ysize},
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1195 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1196 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1197 )
1285} 1198}
1286 1199
1200=item cf::map->register ($regex, $prio)
1201
1202Register a handler for the map path matching the given regex at the
1203givne priority (higher is better, built-in handlers have priority 0, the
1204default).
1205
1206=cut
1207
1208sub register {
1209 my (undef, $regex, $prio) = @_;
1210 my $pkg = caller;
1211
1212 no strict;
1213 push @{"$pkg\::ISA"}, __PACKAGE__;
1214
1215 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1216}
1217
1218# also paths starting with '/'
1219$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1220
1221sub thawer_merge {
1222 my ($self, $merge) = @_;
1223
1224 # we have to keep some variables in memory intact
1225 local $self->{path};
1226 local $self->{load_path};
1227 local $self->{deny_save};
1228 local $self->{deny_reset};
1229
1230 $self->SUPER::thawer_merge ($merge);
1231}
1232
1233sub normalise {
1234 my ($path, $base) = @_;
1235
1236 $path = "$path"; # make sure its a string
1237
1238 $path =~ s/\.map$//;
1239
1240 # map plan:
1241 #
1242 # /! non-realised random map exit (special hack!)
1243 # {... are special paths that are not being touched
1244 # ?xxx/... are special absolute paths
1245 # ?random/... random maps
1246 # /... normal maps
1247 # ~user/... per-player map of a specific user
1248
1249 $path =~ s/$PATH_SEP/\//go;
1250
1251 # treat it as relative path if it starts with
1252 # something that looks reasonable
1253 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1254 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1255
1256 $base =~ s{[^/]+/?$}{};
1257 $path = "$base/$path";
1258 }
1259
1260 for ($path) {
1261 redo if s{//}{/};
1262 redo if s{/\.?/}{/};
1263 redo if s{/[^/]+/\.\./}{/};
1264 }
1265
1266 $path
1267}
1268
1269sub new_from_path {
1270 my (undef, $path, $base) = @_;
1271
1272 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1273
1274 $path = normalise $path, $base;
1275
1276 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1277 if ($path =~ $EXT_MAP{$pkg}[1]) {
1278 my $self = bless cf::map::new, $pkg;
1279 $self->{path} = $path; $self->path ($path);
1280 $self->init; # pass $1 etc.
1281 return $self;
1282 }
1283 }
1284
1285 Carp::carp "unable to resolve path '$path' (base '$base').";
1286 ()
1287}
1288
1289sub init {
1290 my ($self) = @_;
1291
1292 $self
1293}
1294
1295sub as_string {
1296 my ($self) = @_;
1297
1298 "$self->{path}"
1299}
1300
1301# the displayed name, this is a one way mapping
1302sub visible_name {
1303 &as_string
1304}
1305
1306# the original (read-only) location
1307sub load_path {
1308 my ($self) = @_;
1309
1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1311}
1312
1313# the temporary/swap location
1314sub save_path {
1315 my ($self) = @_;
1316
1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1319}
1320
1321# the unique path, undef == no special unique path
1322sub uniq_path {
1323 my ($self) = @_;
1324
1325 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1326 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1327}
1328
1287# and all this just because we cannot iterate over 1329# and all this just because we cannot iterate over
1288# all maps in C++... 1330# all maps in C++...
1289sub change_all_map_light { 1331sub change_all_map_light {
1290 my ($change) = @_; 1332 my ($change) = @_;
1291 1333
1292 $_->change_map_light ($change) 1334 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1335 for grep $_->outdoor, values %cf::MAP;
1294} 1336}
1295 1337
1338sub unlink_save {
1339 my ($self) = @_;
1340
1341 utf8::encode (my $save = $self->save_path);
1342 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1343 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1344}
1345
1296sub load_map_header($) { 1346sub load_header_from($) {
1297 my ($path) = @_; 1347 my ($self, $path) = @_;
1298 1348
1299 utf8::encode $path; 1349 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1350 #aio_open $path, O_RDONLY, 0
1351 # or return;
1352
1353 $self->_load_header ($path)
1301 or return; 1354 or return;
1302 1355
1303 my $map = cf::map::new 1356 $self->{load_path} = $path;
1357
1358 1
1359}
1360
1361sub load_header_orig {
1362 my ($self) = @_;
1363
1364 $self->load_header_from ($self->load_path)
1365}
1366
1367sub load_header_temp {
1368 my ($self) = @_;
1369
1370 $self->load_header_from ($self->save_path)
1371}
1372
1373sub prepare_temp {
1374 my ($self) = @_;
1375
1376 $self->last_access ((delete $self->{last_access})
1377 || $cf::RUNTIME); #d#
1378 # safety
1379 $self->{instantiate_time} = $cf::RUNTIME
1380 if $self->{instantiate_time} > $cf::RUNTIME;
1381}
1382
1383sub prepare_orig {
1384 my ($self) = @_;
1385
1386 $self->{load_original} = 1;
1387 $self->{instantiate_time} = $cf::RUNTIME;
1388 $self->last_access ($cf::RUNTIME);
1389 $self->instantiate;
1390}
1391
1392sub load_header {
1393 my ($self) = @_;
1394
1395 if ($self->load_header_temp) {
1396 $self->prepare_temp;
1397 } else {
1398 $self->load_header_orig
1304 or return; 1399 or return;
1400 $self->prepare_orig;
1401 }
1305 1402
1306 # for better error messages only, will be overwritten later 1403 1
1307 $map->path ($path);
1308
1309 $map->load_header ($path)
1310 or return;
1311
1312 $map->{load_path} = $path;
1313
1314 $map
1315} 1404}
1316 1405
1317sub find; 1406sub find;
1318sub find { 1407sub find {
1319 my ($path, $origin) = @_; 1408 my ($path, $origin) = @_;
1320 1409
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1410 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1411
1326 cf::lock_wait "map_find:$key"; 1412 cf::lock_wait "map_find:$path";
1327 1413
1328 $cf::MAP{$key} || do { 1414 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1415 my $guard = cf::lock_acquire "map_find:$path";
1330 1416 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1417 or return;
1345 1418
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1419 $map->{last_save} = $cf::RUNTIME;
1358 1420
1359 Coro::cede; 1421 $map->load_header
1422 or return;
1360 1423
1361 if ($map->should_reset) { 1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1425 # doing this can freeze the server in a sync job, obviously
1426 #$cf::WAIT_FOR_TICK->wait;
1362 $map->reset; 1427 $map->reset;
1363 undef $guard; 1428 undef $guard;
1364 $map = find $path 1429 return find $path;
1365 or return;
1366 } 1430 }
1367 1431
1368 $cf::MAP{$key} = $map 1432 $cf::MAP{$path} = $map
1369 } 1433 }
1370} 1434}
1435
1436sub pre_load { }
1437sub post_load { }
1371 1438
1372sub load { 1439sub load {
1373 my ($self) = @_; 1440 my ($self) = @_;
1374 1441
1442 local $self->{deny_reset} = 1; # loading can take a long time
1443
1375 my $path = $self->{path}; 1444 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1445 my $guard = cf::lock_acquire "map_load:$path";
1377 1446
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1447 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1448
1380 $self->in_memory (cf::MAP_LOADING); 1449 $self->in_memory (cf::MAP_LOADING);
1381 1450
1382 $self->alloc; 1451 $self->alloc;
1452
1453 $self->pre_load;
1454
1383 $self->load_objects ($self->{load_path}, 1) 1455 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1456 or return;
1385 1457
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1459 if delete $self->{load_original};
1388 1460
1389 if (my $uniq = $path->uniq_path) { 1461 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1462 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1463 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1464 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1465 $self->_load_objects ($uniq, 0);
1394 } 1466 }
1395 } 1467 }
1396 1468
1397 Coro::cede; 1469 Coro::cede;
1398 1470
1399 # now do the right thing for maps 1471 # now do the right thing for maps
1400 $self->link_multipart_objects; 1472 $self->link_multipart_objects;
1401 1473
1402 if ($self->{path}->is_style_map) { 1474 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1475 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1476 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1477 $self->update_buttons;
1478 Coro::cede;
1409 $self->set_darkness_map; 1479 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1480 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1481 unless $self->difficulty;
1482 Coro::cede;
1412 $self->activate; 1483 $self->activate;
1413 } 1484 }
1414 1485
1415 Coro::cede; 1486 $self->post_load;
1416 1487
1417 $self->in_memory (cf::MAP_IN_MEMORY); 1488 $self->in_memory (cf::MAP_IN_MEMORY);
1489}
1490
1491sub customise_for {
1492 my ($self, $ob) = @_;
1493
1494 return find "~" . $ob->name . "/" . $self->{path}
1495 if $self->per_player;
1496
1497 $self
1418} 1498}
1419 1499
1420# find and load all maps in the 3x3 area around a map 1500# find and load all maps in the 3x3 area around a map
1421sub load_diag { 1501sub load_diag {
1422 my ($map) = @_; 1502 my ($map) = @_;
1452 1532
1453 cf::sync_job { $map->load }; 1533 cf::sync_job { $map->load };
1454} 1534}
1455 1535
1456our %MAP_PREFETCH; 1536our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1537our $MAP_PREFETCHER = undef;
1458 while () {
1459 while (%MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path
1465 or next;
1466 $map->load;
1467 }
1468 Coro::schedule;
1469 }
1470};
1471 1538
1472sub find_async { 1539sub find_async {
1473 my ($path, $origin) = @_; 1540 my ($path, $origin) = @_;
1474 1541
1475 $path = new cf::path $path, $origin && $origin->path; 1542 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1543
1478 if (my $map = $cf::MAP{$key}) { 1544 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1545 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1546 }
1481 1547
1482 $MAP_PREFETCH{$key} = $path; 1548 undef $MAP_PREFETCH{$path};
1549 $MAP_PREFETCHER ||= cf::async {
1550 while (%MAP_PREFETCH) {
1551 for my $path (keys %MAP_PREFETCH) {
1552 my $map = find $path
1553 or next;
1554 $map->load;
1555
1556 delete $MAP_PREFETCH{$path};
1557 }
1558 }
1559 undef $MAP_PREFETCHER;
1560 };
1483 $MAP_PREFETCHER->ready; 1561 $MAP_PREFETCHER->prio (6);
1484 1562
1485 () 1563 ()
1486} 1564}
1487 1565
1488sub save { 1566sub save {
1492 1570
1493 $self->{last_save} = $cf::RUNTIME; 1571 $self->{last_save} = $cf::RUNTIME;
1494 1572
1495 return unless $self->dirty; 1573 return unless $self->dirty;
1496 1574
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1575 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1576 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1577
1500 $self->{load_path} = $save; 1578 $self->{load_path} = $save;
1501 1579
1502 return if $self->{deny_save}; 1580 return if $self->{deny_save};
1503 1581
1506 cf::async { 1584 cf::async {
1507 $_->contr->save for $self->players; 1585 $_->contr->save for $self->players;
1508 }; 1586 };
1509 1587
1510 if ($uniq) { 1588 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1589 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1590 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1591 } else {
1514 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1592 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1515 } 1593 }
1516} 1594}
1517 1595
1518sub swap_out { 1596sub swap_out {
1519 my ($self) = @_; 1597 my ($self) = @_;
1533 1611
1534sub reset_at { 1612sub reset_at {
1535 my ($self) = @_; 1613 my ($self) = @_;
1536 1614
1537 # TODO: safety, remove and allow resettable per-player maps 1615 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1616 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1617 return 1e99 if $self->{deny_reset};
1540 1618
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1619 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1620 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1543 1621
1548 my ($self) = @_; 1626 my ($self) = @_;
1549 1627
1550 $self->reset_at <= $cf::RUNTIME 1628 $self->reset_at <= $cf::RUNTIME
1551} 1629}
1552 1630
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 1631sub reset {
1575 my ($self) = @_; 1632 my ($self) = @_;
1576 1633
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1634 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1635
1579 return if $self->players; 1636 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1637 return if $self->isa ("ext::map_per_player");#d#
1581 1638
1582 warn "resetting map ", $self->path;#d# 1639 warn "resetting map ", $self->path;#d#
1583 1640
1641 $self->in_memory (cf::MAP_SWAPPED);
1642
1643 # need to save uniques path
1644 unless ($self->{deny_save}) {
1645 my $uniq = $self->uniq_path; utf8::encode $uniq;
1646
1647 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1648 if $uniq;
1649 }
1650
1584 delete $cf::MAP{$self->path}; 1651 delete $cf::MAP{$self->path};
1652
1653 $self->clear;
1585 1654
1586 $_->clear_links_to ($self) for values %cf::MAP; 1655 $_->clear_links_to ($self) for values %cf::MAP;
1587 1656
1588 $self->unlink_save; 1657 $self->unlink_save;
1589 $self->destroy; 1658 $self->destroy;
1592my $nuke_counter = "aaaa"; 1661my $nuke_counter = "aaaa";
1593 1662
1594sub nuke { 1663sub nuke {
1595 my ($self) = @_; 1664 my ($self) = @_;
1596 1665
1666 delete $cf::MAP{$self->path};
1667
1668 $self->unlink_save;
1669
1670 bless $self, "cf::map";
1671 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1672 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1673 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1674 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1675
1676 $cf::MAP{$self->path} = $self;
1677
1600 $self->reset; # polite request, might not happen 1678 $self->reset; # polite request, might not happen
1601} 1679}
1602 1680
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1681=item cf::map::unique_maps
1614 1682
1615Returns an arrayref of cf::path's of all shared maps that have 1683Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1684instantiated unique items. May block.
1617 1685
1618=cut 1686=cut
1619 1687
1620sub unique_maps() { 1688sub unique_maps() {
1626 for (@$files) { 1694 for (@$files) {
1627 utf8::decode $_; 1695 utf8::decode $_;
1628 next if /\.pst$/; 1696 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1697 next unless /^$PATH_SEP/o;
1630 1698
1631 push @paths, new cf::path $_; 1699 push @paths, cf::map::normalise $_;
1632 } 1700 }
1633 1701
1634 \@paths 1702 \@paths
1635} 1703}
1636 1704
1711 1779
1712=item $player_object->enter_link 1780=item $player_object->enter_link
1713 1781
1714Freezes the player and moves him/her to a special map (C<{link}>). 1782Freezes the player and moves him/her to a special map (C<{link}>).
1715 1783
1716The player should be reaosnably safe there for short amounts of time. You 1784The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1785I<MUST> call C<leave_link> as soon as possible, though.
1718 1786
1787Will never block.
1788
1719=item $player_object->leave_link ($map, $x, $y) 1789=item $player_object->leave_link ($map, $x, $y)
1720 1790
1721Moves the player out of the specila link map onto the given map. If the 1791Moves the player out of the special C<{link}> map onto the specified
1722map is not valid (or omitted), the player will be moved back to the 1792map. If the map is not valid (or omitted), the player will be moved back
1723location he/she was before the call to C<enter_link>, or, if that fails, 1793to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1794fails, to the emergency map position.
1725 1795
1726Might block. 1796Might block.
1727 1797
1728=cut 1798=cut
1799
1800sub link_map {
1801 unless ($LINK_MAP) {
1802 $LINK_MAP = cf::map::find "{link}"
1803 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1804 $LINK_MAP->load;
1805 }
1806
1807 $LINK_MAP
1808}
1729 1809
1730sub cf::object::player::enter_link { 1810sub cf::object::player::enter_link {
1731 my ($self) = @_; 1811 my ($self) = @_;
1732 1812
1733 $self->deactivate_recursive; 1813 $self->deactivate_recursive;
1734 1814
1735 return if $self->map == $LINK_MAP; 1815 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1816
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1818 if $self->map;
1739 1819
1740 $self->enter_map ($LINK_MAP, 20, 20); 1820 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1821}
1742 1822
1743sub cf::object::player::leave_link { 1823sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1824 my ($self, $map, $x, $y) = @_;
1745 1825
1767 $map->load; 1847 $map->load;
1768 $map->load_diag; 1848 $map->load_diag;
1769 1849
1770 return unless $self->contr->active; 1850 return unless $self->contr->active;
1771 $self->activate_recursive; 1851 $self->activate_recursive;
1852
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1772 $self->enter_map ($map, $x, $y); 1854 $self->enter_map ($map, $x, $y);
1773} 1855}
1774 1856
1775cf::player->attach ( 1857cf::player->attach (
1776 on_logout => sub { 1858 on_logout => sub {
1789 # try to abort aborted map switching on player login :) 1871 # try to abort aborted map switching on player login :)
1790 # should happen only on crashes 1872 # should happen only on crashes
1791 if ($pl->ob->{_link_pos}) { 1873 if ($pl->ob->{_link_pos}) {
1792 $pl->ob->enter_link; 1874 $pl->ob->enter_link;
1793 (async { 1875 (async {
1794 # we need this sleep as the login has a concurrent enter_exit running
1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef, 1876 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, " 1877 "There was an internal problem at your last logout, "
1798 . "the server will try to bring you to your intended destination in a second.", 1878 . "the server will try to bring you to your intended destination in a second.",
1799 cf::NDI_RED); 1879 cf::NDI_RED);
1880 # we need this sleep as the login has a concurrent enter_exit running
1881 # and this sleep increases chances of the player not ending up in scorn
1800 Coro::Timer::sleep 1; 1882 Coro::Timer::sleep 1;
1801 $pl->ob->leave_link; 1883 $pl->ob->leave_link;
1802 })->prio (2); 1884 })->prio (2);
1803 } 1885 }
1804 }, 1886 },
1809=cut 1891=cut
1810 1892
1811sub cf::object::player::goto { 1893sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1894 my ($self, $path, $x, $y) = @_;
1813 1895
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1896 $self->enter_link;
1817 1897
1818 (async { 1898 (async {
1899 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 1900 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1901 $map = $map->customise_for ($self) if $map;
1821 1902 $map
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1903 } or
1823# if $map;
1824
1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1904 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1826 1905
1827 $self->leave_link ($map, $x, $y); 1906 $self->leave_link ($map, $x, $y);
1828 })->prio (1); 1907 })->prio (1);
1829} 1908}
1830 1909
1834 1913
1835sub parse_random_map_params { 1914sub parse_random_map_params {
1836 my ($spec) = @_; 1915 my ($spec) = @_;
1837 1916
1838 my $rmp = { # defaults 1917 my $rmp = { # defaults
1839 xsize => 10, 1918 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1919 ysize => (cf::rndm 15, 40),
1920 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1921 #layout => string,
1841 }; 1922 };
1842 1923
1843 for (split /\n/, $spec) { 1924 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1925 my ($k, $v) = split /\s+/, $_, 2;
1845 1926
1849 $rmp 1930 $rmp
1850} 1931}
1851 1932
1852sub prepare_random_map { 1933sub prepare_random_map {
1853 my ($exit) = @_; 1934 my ($exit) = @_;
1935
1936 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1937
1855 # all this does is basically replace the /! path by 1938 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1939 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1940 # that depends on the exit object
1858 1941
1859 my $rmp = parse_random_map_params $exit->msg; 1942 my $rmp = parse_random_map_params $exit->msg;
1860 1943
1861 if ($exit->map) { 1944 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 1945 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 1946 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 1947 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 1948 $rmp->{origin_y} = $exit->y;
1866 } 1949 }
1867 1950
1868 $rmp->{random_seed} ||= $exit->random_seed; 1951 $rmp->{random_seed} ||= $exit->random_seed;
1869 1952
1870 my $data = cf::to_json $rmp; 1953 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1954 my $md5 = Digest::MD5::md5_hex $data;
1955 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1956
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1957 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1958 aio_write $fh, 0, (length $data), $data, 0;
1959 undef $fh;
1960 aio_rename "$meta~", $meta;
1875 1961
1876 $exit->slaying ("?random/$md5"); 1962 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1963 $exit->msg (undef);
1878 } 1964 }
1879} 1965}
1880 1966
1881sub cf::object::player::enter_exit { 1967sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1968 my ($self, $exit) = @_;
1883 1969
1884 return unless $self->type == cf::PLAYER; 1970 return unless $self->type == cf::PLAYER;
1971
1972 if ($exit->slaying eq "/!") {
1973 #TODO: this should de-fi-ni-te-ly not be a sync-job
1974 cf::sync_job { prepare_random_map $exit };
1975 }
1976
1977 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978 my $hp = $exit->stats->hp;
1979 my $sp = $exit->stats->sp;
1885 1980
1886 $self->enter_link; 1981 $self->enter_link;
1887 1982
1888 (async { 1983 (async {
1889 $self->deactivate_recursive; # just to be sure 1984 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1985 unless (eval {
1891 prepare_random_map $exit 1986 $self->goto ($slaying, $hp, $sp);
1892 if $exit->slaying eq "/!";
1893
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1987
1897 1; 1988 1;
1898 }) { 1989 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1990 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "I'll try to bring you back to the map you were before. " 1991 . "I'll try to bring you back to the map you were before. "
1920 2011
1921sub cf::client::send_drawinfo { 2012sub cf::client::send_drawinfo {
1922 my ($self, $text, $flags) = @_; 2013 my ($self, $text, $flags) = @_;
1923 2014
1924 utf8::encode $text; 2015 utf8::encode $text;
1925 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1926} 2017}
1927 2018
1928 2019
1929=item $success = $client->query ($flags, "text", \&cb) 2020=item $success = $client->query ($flags, "text", \&cb)
1930 2021
1961 # get handled first 2052 # get handled first
1962 my $queue = delete $ns->{query_queue} 2053 my $queue = delete $ns->{query_queue}
1963 or return; # be conservative, not sure how that can happen, but we saw a crash here 2054 or return; # be conservative, not sure how that can happen, but we saw a crash here
1964 2055
1965 (shift @$queue)->[1]->($msg); 2056 (shift @$queue)->[1]->($msg);
2057 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2058
1967 push @{ $ns->{query_queue} }, @$queue; 2059 push @{ $ns->{query_queue} }, @$queue;
1968 2060
1969 if (@{ $ns->{query_queue} } == @$queue) { 2061 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2062 if (@$queue) {
2028 2120
2029# here we export the classes and methods available to script code 2121# here we export the classes and methods available to script code
2030 2122
2031=pod 2123=pod
2032 2124
2033The following fucntions and emthods are available within a safe environment: 2125The following functions and methods are available within a safe environment:
2034 2126
2035 cf::object contr pay_amount pay_player map 2127 cf::object contr pay_amount pay_player map
2036 cf::object::player player 2128 cf::object::player player
2037 cf::player peaceful 2129 cf::player peaceful
2038 cf::map trigger 2130 cf::map trigger
2131The parameter C<$family> should best start with the name of the extension 2223The parameter C<$family> should best start with the name of the extension
2132using it, it should be unique. 2224using it, it should be unique.
2133 2225
2134=over 4 2226=over 4
2135 2227
2136=item $hashref = cf::db_get $family
2137
2138Return a hashref for use by the extension C<$family>, which can be
2139modified. After modifications, you have to call C<cf::db_dirty> or
2140C<cf::db_sync>.
2141
2142=item $value = cf::db_get $family => $key 2228=item $value = cf::db_get $family => $key
2143 2229
2144Returns a single value from the database 2230Returns a single value from the database.
2145
2146=item cf::db_put $family => $hashref
2147
2148Stores the given family hashref into the database. Updates are delayed, if
2149you want the data to be synced to disk immediately, use C<cf::db_sync>.
2150 2231
2151=item cf::db_put $family => $key => $value 2232=item cf::db_put $family => $key => $value
2152 2233
2153Stores the given C<$value> in the family hash. Updates are delayed, if you 2234Stores the given C<$value> in the family.
2154want the data to be synced to disk immediately, use C<cf::db_sync>.
2155
2156=item cf::db_dirty
2157
2158Marks the database as dirty, to be updated at a later time.
2159
2160=item cf::db_sync
2161
2162Immediately write the database to disk I<if it is dirty>.
2163 2235
2164=cut 2236=cut
2165 2237
2166our $DB; 2238our $DB;
2167 2239
2168{ 2240sub db_init {
2241 unless ($DB) {
2242 $DB = BDB::db_create $DB_ENV;
2243
2244 cf::sync_job {
2245 eval {
2246 $DB->set_flags (BDB::CHKSUM);
2247
2248 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2249 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2250 cf::cleanup "db_open(db): $!" if $!;
2251 };
2252 cf::cleanup "db_open(db): $@" if $@;
2253 };
2254
2169 my $path = cf::localdir . "/database.pst"; 2255 my $path = cf::localdir . "/database.pst";
2256 if (stat $path) {
2257 cf::sync_job {
2258 my $pst = Storable::retrieve $path;
2170 2259
2171 sub db_load() { 2260 cf::db_put (board => data => $pst->{board});
2172 $DB = stat $path ? Storable::retrieve $path : { }; 2261 cf::db_put (guildrules => data => $pst->{guildrules});
2173 } 2262 cf::db_put (rent => balance => $pst->{rent}{balance});
2263 BDB::db_env_txn_checkpoint $DB_ENV;
2174 2264
2175 my $pid; 2265 unlink $path;
2176
2177 sub db_save() {
2178 waitpid $pid, 0 if $pid;
2179 if (0 == ($pid = fork)) {
2180 $DB->{_meta}{version} = 1;
2181 Storable::nstore $DB, "$path~";
2182 rename "$path~", $path;
2183 cf::_exit 0 if defined $pid;
2184 } 2266 };
2185 } 2267 }
2186
2187 my $dirty;
2188
2189 sub db_sync() {
2190 db_save if $dirty;
2191 undef $dirty;
2192 }
2193
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2195 db_sync;
2196 }); 2268 }
2269}
2197 2270
2198 sub db_dirty() {
2199 $dirty = 1;
2200 $idle->start;
2201 }
2202
2203 sub db_get($;$) { 2271sub db_get($$) {
2204 @_ >= 2 2272 my $key = "$_[0]/$_[1]";
2205 ? $DB->{$_[0]}{$_[1]}
2206 : ($DB->{$_[0]} ||= { })
2207 }
2208 2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
2209 sub db_put($$;$) { 2282sub db_put($$$) {
2210 if (@_ >= 3) { 2283 BDB::dbreq_pri 4;
2211 $DB->{$_[0]}{$_[1]} = $_[2]; 2284 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2285}
2286
2287#############################################################################
2288# the server's init and main functions
2289
2290sub load_facedata {
2291 my $path = sprintf "%s/facedata", cf::datadir;
2292
2293 warn "loading facedata from $path\n";
2294
2295 my $faces;
2296 0 < aio_load $path, $faces
2297 or die "$path: $!";
2298
2299 Coro::cede;
2300 $faces = Storable::thaw $faces;
2301 Coro::cede;
2302
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1
2305 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306
2307 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312 Coro::cede;
2313 }
2314
2315 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth};
2317 my $idx = cf::face::find $face
2318 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth;
2212 } else { 2321 } else {
2213 $DB->{$_[0]} = $_[1]; 2322 warn "smooth face '$info->{smooth}' not found for face '$face'";
2214 }
2215 db_dirty;
2216 }
2217
2218 cf::global->attach (
2219 prio => 10000,
2220 on_cleanup => sub {
2221 db_sync;
2222 }, 2323 }
2223 ); 2324 Coro::cede;
2224} 2325 }
2225 2326
2226############################################################################# 2327 1
2227# the server's main() 2328}
2329
2330sub reload_resources {
2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2332 or die "unable to load regions file\n";#d#
2333 load_facedata
2334 or die "unable to load facedata\n";#d#
2335}
2336
2337sub init {
2338 reload_resources;
2339}
2228 2340
2229sub cfg_load { 2341sub cfg_load {
2230 open my $fh, "<:utf8", cf::confdir . "/config" 2342 open my $fh, "<:utf8", cf::confdir . "/config"
2231 or return; 2343 or return;
2232 2344
2249 2361
2250sub main { 2362sub main {
2251 # we must not ever block the main coroutine 2363 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2364 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2365 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2366 (async {
2254 async { Event::one_event }; 2367 Event::one_event;
2368 })->prio (Coro::PRIO_MAX);
2255 }; 2369 };
2256 2370
2257 cfg_load; 2371 cfg_load;
2258 db_load; 2372 db_init;
2259 load_extensions; 2373 load_extensions;
2374
2375 $TICK_WATCHER->start;
2260 Event::loop; 2376 Event::loop;
2261} 2377}
2262 2378
2263############################################################################# 2379#############################################################################
2264# initialisation and cleanup 2380# initialisation and cleanup
2265 2381
2266# install some emergency cleanup handlers 2382# install some emergency cleanup handlers
2267BEGIN { 2383BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2384 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2385 Event->signal (
2386 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2387 data => WF_AUTOCANCEL,
2271 signal => $signal, 2388 signal => $signal,
2389 prio => 0,
2272 cb => sub { 2390 cb => sub {
2273 cf::cleanup "SIG$signal"; 2391 cf::cleanup "SIG$signal";
2274 }, 2392 },
2275 ); 2393 );
2276 } 2394 }
2277} 2395}
2282 warn "enter emergency perl save\n"; 2400 warn "enter emergency perl save\n";
2283 2401
2284 cf::sync_job { 2402 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2403 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2404 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2405 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2406 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2407 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2408 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2409 $pl->valid or next;
2292 $pl->save; 2410 $pl->save;
2298 my $map = $cf::MAP{$path} or next; 2416 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next; 2417 $map->valid or next;
2300 $map->save; 2418 $map->save;
2301 } 2419 }
2302 warn "end emergency map save\n"; 2420 warn "end emergency map save\n";
2421
2422 warn "begin emergency database checkpoint\n";
2423 BDB::db_env_txn_checkpoint $DB_ENV;
2424 warn "end emergency database checkpoint\n";
2303 }; 2425 };
2304 2426
2305 warn "leave emergency perl save\n"; 2427 warn "leave emergency perl save\n";
2428}
2429
2430sub post_cleanup {
2431 my ($make_core) = @_;
2432
2433 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core;
2306} 2435}
2307 2436
2308sub reload() { 2437sub reload() {
2309 # can/must only be called in main 2438 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2439 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2440 warn "can only reload from main coroutine";
2312 return; 2441 return;
2313 } 2442 }
2314 2443
2315 warn "reloading..."; 2444 warn "reloading...";
2316 2445
2317 warn "freezing server"; 2446 warn "entering sync_job";
2318 my $guard = freeze_mainloop; 2447
2448 cf::sync_job {
2449 cf::write_runtime; # external watchdog should not bark
2319 cf::emergency_save; 2450 cf::emergency_save;
2451 cf::write_runtime; # external watchdog should not bark
2320 2452
2321 warn "sync database to disk"; 2453 warn "syncing database to disk";
2322 cf::db_sync; 2454 BDB::db_env_txn_checkpoint $DB_ENV;
2323 IO::AIO::flush;
2324 2455
2325 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 2456 # if anything goes wrong in here, we should simply crash as we already saved
2327 2457
2328 warn "cancel all watchers"; 2458 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2459 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2460 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2461 }
2332 2462
2463 warn "flushing outstanding aio requests";
2464 for (;;) {
2465 BDB::flush;
2466 IO::AIO::flush;
2467 Coro::cede;
2468 last unless IO::AIO::nreqs || BDB::nreqs;
2469 warn "iterate...";
2470 }
2471
2472 ++$RELOAD;
2473
2333 warn "cancel all extension coros"; 2474 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2475 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2476 %EXT_CORO = ();
2336 2477
2337 warn "remove commands"; 2478 warn "removing commands";
2338 %COMMAND = (); 2479 %COMMAND = ();
2339 2480
2340 warn "remove ext commands"; 2481 warn "removing ext commands";
2341 %EXTCMD = (); 2482 %EXTCMD = ();
2342 2483
2343 warn "unload/nuke all extensions"; 2484 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2485 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2486 warn "... unloading $pkg";
2346 2487
2347 if (my $cb = $pkg->can ("unload")) { 2488 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2489 eval {
2353 2494
2354 warn "... nuking $pkg"; 2495 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2496 Symbol::delete_package $pkg;
2356 } 2497 }
2357 2498
2358 warn "unload all perl modules loaded from $LIBDIR"; 2499 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2500 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2501 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2502
2362 warn "removing <$k>"; 2503 warn "... unloading $k";
2363 delete $INC{$k}; 2504 delete $INC{$k};
2364 2505
2365 $k =~ s/\.pm$//; 2506 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2507 $k =~ s/\//::/g;
2367 2508
2370 } 2511 }
2371 2512
2372 Symbol::delete_package $k; 2513 Symbol::delete_package $k;
2373 } 2514 }
2374 2515
2375 warn "get rid of safe::, as good as possible"; 2516 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2517 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2518 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 2519
2379 warn "unload cf.pm \"a bit\""; 2520 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2521 delete $INC{"cf.pm"};
2381 2522
2382 # don't, removes xs symbols, too, 2523 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2524 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2525 #Symbol::delete_package __PACKAGE__;
2385 2526
2527 warn "unload completed, starting to reload now";
2528
2386 warn "reloading cf.pm"; 2529 warn "reloading cf.pm";
2387 require cf; 2530 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2532
2390 warn "load config and database again"; 2533 warn "loading config and database again";
2391 cf::cfg_load; 2534 cf::cfg_load;
2392 cf::db_load;
2393 2535
2394 warn "load extensions"; 2536 warn "loading extensions";
2395 cf::load_extensions; 2537 cf::load_extensions;
2396 2538
2397 warn "reattach attachments to objects/players"; 2539 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2540 _global_reattach; # objects, sockets
2399 warn "reattach attachments to maps"; 2541 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2542 reattach $_ for values %MAP;
2401 }; 2543 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER;
2402 2545
2403 if ($@) { 2546 warn "loading reloadable resources";
2547 reload_resources;
2548
2549 warn "leaving sync_job";
2550
2551 1
2552 } or do {
2404 warn $@; 2553 warn $@;
2405 warn "error while reloading, exiting."; 2554 warn "error while reloading, exiting.";
2406 exit 1; 2555 exit 1;
2407 } 2556 };
2408 2557
2409 warn "reloaded"; 2558 warn "reloaded";
2410}; 2559};
2411 2560
2412############################################################################# 2561our $RELOAD_WATCHER; # used only during reload
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454 2562
2455register_command "reload" => sub { 2563register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2564 my ($who, $arg) = @_;
2457 2565
2458 if ($who->flag (FLAG_WIZ)) { 2566 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2567 $who->message ("reloading server.");
2568
2569 # doing reload synchronously and two reloads happen back-to-back,
2570 # coro crashes during coro_state_free->destroy here.
2571
2572 $RELOAD_WATCHER ||= Event->timer (
2573 reentrant => 0,
2574 after => 0,
2575 data => WF_AUTOCANCEL,
2576 cb => sub {
2460 reload; 2577 reload;
2461 $who->message ("end of reload."); 2578 undef $RELOAD_WATCHER;
2579 },
2580 );
2462 } 2581 }
2463}; 2582};
2464 2583
2465unshift @INC, $LIBDIR; 2584unshift @INC, $LIBDIR;
2585
2586my $bug_warning = 0;
2466 2587
2467$TICK_WATCHER = Event->timer ( 2588$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2589 reentrant => 0,
2590 parked => 1,
2469 prio => 0, 2591 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2592 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2593 data => WF_AUTOCANCEL,
2472 cb => sub { 2594 cb => sub {
2595 if ($Coro::current != $Coro::main) {
2596 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2597 unless ++$bug_warning > 10;
2598 return;
2599 }
2600
2473 $NOW = Event::time; 2601 $NOW = Event::time;
2474 2602
2475 cf::server_tick; # one server iteration 2603 cf::server_tick; # one server iteration
2476 $RUNTIME += $TICK; 2604 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 2605 $NEXT_TICK += $TICK;
2478 2606
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10;
2609 Coro::async_pool {
2610 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!";
2612 };
2613 }
2614
2479 $WAIT_FOR_TICK->broadcast; 2615 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618# my $AFTER = Event::time;
2619# warn $AFTER - $NOW;#d#
2481 2620
2482 # if we are delayed by four ticks or more, skip them all 2621 # if we are delayed by four ticks or more, skip them all
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2484 2623
2485 $TICK_WATCHER->at ($NEXT_TICK); 2624 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 2625 $TICK_WATCHER->start;
2487 }, 2626 },
2488); 2627);
2489 2628
2629{
2490IO::AIO::max_poll_time $TICK * 0.2; 2630 BDB::max_poll_time $TICK * 0.1;
2491 2631 $BDB_POLL_WATCHER = Event->io (
2492Event->io ( 2632 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 2633 fd => BDB::poll_fileno,
2494 poll => 'r', 2634 poll => 'r',
2495 prio => 5, 2635 prio => 0,
2496 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb,
2498);
2499
2500Event->timer (
2501 data => WF_AUTOCANCEL, 2636 data => WF_AUTOCANCEL,
2502 after => 0, 2637 cb => \&BDB::poll_cb,
2503 interval => 10, 2638 );
2504 cb => sub { 2639 BDB::min_parallel 8;
2505 (Coro::unblock_sub { 2640
2506 write_runtime 2641 BDB::set_sync_prepare {
2507 or warn "ERROR: unable to write runtime file: $!"; 2642 my $status;
2643 my $current = $Coro::current;
2644 (
2645 sub {
2646 $status = $!;
2647 $current->ready; undef $current;
2648 },
2649 sub {
2650 Coro::schedule while defined $current;
2651 $! = $status;
2652 },
2653 )
2654 };
2655
2656 unless ($DB_ENV) {
2657 $DB_ENV = BDB::db_env_create;
2658
2659 cf::sync_job {
2660 eval {
2661 BDB::db_env_open
2662 $DB_ENV,
2663 $BDB_ENV_DIR,
2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2666 0666;
2667
2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2669
2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2671 $DB_ENV->set_lk_detect;
2672 };
2673
2674 cf::cleanup "db_env_open(db): $@" if $@;
2508 })->(); 2675 };
2509 }, 2676 }
2510); 2677}
2678
2679{
2680 IO::AIO::min_parallel 8;
2681
2682 undef $Coro::AIO::WATCHER;
2683 IO::AIO::max_poll_time $TICK * 0.1;
2684 $AIO_POLL_WATCHER = Event->io (
2685 reentrant => 0,
2686 data => WF_AUTOCANCEL,
2687 fd => IO::AIO::poll_fileno,
2688 poll => 'r',
2689 prio => 6,
2690 cb => \&IO::AIO::poll_cb,
2691 );
2692}
2511 2693
2512END { cf::emergency_save } 2694END { cf::emergency_save }
2513 2695
25141 26961
2515 2697

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines