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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines