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.161 by root, Thu Jan 11 00:16:58 2007 UTC vs.
Revision 1.227 by root, Fri Mar 23 18:32:48 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;
361} 376}
362 377
363=back 378=back
364 379
365=cut 380=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 $path
478}
479
480# the original (read-only) location
481sub load_path {
482 my ($self) = @_;
483
484 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
485}
486
487# the temporary/swap location
488sub save_path {
489 my ($self) = @_;
490
491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
494}
495
496# the unique path, undef == no special unique path
497sub uniq_path {
498 my ($self) = @_;
499
500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
501}
502
503# this is somewhat ugly, but style maps do need special treatment
504sub is_style_map {
505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
518}
519
520package cf;
521 381
522############################################################################# 382#############################################################################
523 383
524=head2 ATTACHABLE OBJECTS 384=head2 ATTACHABLE OBJECTS
525 385
651our @CB_TYPE = (); # registry for type (cf-object class) based events 511our @CB_TYPE = (); # registry for type (cf-object class) based events
652our @CB_MAP = (); 512our @CB_MAP = ();
653 513
654my %attachment; 514my %attachment;
655 515
516sub cf::attachable::thawer_merge {
517 # simply override everything except _meta
518 local $_[0]{_meta};
519 %{$_[0]} = %{$_[1]};
520}
521
656sub _attach_cb($$$$) { 522sub _attach_cb($$$$) {
657 my ($registry, $event, $prio, $cb) = @_; 523 my ($registry, $event, $prio, $cb) = @_;
658 524
659 use sort 'stable'; 525 use sort 'stable';
660 526
831# object support 697# object support
832 698
833sub reattach { 699sub reattach {
834 # basically do the same as instantiate, without calling instantiate 700 # basically do the same as instantiate, without calling instantiate
835 my ($obj) = @_; 701 my ($obj) = @_;
702
703 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
836 704
837 my $registry = $obj->registry; 705 my $registry = $obj->registry;
838 706
839 @$registry = (); 707 @$registry = ();
840 708
887 $filename, length $$rdata, scalar @$objs; 755 $filename, length $$rdata, scalar @$objs;
888 756
889 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 757 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
890 chmod SAVE_MODE, $fh; 758 chmod SAVE_MODE, $fh;
891 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 759 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
892 aio_fsync $fh; 760 aio_fsync $fh if $cf::USE_FSYNC;
893 close $fh; 761 close $fh;
894 762
895 if (@$objs) { 763 if (@$objs) {
896 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 764 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
897 chmod SAVE_MODE, $fh; 765 chmod SAVE_MODE, $fh;
898 my $data = Storable::nfreeze { version => 1, objs => $objs }; 766 my $data = Storable::nfreeze { version => 1, objs => $objs };
899 aio_write $fh, 0, (length $data), $data, 0; 767 aio_write $fh, 0, (length $data), $data, 0;
900 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
901 close $fh; 769 close $fh;
902 aio_rename "$filename.pst~", "$filename.pst"; 770 aio_rename "$filename.pst~", "$filename.pst";
903 } 771 }
904 } else { 772 } else {
905 aio_unlink "$filename.pst"; 773 aio_unlink "$filename.pst";
1027 "package $pkg; use strict; use utf8;\n" 895 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 896 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 897 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 898 . "\n};\n1";
1031 899
1032 eval $source 900 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 901 my $msg = $@ ? "$path: $@\n"
1034 : "extension disabled.\n"; 902 : "extension disabled.\n";
903 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
904 warn $@;
905 warn "mandatory extension failed to load, exiting.\n";
906 exit 1;
907 }
908 die $@;
909 }
1035 910
1036 push @EXTS, $pkg; 911 push @EXTS, $pkg;
1037} 912}
1038 913
1039sub load_extensions { 914sub load_extensions {
1045 } or warn "$ext not loaded: $@"; 920 } or warn "$ext not loaded: $@";
1046 } 921 }
1047} 922}
1048 923
1049############################################################################# 924#############################################################################
1050# load/save/clean perl data associated with a map
1051
1052*cf::mapsupport::on_clean = sub {
1053 my ($map) = @_;
1054
1055 my $path = $map->tmpname;
1056 defined $path or return;
1057
1058 unlink "$path.pst";
1059};
1060
1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1062
1063#############################################################################
1064 925
1065=head2 CORE EXTENSIONS 926=head2 CORE EXTENSIONS
1066 927
1067Functions and methods that extend core crossfire objects. 928Functions and methods that extend core crossfire objects.
1068 929
1104 965
1105sub exists($) { 966sub exists($) {
1106 my ($login) = @_; 967 my ($login) = @_;
1107 968
1108 $cf::PLAYER{$login} 969 $cf::PLAYER{$login}
1109 or cf::sync_job { !aio_stat $login } 970 or cf::sync_job { !aio_stat path $login }
1110} 971}
1111 972
1112sub find($) { 973sub find($) {
1113 return $cf::PLAYER{$_[0]} || do { 974 return $cf::PLAYER{$_[0]} || do {
1114 my $login = $_[0]; 975 my $login = $_[0];
1160 1021
1161=cut 1022=cut
1162 1023
1163sub quit_character { 1024sub quit_character {
1164 my ($pl) = @_; 1025 my ($pl) = @_;
1026
1027 my $name = $pl->ob->name;
1165 1028
1166 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1167 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1168 1031
1169 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1174 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1175 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1176 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1177 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1178 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1179 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1180} 1063}
1181 1064
1182=item cf::player::list_logins 1065=item cf::player::list_logins
1183 1066
1184Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
1204 \@logins 1087 \@logins
1205} 1088}
1206 1089
1207=item $player->maps 1090=item $player->maps
1208 1091
1209Returns an arrayref of cf::path's of all maps that are private for this 1092Returns an arrayref of map paths that are private for this
1210player. May block. 1093player. May block.
1211 1094
1212=cut 1095=cut
1213 1096
1214sub maps($) { 1097sub maps($) {
1215 my ($pl) = @_; 1098 my ($pl) = @_;
1099
1100 $pl = ref $pl ? $pl->ob->name : $pl;
1216 1101
1217 my $files = aio_readdir playerdir $pl 1102 my $files = aio_readdir playerdir $pl
1218 or return; 1103 or return;
1219 1104
1220 my @paths; 1105 my @paths;
1222 for (@$files) { 1107 for (@$files) {
1223 utf8::decode $_; 1108 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1109 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1110 next unless /^$PATH_SEP/o;
1226 1111
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1112 push @paths, cf::map::normalise "~$pl/$_";
1228 } 1113 }
1229 1114
1230 \@paths 1115 \@paths
1231} 1116}
1232 1117
1258package cf::map; 1143package cf::map;
1259 1144
1260use Fcntl; 1145use Fcntl;
1261use Coro::AIO; 1146use Coro::AIO;
1262 1147
1148use overload
1149 '""' => \&as_string,
1150 fallback => 1;
1151
1263our $MAX_RESET = 3600; 1152our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1153our $DEFAULT_RESET = 3000;
1265 1154
1266sub generate_random_map { 1155sub generate_random_map {
1267 my ($path, $rmp) = @_; 1156 my ($self, $rmp) = @_;
1268
1269 # mit "rum" bekleckern, nicht 1157 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1158 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1159 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1160 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1161 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1162 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1163 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1164 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1165 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1166 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1167 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1168 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1169 (cf::region::find $rmp->{region}), $rmp->{custom}
1170 )
1171}
1172
1173=item cf::map->register ($regex, $prio)
1174
1175Register a handler for the map path matching the given regex at the
1176givne priority (higher is better, built-in handlers have priority 0, the
1177default).
1178
1179=cut
1180
1181sub register {
1182 my (undef, $regex, $prio) = @_;
1183 my $pkg = caller;
1184
1185 no strict;
1186 push @{"$pkg\::ISA"}, __PACKAGE__;
1187
1188 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1189}
1190
1191# also paths starting with '/'
1192$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1193
1194sub thawer_merge {
1195 my ($self, $merge) = @_;
1196
1197 # we have to keep some variables in memory intact
1198 local $self->{path};
1199 local $self->{load_path};
1200 local $self->{deny_save};
1201 local $self->{deny_reset};
1202
1203 $self->SUPER::thawer_merge ($merge);
1204}
1205
1206sub normalise {
1207 my ($path, $base) = @_;
1208
1209 $path = "$path"; # make sure its a string
1210
1211 $path =~ s/\.map$//;
1212
1213 # map plan:
1214 #
1215 # /! non-realised random map exit (special hack!)
1216 # {... are special paths that are not being touched
1217 # ?xxx/... are special absolute paths
1218 # ?random/... random maps
1219 # /... normal maps
1220 # ~user/... per-player map of a specific user
1221
1222 $path =~ s/$PATH_SEP/\//go;
1223
1224 # treat it as relative path if it starts with
1225 # something that looks reasonable
1226 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1227 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1228
1229 $base =~ s{[^/]+/?$}{};
1230 $path = "$base/$path";
1231 }
1232
1233 for ($path) {
1234 redo if s{//}{/};
1235 redo if s{/\.?/}{/};
1236 redo if s{/[^/]+/\.\./}{/};
1237 }
1238
1239 $path
1240}
1241
1242sub new_from_path {
1243 my (undef, $path, $base) = @_;
1244
1245 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1246
1247 $path = normalise $path, $base;
1248
1249 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1250 if ($path =~ $EXT_MAP{$pkg}[1]) {
1251 my $self = bless cf::map::new, $pkg;
1252 $self->{path} = $path; $self->path ($path);
1253 $self->init; # pass $1 etc.
1254 return $self;
1255 }
1256 }
1257
1258 Carp::carp "unable to resolve path '$path' (base '$base').";
1259 ()
1260}
1261
1262sub init {
1263 my ($self) = @_;
1264
1265 $self
1266}
1267
1268sub as_string {
1269 my ($self) = @_;
1270
1271 "$self->{path}"
1272}
1273
1274# the displayed name, this is a one way mapping
1275sub visible_name {
1276 &as_string
1277}
1278
1279# the original (read-only) location
1280sub load_path {
1281 my ($self) = @_;
1282
1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1284}
1285
1286# the temporary/swap location
1287sub save_path {
1288 my ($self) = @_;
1289
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1292}
1293
1294# the unique path, undef == no special unique path
1295sub uniq_path {
1296 my ($self) = @_;
1297
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1283} 1300}
1284 1301
1285# and all this just because we cannot iterate over 1302# and all this just because we cannot iterate over
1286# all maps in C++... 1303# all maps in C++...
1287sub change_all_map_light { 1304sub change_all_map_light {
1289 1306
1290 $_->change_map_light ($change) 1307 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1308 for grep $_->outdoor, values %cf::MAP;
1292} 1309}
1293 1310
1311sub unlink_save {
1312 my ($self) = @_;
1313
1314 utf8::encode (my $save = $self->save_path);
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1317}
1318
1294sub load_map_header($) { 1319sub load_header_from($) {
1295 my ($path) = @_; 1320 my ($self, $path) = @_;
1296 1321
1297 utf8::encode $path; 1322 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1324 # or return;
1325
1326 $self->_load_header ($path)
1299 or return; 1327 or return;
1300 1328
1301 my $map = cf::map::new 1329 $self->{load_path} = $path;
1330
1331 1
1332}
1333
1334sub load_header_orig {
1335 my ($self) = @_;
1336
1337 $self->load_header_from ($self->load_path)
1338}
1339
1340sub load_header_temp {
1341 my ($self) = @_;
1342
1343 $self->load_header_from ($self->save_path)
1344}
1345
1346sub prepare_temp {
1347 my ($self) = @_;
1348
1349 $self->last_access ((delete $self->{last_access})
1350 || $cf::RUNTIME); #d#
1351 # safety
1352 $self->{instantiate_time} = $cf::RUNTIME
1353 if $self->{instantiate_time} > $cf::RUNTIME;
1354}
1355
1356sub prepare_orig {
1357 my ($self) = @_;
1358
1359 $self->{load_original} = 1;
1360 $self->{instantiate_time} = $cf::RUNTIME;
1361 $self->last_access ($cf::RUNTIME);
1362 $self->instantiate;
1363}
1364
1365sub load_header {
1366 my ($self) = @_;
1367
1368 if ($self->load_header_temp) {
1369 $self->prepare_temp;
1370 } else {
1371 $self->load_header_orig
1302 or return; 1372 or return;
1373 $self->prepare_orig;
1374 }
1303 1375
1304 # for better error messages only, will be overwritten later 1376 1
1305 $map->path ($path);
1306
1307 $map->load_header ($path)
1308 or return;
1309
1310 $map->{load_path} = $path;
1311
1312 $map
1313} 1377}
1314 1378
1315sub find; 1379sub find;
1316sub find { 1380sub find {
1317 my ($path, $origin) = @_; 1381 my ($path, $origin) = @_;
1318 1382
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1383 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1384
1324 cf::lock_wait "map_find:$key"; 1385 cf::lock_wait "map_find:$path";
1325 1386
1326 $cf::MAP{$key} || do { 1387 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1388 my $guard = cf::lock_acquire "map_find:$path";
1328 1389 my $map = new_from_path cf::map $path
1329 # do it the slow way
1330 my $map = $path->load_temp;
1331
1332 Coro::cede;
1333
1334 if ($map) {
1335 $map->last_access ((delete $map->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $map->{instantiate_time} = $cf::RUNTIME
1339 if $map->{instantiate_time} > $cf::RUNTIME;
1340 } else {
1341 $map = $path->load_orig
1342 or return; 1390 or return;
1343 1391
1344 $map->{load_original} = 1;
1345 $map->{instantiate_time} = $cf::RUNTIME;
1346 $map->last_access ($cf::RUNTIME);
1347 $map->instantiate;
1348
1349 # per-player maps become, after loading, normal maps
1350 $map->per_player (0) if $path->{user_rel};
1351 }
1352
1353 $map->path ($key);
1354 $map->{path} = $path;
1355 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1356 1393
1357 Coro::cede; 1394 $map->load_header
1395 or return;
1358 1396
1359 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously
1399 #$cf::WAIT_FOR_TICK->wait;
1360 $map->reset; 1400 $map->reset;
1361 undef $guard; 1401 undef $guard;
1362 $map = find $path 1402 return find $path;
1363 or return;
1364 } 1403 }
1365 1404
1366 $cf::MAP{$key} = $map 1405 $cf::MAP{$path} = $map
1367 } 1406 }
1368} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1369 1411
1370sub load { 1412sub load {
1371 my ($self) = @_; 1413 my ($self) = @_;
1372 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1373 my $path = $self->{path}; 1417 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1418 my $guard = cf::lock_acquire "map_load:$path";
1375 1419
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1421
1378 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1379 1423
1380 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1381 $self->load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1429 or return;
1383 1430
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1432 if delete $self->{load_original};
1386 1433
1387 if (my $uniq = $path->uniq_path) { 1434 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1435 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1436 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1437 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1438 $self->_load_objects ($uniq, 0);
1392 } 1439 }
1393 } 1440 }
1394 1441
1395 Coro::cede; 1442 Coro::cede;
1396 1443
1397 # now do the right thing for maps 1444 # now do the right thing for maps
1398 $self->link_multipart_objects; 1445 $self->link_multipart_objects;
1399 1446
1400 if ($self->{path}->is_style_map) { 1447 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1448 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1449 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1450 $self->update_buttons;
1451 Coro::cede;
1407 $self->set_darkness_map; 1452 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1453 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1454 unless $self->difficulty;
1455 Coro::cede;
1410 $self->activate; 1456 $self->activate;
1411 } 1457 }
1412 1458
1413 Coro::cede; 1459 $self->post_load;
1414 1460
1415 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462}
1463
1464sub customise_for {
1465 my ($self, $ob) = @_;
1466
1467 return find "~" . $ob->name . "/" . $self->{path}
1468 if $self->per_player;
1469
1470 $self
1416} 1471}
1417 1472
1418# find and load all maps in the 3x3 area around a map 1473# find and load all maps in the 3x3 area around a map
1419sub load_diag { 1474sub load_diag {
1420 my ($map) = @_; 1475 my ($map) = @_;
1450 1505
1451 cf::sync_job { $map->load }; 1506 cf::sync_job { $map->load };
1452} 1507}
1453 1508
1454our %MAP_PREFETCH; 1509our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1510our $MAP_PREFETCHER = undef;
1456 while () {
1457 while (%MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465 }
1466 Coro::schedule;
1467 }
1468};
1469 1511
1470sub find_async { 1512sub find_async {
1471 my ($path, $origin) = @_; 1513 my ($path, $origin) = @_;
1472 1514
1473 $path = new cf::path $path, $origin && $origin->path; 1515 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1516
1476 if (my $map = $cf::MAP{$key}) { 1517 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1519 }
1479 1520
1480 $MAP_PREFETCH{$key} = $path; 1521 undef $MAP_PREFETCH{$path};
1522 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) {
1525 my $map = find $path
1526 or next;
1527 $map->load;
1528
1529 delete $MAP_PREFETCH{$path};
1530 }
1531 }
1532 undef $MAP_PREFETCHER;
1533 };
1481 $MAP_PREFETCHER->ready; 1534 $MAP_PREFETCHER->prio (6);
1482 1535
1483 () 1536 ()
1484} 1537}
1485 1538
1486sub save { 1539sub save {
1490 1543
1491 $self->{last_save} = $cf::RUNTIME; 1544 $self->{last_save} = $cf::RUNTIME;
1492 1545
1493 return unless $self->dirty; 1546 return unless $self->dirty;
1494 1547
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1548 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1549 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1550
1498 $self->{load_path} = $save; 1551 $self->{load_path} = $save;
1499 1552
1500 return if $self->{deny_save}; 1553 return if $self->{deny_save};
1501 1554
1504 cf::async { 1557 cf::async {
1505 $_->contr->save for $self->players; 1558 $_->contr->save for $self->players;
1506 }; 1559 };
1507 1560
1508 if ($uniq) { 1561 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1562 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1563 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1564 } else {
1512 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1565 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1513 } 1566 }
1514} 1567}
1515 1568
1516sub swap_out { 1569sub swap_out {
1517 my ($self) = @_; 1570 my ($self) = @_;
1531 1584
1532sub reset_at { 1585sub reset_at {
1533 my ($self) = @_; 1586 my ($self) = @_;
1534 1587
1535 # TODO: safety, remove and allow resettable per-player maps 1588 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1590 return 1e99 if $self->{deny_reset};
1538 1591
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1593 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1541 1594
1546 my ($self) = @_; 1599 my ($self) = @_;
1547 1600
1548 $self->reset_at <= $cf::RUNTIME 1601 $self->reset_at <= $cf::RUNTIME
1549} 1602}
1550 1603
1551sub unlink_save {
1552 my ($self) = @_;
1553
1554 utf8::encode (my $save = $self->{path}->save_path);
1555 aioreq_pri 3; IO::AIO::aio_unlink $save;
1556 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1557}
1558
1559sub rename {
1560 my ($self, $new_path) = @_;
1561
1562 $self->unlink_save;
1563
1564 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path;
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self;
1568
1569 $self->save;
1570}
1571
1572sub reset { 1604sub reset {
1573 my ($self) = @_; 1605 my ($self) = @_;
1574 1606
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1607 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1608
1577 return if $self->players; 1609 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1579 1611
1580 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1581 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1582 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1625
1626 $self->clear;
1583 1627
1584 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1585 1629
1586 $self->unlink_save; 1630 $self->unlink_save;
1587 $self->destroy; 1631 $self->destroy;
1590my $nuke_counter = "aaaa"; 1634my $nuke_counter = "aaaa";
1591 1635
1592sub nuke { 1636sub nuke {
1593 my ($self) = @_; 1637 my ($self) = @_;
1594 1638
1639 delete $cf::MAP{$self->path};
1640
1641 $self->unlink_save;
1642
1643 bless $self, "cf::map";
1644 delete $self->{deny_reset};
1595 $self->{deny_save} = 1; 1645 $self->{deny_save} = 1;
1596 $self->reset_timeout (1); 1646 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1647 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1648
1649 $cf::MAP{$self->path} = $self;
1650
1598 $self->reset; # polite request, might not happen 1651 $self->reset; # polite request, might not happen
1599} 1652}
1600 1653
1601sub customise_for {
1602 my ($map, $ob) = @_;
1603
1604 if ($map->per_player) {
1605 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1606 }
1607
1608 $map
1609}
1610
1611=item cf::map::unique_maps 1654=item cf::map::unique_maps
1612 1655
1613Returns an arrayref of cf::path's of all shared maps that have 1656Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1657instantiated unique items. May block.
1615 1658
1616=cut 1659=cut
1617 1660
1618sub unique_maps() { 1661sub unique_maps() {
1624 for (@$files) { 1667 for (@$files) {
1625 utf8::decode $_; 1668 utf8::decode $_;
1626 next if /\.pst$/; 1669 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1628 1671
1629 push @paths, new cf::path $_; 1672 push @paths, cf::map::normalise $_;
1630 } 1673 }
1631 1674
1632 \@paths 1675 \@paths
1633} 1676}
1634 1677
1709 1752
1710=item $player_object->enter_link 1753=item $player_object->enter_link
1711 1754
1712Freezes the player and moves him/her to a special map (C<{link}>). 1755Freezes the player and moves him/her to a special map (C<{link}>).
1713 1756
1714The player should be reaosnably safe there for short amounts of time. You 1757The player should be reasonably safe there for short amounts of time. You
1715I<MUST> call C<leave_link> as soon as possible, though. 1758I<MUST> call C<leave_link> as soon as possible, though.
1716 1759
1760Will never block.
1761
1717=item $player_object->leave_link ($map, $x, $y) 1762=item $player_object->leave_link ($map, $x, $y)
1718 1763
1719Moves the player out of the specila link map onto the given map. If the 1764Moves the player out of the special C<{link}> map onto the specified
1720map is not valid (or omitted), the player will be moved back to the 1765map. If the map is not valid (or omitted), the player will be moved back
1721location he/she was before the call to C<enter_link>, or, if that fails, 1766to the location he/she was before the call to C<enter_link>, or, if that
1722to the emergency map position. 1767fails, to the emergency map position.
1723 1768
1724Might block. 1769Might block.
1725 1770
1726=cut 1771=cut
1772
1773sub link_map {
1774 unless ($LINK_MAP) {
1775 $LINK_MAP = cf::map::find "{link}"
1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1777 $LINK_MAP->load;
1778 }
1779
1780 $LINK_MAP
1781}
1727 1782
1728sub cf::object::player::enter_link { 1783sub cf::object::player::enter_link {
1729 my ($self) = @_; 1784 my ($self) = @_;
1730 1785
1731 $self->deactivate_recursive; 1786 $self->deactivate_recursive;
1732 1787
1733 return if $self->map == $LINK_MAP; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1789
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1791 if $self->map;
1737 1792
1738 $self->enter_map ($LINK_MAP, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1739} 1794}
1740 1795
1741sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1743 1798
1765 $map->load; 1820 $map->load;
1766 $map->load_diag; 1821 $map->load_diag;
1767 1822
1768 return unless $self->contr->active; 1823 return unless $self->contr->active;
1769 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1770 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1771} 1828}
1772 1829
1773cf::player->attach ( 1830cf::player->attach (
1774 on_logout => sub { 1831 on_logout => sub {
1787 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1788 # should happen only on crashes 1845 # should happen only on crashes
1789 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1790 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1791 (async { 1848 (async {
1792 # we need this sleep as the login has a concurrent enter_exit running
1793 # and this sleep increases chances of the player not ending up in scorn
1794 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1795 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1796 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1797 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1798 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1799 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1800 })->prio (2); 1857 })->prio (2);
1801 } 1858 }
1802 }, 1859 },
1807=cut 1864=cut
1808 1865
1809sub cf::object::player::goto { 1866sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1811 1868
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1869 $self->enter_link;
1815 1870
1816 (async { 1871 (async {
1872 my $map = eval {
1817 my $map = cf::map::find $path->as_string; 1873 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1819 1875 $map
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1821# if $map;
1822
1823 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1824 1878
1825 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1826 })->prio (1); 1880 })->prio (1);
1827} 1881}
1828 1882
1832 1886
1833sub parse_random_map_params { 1887sub parse_random_map_params {
1834 my ($spec) = @_; 1888 my ($spec) = @_;
1835 1889
1836 my $rmp = { # defaults 1890 my $rmp = { # defaults
1837 xsize => 10, 1891 xsize => (cf::rndm 15, 40),
1838 ysize => 10, 1892 ysize => (cf::rndm 15, 40),
1893 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1894 #layout => string,
1839 }; 1895 };
1840 1896
1841 for (split /\n/, $spec) { 1897 for (split /\n/, $spec) {
1842 my ($k, $v) = split /\s+/, $_, 2; 1898 my ($k, $v) = split /\s+/, $_, 2;
1843 1899
1847 $rmp 1903 $rmp
1848} 1904}
1849 1905
1850sub prepare_random_map { 1906sub prepare_random_map {
1851 my ($exit) = @_; 1907 my ($exit) = @_;
1908
1909 my $guard = cf::lock_acquire "exit_prepare:$exit";
1852 1910
1853 # all this does is basically replace the /! path by 1911 # all this does is basically replace the /! path by
1854 # a new random map path (?random/...) with a seed 1912 # a new random map path (?random/...) with a seed
1855 # that depends on the exit object 1913 # that depends on the exit object
1856 1914
1857 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1858 1916
1859 if ($exit->map) { 1917 if ($exit->map) {
1860 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1861 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1862 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1863 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1864 } 1922 }
1865 1923
1866 $rmp->{random_seed} ||= $exit->random_seed; 1924 $rmp->{random_seed} ||= $exit->random_seed;
1867 1925
1868 my $data = cf::to_json $rmp; 1926 my $data = cf::to_json $rmp;
1869 my $md5 = Digest::MD5::md5_hex $data; 1927 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1870 1929
1871 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1872 aio_write $fh, 0, (length $data), $data, 0; 1931 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh;
1933 aio_rename "$meta~", $meta;
1873 1934
1874 $exit->slaying ("?random/$md5"); 1935 $exit->slaying ("?random/$md5");
1875 $exit->msg (undef); 1936 $exit->msg (undef);
1876 } 1937 }
1877} 1938}
1878 1939
1879sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1880 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1881 1942
1882 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1883 1953
1884 $self->enter_link; 1954 $self->enter_link;
1885 1955
1886 (async { 1956 (async {
1887 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1958 unless (eval {
1889 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1890 if $exit->slaying eq "/!";
1891
1892 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1960
1895 1; 1961 1;
1896 }) { 1962 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1898 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
1918 1984
1919sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1920 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1921 1987
1922 utf8::encode $text; 1988 utf8::encode $text;
1923 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1924} 1990}
1925 1991
1926 1992
1927=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1928 1994
1959 # get handled first 2025 # get handled first
1960 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1961 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1962 2028
1963 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1964 2031
1965 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1966 2033
1967 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1968 if (@$queue) { 2035 if (@$queue) {
2129The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2130using it, it should be unique. 2197using it, it should be unique.
2131 2198
2132=over 4 2199=over 4
2133 2200
2134=item $hashref = cf::db_get $family
2135
2136Return a hashref for use by the extension C<$family>, which can be
2137modified. After modifications, you have to call C<cf::db_dirty> or
2138C<cf::db_sync>.
2139
2140=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2141 2202
2142Returns a single value from the database 2203Returns a single value from the database.
2143
2144=item cf::db_put $family => $hashref
2145
2146Stores the given family hashref into the database. Updates are delayed, if
2147you want the data to be synced to disk immediately, use C<cf::db_sync>.
2148 2204
2149=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2150 2206
2151Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2152want the data to be synced to disk immediately, use C<cf::db_sync>.
2153
2154=item cf::db_dirty
2155
2156Marks the database as dirty, to be updated at a later time.
2157
2158=item cf::db_sync
2159
2160Immediately write the database to disk I<if it is dirty>.
2161 2208
2162=cut 2209=cut
2163 2210
2164our $DB; 2211our $DB;
2165 2212
2166{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2167 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2168 2232
2169 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2170 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2171 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2172 2237
2173 my $pid; 2238 unlink $path;
2174
2175 sub db_save() {
2176 waitpid $pid, 0 if $pid;
2177 if (0 == ($pid = fork)) {
2178 $DB->{_meta}{version} = 1;
2179 Storable::nstore $DB, "$path~";
2180 rename "$path~", $path;
2181 cf::_exit 0 if defined $pid;
2182 } 2239 };
2183 } 2240 }
2184
2185 my $dirty;
2186
2187 sub db_sync() {
2188 db_save if $dirty;
2189 undef $dirty;
2190 }
2191
2192 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2193 db_sync;
2194 }); 2241 }
2242}
2195 2243
2196 sub db_dirty() {
2197 $dirty = 1;
2198 $idle->start;
2199 }
2200
2201 sub db_get($;$) { 2244sub db_get($$) {
2202 @_ >= 2 2245 my $key = "$_[0]/$_[1]";
2203 ? $DB->{$_[0]}{$_[1]}
2204 : ($DB->{$_[0]} ||= { })
2205 }
2206 2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2207 sub db_put($$;$) { 2255sub db_put($$$) {
2208 if (@_ >= 3) { 2256 BDB::dbreq_pri 4;
2209 $DB->{$_[0]}{$_[1]} = $_[2]; 2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions
2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2210 } else { 2293 } else {
2211 $DB->{$_[0]} = $_[1]; 2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2212 }
2213 db_dirty;
2214 }
2215
2216 cf::global->attach (
2217 prio => 10000,
2218 on_cleanup => sub {
2219 db_sync;
2220 }, 2295 }
2221 ); 2296 Coro::cede;
2222} 2297 }
2223 2298
2224############################################################################# 2299 1
2225# the server's main() 2300}
2301
2302sub reload_resources {
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2311}
2226 2312
2227sub cfg_load { 2313sub cfg_load {
2228 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2229 or return; 2315 or return;
2230 2316
2247 2333
2248sub main { 2334sub main {
2249 # we must not ever block the main coroutine 2335 # we must not ever block the main coroutine
2250 local $Coro::idle = sub { 2336 local $Coro::idle = sub {
2251 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2338 (async {
2252 async { Event::one_event }; 2339 Event::one_event;
2340 })->prio (Coro::PRIO_MAX);
2253 }; 2341 };
2254 2342
2255 cfg_load; 2343 cfg_load;
2256 db_load; 2344 db_init;
2257 load_extensions; 2345 load_extensions;
2346
2347 $TICK_WATCHER->start;
2258 Event::loop; 2348 Event::loop;
2259} 2349}
2260 2350
2261############################################################################# 2351#############################################################################
2262# initialisation and cleanup 2352# initialisation and cleanup
2263 2353
2264# install some emergency cleanup handlers 2354# install some emergency cleanup handlers
2265BEGIN { 2355BEGIN {
2266 for my $signal (qw(INT HUP TERM)) { 2356 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal ( 2357 Event->signal (
2358 reentrant => 0,
2268 data => WF_AUTOCANCEL, 2359 data => WF_AUTOCANCEL,
2269 signal => $signal, 2360 signal => $signal,
2361 prio => 0,
2270 cb => sub { 2362 cb => sub {
2271 cf::cleanup "SIG$signal"; 2363 cf::cleanup "SIG$signal";
2272 }, 2364 },
2273 ); 2365 );
2274 } 2366 }
2275} 2367}
2280 warn "enter emergency perl save\n"; 2372 warn "enter emergency perl save\n";
2281 2373
2282 cf::sync_job { 2374 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2375 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2376 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2377 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2378 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2379 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2380 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2381 $pl->valid or next;
2290 $pl->save; 2382 $pl->save;
2296 my $map = $cf::MAP{$path} or next; 2388 my $map = $cf::MAP{$path} or next;
2297 $map->valid or next; 2389 $map->valid or next;
2298 $map->save; 2390 $map->save;
2299 } 2391 }
2300 warn "end emergency map save\n"; 2392 warn "end emergency map save\n";
2393
2394 warn "begin emergency database checkpoint\n";
2395 BDB::db_env_txn_checkpoint $DB_ENV;
2396 warn "end emergency database checkpoint\n";
2301 }; 2397 };
2302 2398
2303 warn "leave emergency perl save\n"; 2399 warn "leave emergency perl save\n";
2400}
2401
2402sub post_cleanup {
2403 my ($make_core) = @_;
2404
2405 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core;
2304} 2407}
2305 2408
2306sub reload() { 2409sub reload() {
2307 # can/must only be called in main 2410 # can/must only be called in main
2308 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
2309 warn "can only reload from main coroutine\n"; 2412 warn "can only reload from main coroutine";
2310 return; 2413 return;
2311 } 2414 }
2312 2415
2313 warn "reloading..."; 2416 warn "reloading...";
2314 2417
2315 warn "freezing server"; 2418 warn "entering sync_job";
2316 my $guard = freeze_mainloop; 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2317 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2318 2424
2319 warn "sync database to disk"; 2425 warn "syncing database to disk";
2320 cf::db_sync; 2426 BDB::db_env_txn_checkpoint $DB_ENV;
2321 IO::AIO::flush;
2322 2427
2323 eval {
2324 # if anything goes wrong in here, we should simply crash as we already saved 2428 # if anything goes wrong in here, we should simply crash as we already saved
2325 2429
2326 warn "cancel all watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2327 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2328 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2329 } 2433 }
2330 2434
2435 warn "flushing outstanding aio requests";
2436 for (;;) {
2437 BDB::flush;
2438 IO::AIO::flush;
2439 Coro::cede;
2440 last unless IO::AIO::nreqs || BDB::nreqs;
2441 warn "iterate...";
2442 }
2443
2444 ++$RELOAD;
2445
2331 warn "cancel all extension coros"; 2446 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2448 %EXT_CORO = ();
2334 2449
2335 warn "remove commands"; 2450 warn "removing commands";
2336 %COMMAND = (); 2451 %COMMAND = ();
2337 2452
2338 warn "remove ext commands"; 2453 warn "removing ext commands";
2339 %EXTCMD = (); 2454 %EXTCMD = ();
2340 2455
2341 warn "unload/nuke all extensions"; 2456 warn "unloading/nuking all extensions";
2342 for my $pkg (@EXTS) { 2457 for my $pkg (@EXTS) {
2343 warn "... unloading $pkg"; 2458 warn "... unloading $pkg";
2344 2459
2345 if (my $cb = $pkg->can ("unload")) { 2460 if (my $cb = $pkg->can ("unload")) {
2346 eval { 2461 eval {
2351 2466
2352 warn "... nuking $pkg"; 2467 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg; 2468 Symbol::delete_package $pkg;
2354 } 2469 }
2355 2470
2356 warn "unload all perl modules loaded from $LIBDIR"; 2471 warn "unloading all perl modules loaded from $LIBDIR";
2357 while (my ($k, $v) = each %INC) { 2472 while (my ($k, $v) = each %INC) {
2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2473 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2359 2474
2360 warn "removing <$k>"; 2475 warn "... unloading $k";
2361 delete $INC{$k}; 2476 delete $INC{$k};
2362 2477
2363 $k =~ s/\.pm$//; 2478 $k =~ s/\.pm$//;
2364 $k =~ s/\//::/g; 2479 $k =~ s/\//::/g;
2365 2480
2368 } 2483 }
2369 2484
2370 Symbol::delete_package $k; 2485 Symbol::delete_package $k;
2371 } 2486 }
2372 2487
2373 warn "get rid of safe::, as good as possible"; 2488 warn "getting rid of safe::, as good as possible";
2374 Symbol::delete_package "safe::$_" 2489 Symbol::delete_package "safe::$_"
2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2490 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2376 2491
2377 warn "unload cf.pm \"a bit\""; 2492 warn "unloading cf.pm \"a bit\"";
2378 delete $INC{"cf.pm"}; 2493 delete $INC{"cf.pm"};
2379 2494
2380 # don't, removes xs symbols, too, 2495 # don't, removes xs symbols, too,
2381 # and global variables created in xs 2496 # and global variables created in xs
2382 #Symbol::delete_package __PACKAGE__; 2497 #Symbol::delete_package __PACKAGE__;
2383 2498
2499 warn "unload completed, starting to reload now";
2500
2384 warn "reloading cf.pm"; 2501 warn "reloading cf.pm";
2385 require cf; 2502 require cf;
2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2387 2504
2388 warn "load config and database again"; 2505 warn "loading config and database again";
2389 cf::cfg_load; 2506 cf::cfg_load;
2390 cf::db_load;
2391 2507
2392 warn "load extensions"; 2508 warn "loading extensions";
2393 cf::load_extensions; 2509 cf::load_extensions;
2394 2510
2395 warn "reattach attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2396 _global_reattach; 2512 _global_reattach; # objects, sockets
2397 warn "reattach attachments to maps"; 2513 warn "reattaching attachments to maps";
2398 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2399 }; 2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2400 2517
2401 if ($@) { 2518 warn "loading reloadable resources";
2519 reload_resources;
2520
2521 warn "leaving sync_job";
2522
2523 1
2524 } or do {
2402 warn $@; 2525 warn $@;
2403 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2404 exit 1; 2527 exit 1;
2405 } 2528 };
2406 2529
2407 warn "reloaded"; 2530 warn "reloaded";
2408}; 2531};
2409 2532
2410############################################################################# 2533our $RELOAD_WATCHER; # used only during reload
2411
2412unless ($LINK_MAP) {
2413 $LINK_MAP = cf::map::new;
2414
2415 $LINK_MAP->width (41);
2416 $LINK_MAP->height (41);
2417 $LINK_MAP->alloc;
2418 $LINK_MAP->path ("{link}");
2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2421
2422 # dirty hack because... archetypes are not yet loaded
2423 Event->timer (
2424 after => 10,
2425 cb => sub {
2426 $_[0]->w->cancel;
2427
2428 # provide some exits "home"
2429 my $exit = cf::object::new "exit";
2430
2431 $exit->slaying ($EMERGENCY_POSITION->[0]);
2432 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2433 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2434
2435 $LINK_MAP->insert ($exit->clone, 19, 19);
2436 $LINK_MAP->insert ($exit->clone, 19, 20);
2437 $LINK_MAP->insert ($exit->clone, 19, 21);
2438 $LINK_MAP->insert ($exit->clone, 20, 19);
2439 $LINK_MAP->insert ($exit->clone, 20, 21);
2440 $LINK_MAP->insert ($exit->clone, 21, 19);
2441 $LINK_MAP->insert ($exit->clone, 21, 20);
2442 $LINK_MAP->insert ($exit->clone, 21, 21);
2443
2444 $exit->destroy;
2445 });
2446
2447 $LINK_MAP->{deny_save} = 1;
2448 $LINK_MAP->{deny_reset} = 1;
2449
2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2451}
2452 2534
2453register_command "reload" => sub { 2535register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2536 my ($who, $arg) = @_;
2455 2537
2456 if ($who->flag (FLAG_WIZ)) { 2538 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2539 $who->message ("reloading server.");
2540
2541 # doing reload synchronously and two reloads happen back-to-back,
2542 # coro crashes during coro_state_free->destroy here.
2543
2544 $RELOAD_WATCHER ||= Event->timer (
2545 reentrant => 0,
2546 after => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => sub {
2458 reload; 2549 reload;
2459 $who->message ("end of reload."); 2550 undef $RELOAD_WATCHER;
2551 },
2552 );
2460 } 2553 }
2461}; 2554};
2462 2555
2463unshift @INC, $LIBDIR; 2556unshift @INC, $LIBDIR;
2557
2558my $bug_warning = 0;
2464 2559
2465$TICK_WATCHER = Event->timer ( 2560$TICK_WATCHER = Event->timer (
2466 reentrant => 0, 2561 reentrant => 0,
2562 parked => 1,
2467 prio => 0, 2563 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2564 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2470 cb => sub { 2566 cb => sub {
2567 if ($Coro::current != $Coro::main) {
2568 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2569 unless ++$bug_warning > 10;
2570 return;
2571 }
2572
2573 $NOW = Event::time;
2574
2471 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2474 2578
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10;
2581 Coro::async_pool {
2582 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!";
2584 };
2585 }
2586
2475 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2476 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d#
2477 2592
2478 # if we are delayed by four ticks or more, skip them all 2593 # if we are delayed by four ticks or more, skip them all
2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2480 2595
2481 $TICK_WATCHER->at ($NEXT_TICK); 2596 $TICK_WATCHER->at ($NEXT_TICK);
2482 $TICK_WATCHER->start; 2597 $TICK_WATCHER->start;
2483 }, 2598 },
2484); 2599);
2485 2600
2601{
2486IO::AIO::max_poll_time $TICK * 0.2; 2602 BDB::max_poll_time $TICK * 0.1;
2487 2603 $BDB_POLL_WATCHER = Event->io (
2488Event->io ( 2604 reentrant => 0,
2489 fd => IO::AIO::poll_fileno, 2605 fd => BDB::poll_fileno,
2490 poll => 'r', 2606 poll => 'r',
2491 prio => 5, 2607 prio => 0,
2492 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb,
2494);
2495
2496Event->timer (
2497 data => WF_AUTOCANCEL, 2608 data => WF_AUTOCANCEL,
2498 after => 0, 2609 cb => \&BDB::poll_cb,
2499 interval => 10, 2610 );
2500 cb => sub { 2611 BDB::min_parallel 8;
2501 (Coro::unblock_sub { 2612
2502 write_runtime 2613 BDB::set_sync_prepare {
2503 or warn "ERROR: unable to write runtime file: $!"; 2614 my $status;
2615 my $current = $Coro::current;
2616 (
2617 sub {
2618 $status = $!;
2619 $current->ready; undef $current;
2620 },
2621 sub {
2622 Coro::schedule while defined $current;
2623 $! = $status;
2624 },
2625 )
2626 };
2627
2628 unless ($DB_ENV) {
2629 $DB_ENV = BDB::db_env_create;
2630
2631 cf::sync_job {
2632 eval {
2633 BDB::db_env_open
2634 $DB_ENV,
2635 $BDB_ENV_DIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666;
2639
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2641
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect;
2644 };
2645
2646 cf::cleanup "db_env_open(db): $@" if $@;
2504 })->(); 2647 };
2505 }, 2648 }
2506); 2649}
2650
2651{
2652 IO::AIO::min_parallel 8;
2653
2654 undef $Coro::AIO::WATCHER;
2655 IO::AIO::max_poll_time $TICK * 0.1;
2656 $AIO_POLL_WATCHER = Event->io (
2657 reentrant => 0,
2658 data => WF_AUTOCANCEL,
2659 fd => IO::AIO::poll_fileno,
2660 poll => 'r',
2661 prio => 6,
2662 cb => \&IO::AIO::poll_cb,
2663 );
2664}
2507 2665
2508END { cf::emergency_save } 2666END { cf::emergency_save }
2509 2667
25101 26681
2511 2669

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines