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.162 by root, Thu Jan 11 00:41:08 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 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 392
523############################################################################# 393#############################################################################
524 394
525=head2 ATTACHABLE OBJECTS 395=head2 ATTACHABLE OBJECTS
526 396
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 522our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 523our @CB_MAP = ();
654 524
655my %attachment; 525my %attachment;
656 526
527sub cf::attachable::thawer_merge {
528 # simply override everything except _meta
529 local $_[0]{_meta};
530 %{$_[0]} = %{$_[1]};
531}
532
657sub _attach_cb($$$$) { 533sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 534 my ($registry, $event, $prio, $cb) = @_;
659 535
660 use sort 'stable'; 536 use sort 'stable';
661 537
… …
832# object support 708# object support
833 709
834sub reattach { 710sub reattach {
835 # basically do the same as instantiate, without calling instantiate 711 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 712 my ($obj) = @_;
713
714 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 715
838 my $registry = $obj->registry; 716 my $registry = $obj->registry;
839 717
840 @$registry = (); 718 @$registry = ();
841 719
… …
888 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
889 767
890 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
891 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
892 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
893 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
894 close $fh; 772 close $fh;
895 773
896 if (@$objs) { 774 if (@$objs) {
897 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
898 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
899 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
900 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
901 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
902 close $fh; 780 close $fh;
903 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
904 } 782 }
905 } else { 783 } else {
906 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1028 "package $pkg; use strict; use utf8;\n" 906 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 907 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 908 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 909 . "\n};\n1";
1032 910
1033 eval $source 911 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 912 my $msg = $@ ? "$path: $@\n"
1035 : "extension disabled.\n"; 913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
1036 921
1037 push @EXTS, $pkg; 922 push @EXTS, $pkg;
1038} 923}
1039 924
1040sub load_extensions { 925sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 931 } or warn "$ext not loaded: $@";
1047 } 932 }
1048} 933}
1049 934
1050############################################################################# 935#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 936
1066=head2 CORE EXTENSIONS 937=head2 CORE EXTENSIONS
1067 938
1068Functions and methods that extend core crossfire objects. 939Functions and methods that extend core crossfire objects.
1069 940
… …
1105 976
1106sub exists($) { 977sub exists($) {
1107 my ($login) = @_; 978 my ($login) = @_;
1108 979
1109 $cf::PLAYER{$login} 980 $cf::PLAYER{$login}
1110 or cf::sync_job { !aio_stat $login } 981 or cf::sync_job { !aio_stat path $login }
1111} 982}
1112 983
1113sub find($) { 984sub find($) {
1114 return $cf::PLAYER{$_[0]} || do { 985 return $cf::PLAYER{$_[0]} || do {
1115 my $login = $_[0]; 986 my $login = $_[0];
… …
1161 1032
1162=cut 1033=cut
1163 1034
1164sub quit_character { 1035sub quit_character {
1165 my ($pl) = @_; 1036 my ($pl) = @_;
1037
1038 my $name = $pl->ob->name;
1166 1039
1167 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1168 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1169 1042
1170 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1175 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1176 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1177 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1178 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1179 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1180 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1181} 1074}
1182 1075
1183=item cf::player::list_logins 1076=item cf::player::list_logins
1184 1077
1185Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1205 \@logins 1098 \@logins
1206} 1099}
1207 1100
1208=item $player->maps 1101=item $player->maps
1209 1102
1210Returns an arrayref of cf::path's of all maps that are private for this 1103Returns an arrayref of map paths that are private for this
1211player. May block. 1104player. May block.
1212 1105
1213=cut 1106=cut
1214 1107
1215sub maps($) { 1108sub maps($) {
1216 my ($pl) = @_; 1109 my ($pl) = @_;
1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1217 1112
1218 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1219 or return; 1114 or return;
1220 1115
1221 my @paths; 1116 my @paths;
… …
1223 for (@$files) { 1118 for (@$files) {
1224 utf8::decode $_; 1119 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1227 1122
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1123 push @paths, cf::map::normalise "~$pl/$_";
1229 } 1124 }
1230 1125
1231 \@paths 1126 \@paths
1232} 1127}
1233 1128
… …
1259package cf::map; 1154package cf::map;
1260 1155
1261use Fcntl; 1156use Fcntl;
1262use Coro::AIO; 1157use Coro::AIO;
1263 1158
1159use overload
1160 '""' => \&as_string,
1161 fallback => 1;
1162
1264our $MAX_RESET = 3600; 1163our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1164our $DEFAULT_RESET = 3000;
1266 1165
1267sub generate_random_map { 1166sub generate_random_map {
1268 my ($path, $rmp) = @_; 1167 my ($self, $rmp) = @_;
1269
1270 # mit "rum" bekleckern, nicht 1168 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1169 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1170 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1171 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1172 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1173 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1174 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1179 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1180 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1181 )
1285} 1182}
1286 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
1287# and all this just because we cannot iterate over 1313# and all this just because we cannot iterate over
1288# all maps in C++... 1314# all maps in C++...
1289sub change_all_map_light { 1315sub change_all_map_light {
1290 my ($change) = @_; 1316 my ($change) = @_;
1291 1317
1292 $_->change_map_light ($change) 1318 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1319 for grep $_->outdoor, values %cf::MAP;
1294} 1320}
1295 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
1296sub load_map_header($) { 1330sub load_header_from($) {
1297 my ($path) = @_; 1331 my ($self, $path) = @_;
1298 1332
1299 utf8::encode $path; 1333 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1334 #aio_open $path, O_RDONLY, 0
1335 # or return;
1336
1337 $self->_load_header ($path)
1301 or return; 1338 or return;
1302 1339
1303 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
1304 or return; 1383 or return;
1384 $self->prepare_orig;
1385 }
1305 1386
1306 # for better error messages only, will be overwritten later 1387 1
1307 $map->path ($path);
1308
1309 $map->load_header ($path)
1310 or return;
1311
1312 $map->{load_path} = $path;
1313
1314 $map
1315} 1388}
1316 1389
1317sub find; 1390sub find;
1318sub find { 1391sub find {
1319 my ($path, $origin) = @_; 1392 my ($path, $origin) = @_;
1320 1393
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1394 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1395
1326 cf::lock_wait "map_find:$key"; 1396 cf::lock_wait "map_find:$path";
1327 1397
1328 $cf::MAP{$key} || do { 1398 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1399 my $guard = cf::lock_acquire "map_find:$path";
1330 1400 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1401 or return;
1345 1402
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1403 $map->{last_save} = $cf::RUNTIME;
1358 1404
1359 Coro::cede; 1405 $map->load_header
1406 or return;
1360 1407
1361 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;
1362 $map->reset; 1411 $map->reset;
1363 undef $guard; 1412 undef $guard;
1364 $map = find $path 1413 return find $path;
1365 or return;
1366 } 1414 }
1367 1415
1368 $cf::MAP{$key} = $map 1416 $cf::MAP{$path} = $map
1369 } 1417 }
1370} 1418}
1419
1420sub pre_load { }
1421sub post_load { }
1371 1422
1372sub load { 1423sub load {
1373 my ($self) = @_; 1424 my ($self) = @_;
1374 1425
1426 local $self->{deny_reset} = 1; # loading can take a long time
1427
1375 my $path = $self->{path}; 1428 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1429 my $guard = cf::lock_acquire "map_load:$path";
1377 1430
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1431 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1432
1380 $self->in_memory (cf::MAP_LOADING); 1433 $self->in_memory (cf::MAP_LOADING);
1381 1434
1382 $self->alloc; 1435 $self->alloc;
1436
1437 $self->pre_load;
1438
1383 $self->load_objects ($self->{load_path}, 1) 1439 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1440 or return;
1385 1441
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1443 if delete $self->{load_original};
1388 1444
1389 if (my $uniq = $path->uniq_path) { 1445 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1446 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1447 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1448 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1449 $self->_load_objects ($uniq, 0);
1394 } 1450 }
1395 } 1451 }
1396 1452
1397 Coro::cede; 1453 Coro::cede;
1398 1454
1399 # now do the right thing for maps 1455 # now do the right thing for maps
1400 $self->link_multipart_objects; 1456 $self->link_multipart_objects;
1401 1457
1402 if ($self->{path}->is_style_map) { 1458 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1459 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1460 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1461 $self->update_buttons;
1462 Coro::cede;
1409 $self->set_darkness_map; 1463 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1464 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1465 unless $self->difficulty;
1466 Coro::cede;
1412 $self->activate; 1467 $self->activate;
1413 } 1468 }
1414 1469
1415 Coro::cede; 1470 $self->post_load;
1416 1471
1417 $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
1418} 1482}
1419 1483
1420# 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
1421sub load_diag { 1485sub load_diag {
1422 my ($map) = @_; 1486 my ($map) = @_;
… …
1452 1516
1453 cf::sync_job { $map->load }; 1517 cf::sync_job { $map->load };
1454} 1518}
1455 1519
1456our %MAP_PREFETCH; 1520our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1521our $MAP_PREFETCHER = undef;
1458 while () {
1459 while (%MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path
1465 or next;
1466 $map->load;
1467 }
1468 Coro::schedule;
1469 }
1470};
1471 1522
1472sub find_async { 1523sub find_async {
1473 my ($path, $origin) = @_; 1524 my ($path, $origin) = @_;
1474 1525
1475 $path = new cf::path $path, $origin && $origin->path; 1526 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1527
1478 if (my $map = $cf::MAP{$key}) { 1528 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1529 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1530 }
1481 1531
1482 $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 };
1483 $MAP_PREFETCHER->ready; 1545 $MAP_PREFETCHER->prio (6);
1484 1546
1485 () 1547 ()
1486} 1548}
1487 1549
1488sub save { 1550sub save {
… …
1492 1554
1493 $self->{last_save} = $cf::RUNTIME; 1555 $self->{last_save} = $cf::RUNTIME;
1494 1556
1495 return unless $self->dirty; 1557 return unless $self->dirty;
1496 1558
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1559 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1560 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1561
1500 $self->{load_path} = $save; 1562 $self->{load_path} = $save;
1501 1563
1502 return if $self->{deny_save}; 1564 return if $self->{deny_save};
1503 1565
… …
1506 cf::async { 1568 cf::async {
1507 $_->contr->save for $self->players; 1569 $_->contr->save for $self->players;
1508 }; 1570 };
1509 1571
1510 if ($uniq) { 1572 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1573 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1574 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1575 } else {
1514 $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);
1515 } 1577 }
1516} 1578}
1517 1579
1518sub swap_out { 1580sub swap_out {
1519 my ($self) = @_; 1581 my ($self) = @_;
… …
1533 1595
1534sub reset_at { 1596sub reset_at {
1535 my ($self) = @_; 1597 my ($self) = @_;
1536 1598
1537 # TODO: safety, remove and allow resettable per-player maps 1599 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1600 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1601 return 1e99 if $self->{deny_reset};
1540 1602
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1603 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 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;
1543 1605
… …
1548 my ($self) = @_; 1610 my ($self) = @_;
1549 1611
1550 $self->reset_at <= $cf::RUNTIME 1612 $self->reset_at <= $cf::RUNTIME
1551} 1613}
1552 1614
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 1615sub reset {
1575 my ($self) = @_; 1616 my ($self) = @_;
1576 1617
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1618 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1619
1579 return if $self->players; 1620 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1581 1622
1582 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1583 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
1584 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1636
1637 $self->clear;
1585 1638
1586 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1587 1640
1588 $self->unlink_save; 1641 $self->unlink_save;
1589 $self->destroy; 1642 $self->destroy;
… …
1592my $nuke_counter = "aaaa"; 1645my $nuke_counter = "aaaa";
1593 1646
1594sub nuke { 1647sub nuke {
1595 my ($self) = @_; 1648 my ($self) = @_;
1596 1649
1650 delete $cf::MAP{$self->path};
1651
1652 $self->unlink_save;
1653
1654 bless $self, "cf::map";
1655 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1656 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1657 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1658 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1659
1660 $cf::MAP{$self->path} = $self;
1661
1600 $self->reset; # polite request, might not happen 1662 $self->reset; # polite request, might not happen
1601} 1663}
1602 1664
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1665=item cf::map::unique_maps
1614 1666
1615Returns an arrayref of cf::path's of all shared maps that have 1667Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1668instantiated unique items. May block.
1617 1669
1618=cut 1670=cut
1619 1671
1620sub unique_maps() { 1672sub unique_maps() {
… …
1626 for (@$files) { 1678 for (@$files) {
1627 utf8::decode $_; 1679 utf8::decode $_;
1628 next if /\.pst$/; 1680 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1681 next unless /^$PATH_SEP/o;
1630 1682
1631 push @paths, new cf::path $_; 1683 push @paths, cf::map::normalise $_;
1632 } 1684 }
1633 1685
1634 \@paths 1686 \@paths
1635} 1687}
1636 1688
… …
1711 1763
1712=item $player_object->enter_link 1764=item $player_object->enter_link
1713 1765
1714Freezes 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}>).
1715 1767
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1769I<MUST> call C<leave_link> as soon as possible, though.
1718 1770
1771Will never block.
1772
1719=item $player_object->leave_link ($map, $x, $y) 1773=item $player_object->leave_link ($map, $x, $y)
1720 1774
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1778fails, to the emergency map position.
1725 1779
1726Might block. 1780Might block.
1727 1781
1728=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}
1729 1793
1730sub cf::object::player::enter_link { 1794sub cf::object::player::enter_link {
1731 my ($self) = @_; 1795 my ($self) = @_;
1732 1796
1733 $self->deactivate_recursive; 1797 $self->deactivate_recursive;
1734 1798
1735 return if $self->map == $LINK_MAP; 1799 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1800
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1802 if $self->map;
1739 1803
1740 $self->enter_map ($LINK_MAP, 20, 20); 1804 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1805}
1742 1806
1743sub cf::object::player::leave_link { 1807sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1808 my ($self, $map, $x, $y) = @_;
1745 1809
… …
1767 $map->load; 1831 $map->load;
1768 $map->load_diag; 1832 $map->load_diag;
1769 1833
1770 return unless $self->contr->active; 1834 return unless $self->contr->active;
1771 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1772 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1773} 1839}
1774 1840
1775cf::player->attach ( 1841cf::player->attach (
1776 on_logout => sub { 1842 on_logout => sub {
… …
1789 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1790 # should happen only on crashes 1856 # should happen only on crashes
1791 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1792 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1793 (async { 1859 (async {
1794 # we need this sleep as the login has a concurrent enter_exit running
1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1798 . "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.",
1799 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
1800 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1801 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1802 })->prio (2); 1868 })->prio (2);
1803 } 1869 }
1804 }, 1870 },
… …
1809=cut 1875=cut
1810 1876
1811sub cf::object::player::goto { 1877sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1878 my ($self, $path, $x, $y) = @_;
1813 1879
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1880 $self->enter_link;
1817 1881
1818 (async { 1882 (async {
1883 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 1884 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1885 $map = $map->customise_for ($self) if $map;
1821 1886 $map
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1887 } or
1823# if $map;
1824
1825 $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);
1826 1889
1827 $self->leave_link ($map, $x, $y); 1890 $self->leave_link ($map, $x, $y);
1828 })->prio (1); 1891 })->prio (1);
1829} 1892}
1830 1893
… …
1834 1897
1835sub parse_random_map_params { 1898sub parse_random_map_params {
1836 my ($spec) = @_; 1899 my ($spec) = @_;
1837 1900
1838 my $rmp = { # defaults 1901 my $rmp = { # defaults
1839 xsize => 10, 1902 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1903 ysize => (cf::rndm 15, 40),
1904 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1905 #layout => string,
1841 }; 1906 };
1842 1907
1843 for (split /\n/, $spec) { 1908 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1909 my ($k, $v) = split /\s+/, $_, 2;
1845 1910
… …
1849 $rmp 1914 $rmp
1850} 1915}
1851 1916
1852sub prepare_random_map { 1917sub prepare_random_map {
1853 my ($exit) = @_; 1918 my ($exit) = @_;
1919
1920 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1921
1855 # all this does is basically replace the /! path by 1922 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1923 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1924 # that depends on the exit object
1858 1925
1859 my $rmp = parse_random_map_params $exit->msg; 1926 my $rmp = parse_random_map_params $exit->msg;
1860 1927
1861 if ($exit->map) { 1928 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 1929 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 1930 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 1931 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 1932 $rmp->{origin_y} = $exit->y;
1866 } 1933 }
1867 1934
1868 $rmp->{random_seed} ||= $exit->random_seed; 1935 $rmp->{random_seed} ||= $exit->random_seed;
1869 1936
1870 my $data = cf::to_json $rmp; 1937 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1938 my $md5 = Digest::MD5::md5_hex $data;
1939 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1940
1873 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) {
1874 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;
1875 1945
1876 $exit->slaying ("?random/$md5"); 1946 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1947 $exit->msg (undef);
1878 } 1948 }
1879} 1949}
1880 1950
1881sub cf::object::player::enter_exit { 1951sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1952 my ($self, $exit) = @_;
1883 1953
1884 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;
1885 1964
1886 $self->enter_link; 1965 $self->enter_link;
1887 1966
1888 (async { 1967 (async {
1889 $self->deactivate_recursive; # just to be sure 1968 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1969 unless (eval {
1891 prepare_random_map $exit 1970 $self->goto ($slaying, $hp, $sp);
1892 if $exit->slaying eq "/!";
1893
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1971
1897 1; 1972 1;
1898 }) { 1973 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1974 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "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. "
… …
1920 1995
1921sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1922 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1923 1998
1924 utf8::encode $text; 1999 utf8::encode $text;
1925 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1926} 2001}
1927 2002
1928 2003
1929=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1930 2005
… …
1961 # get handled first 2036 # get handled first
1962 my $queue = delete $ns->{query_queue} 2037 my $queue = delete $ns->{query_queue}
1963 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
1964 2039
1965 (shift @$queue)->[1]->($msg); 2040 (shift @$queue)->[1]->($msg);
2041 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2042
1967 push @{ $ns->{query_queue} }, @$queue; 2043 push @{ $ns->{query_queue} }, @$queue;
1968 2044
1969 if (@{ $ns->{query_queue} } == @$queue) { 2045 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2046 if (@$queue) {
… …
2131The 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
2132using it, it should be unique. 2208using it, it should be unique.
2133 2209
2134=over 4 2210=over 4
2135 2211
2136=item $hashref = cf::db_get $family
2137
2138Return a hashref for use by the extension C<$family>, which can be
2139modified. After modifications, you have to call C<cf::db_dirty> or
2140C<cf::db_sync>.
2141
2142=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2143 2213
2144Returns a single value from the database 2214Returns a single value from the database.
2145
2146=item cf::db_put $family => $hashref
2147
2148Stores the given family hashref into the database. Updates are delayed, if
2149you want the data to be synced to disk immediately, use C<cf::db_sync>.
2150 2215
2151=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2152 2217
2153Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2154want the data to be synced to disk immediately, use C<cf::db_sync>.
2155
2156=item cf::db_dirty
2157
2158Marks the database as dirty, to be updated at a later time.
2159
2160=item cf::db_sync
2161
2162Immediately write the database to disk I<if it is dirty>.
2163 2219
2164=cut 2220=cut
2165 2221
2166our $DB; 2222our $DB;
2167 2223
2168{ 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
2169 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;
2170 2243
2171 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2172 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2173 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2174 2248
2175 my $pid; 2249 unlink $path;
2176
2177 sub db_save() {
2178 waitpid $pid, 0 if $pid;
2179 if (0 == ($pid = fork)) {
2180 $DB->{_meta}{version} = 1;
2181 Storable::nstore $DB, "$path~";
2182 rename "$path~", $path;
2183 cf::_exit 0 if defined $pid;
2184 } 2250 };
2185 } 2251 }
2186
2187 my $dirty;
2188
2189 sub db_sync() {
2190 db_save if $dirty;
2191 undef $dirty;
2192 }
2193
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2195 db_sync;
2196 }); 2252 }
2253}
2197 2254
2198 sub db_dirty() {
2199 $dirty = 1;
2200 $idle->start;
2201 }
2202
2203 sub db_get($;$) { 2255sub db_get($$) {
2204 @_ >= 2 2256 my $key = "$_[0]/$_[1]";
2205 ? $DB->{$_[0]}{$_[1]}
2206 : ($DB->{$_[0]} ||= { })
2207 }
2208 2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2209 sub db_put($$;$) { 2266sub db_put($$$) {
2210 if (@_ >= 3) { 2267 BDB::dbreq_pri 4;
2211 $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;
2212 } else { 2304 } else {
2213 $DB->{$_[0]} = $_[1]; 2305 warn "smooth face '$info->{smooth}' not found for face '$face'";
2214 }
2215 db_dirty;
2216 }
2217
2218 cf::global->attach (
2219 prio => 10000,
2220 on_cleanup => sub {
2221 db_sync;
2222 }, 2306 }
2223 ); 2307 Coro::cede;
2224} 2308 }
2225 2309
2226############################################################################# 2310 1
2227# 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}
2228 2323
2229sub cfg_load { 2324sub cfg_load {
2230 open my $fh, "<:utf8", cf::confdir . "/config" 2325 open my $fh, "<:utf8", cf::confdir . "/config"
2231 or return; 2326 or return;
2232 2327
… …
2249 2344
2250sub main { 2345sub main {
2251 # we must not ever block the main coroutine 2346 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2347 local $Coro::idle = sub {
2253 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 {
2254 async { Event::one_event }; 2350 Event::one_event;
2351 })->prio (Coro::PRIO_MAX);
2255 }; 2352 };
2256 2353
2257 cfg_load; 2354 cfg_load;
2258 db_load; 2355 db_init;
2259 load_extensions; 2356 load_extensions;
2357
2358 $TICK_WATCHER->start;
2260 Event::loop; 2359 Event::loop;
2261} 2360}
2262 2361
2263############################################################################# 2362#############################################################################
2264# initialisation and cleanup 2363# initialisation and cleanup
2265 2364
2266# install some emergency cleanup handlers 2365# install some emergency cleanup handlers
2267BEGIN { 2366BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2367 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2368 Event->signal (
2369 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2370 data => WF_AUTOCANCEL,
2271 signal => $signal, 2371 signal => $signal,
2372 prio => 0,
2272 cb => sub { 2373 cb => sub {
2273 cf::cleanup "SIG$signal"; 2374 cf::cleanup "SIG$signal";
2274 }, 2375 },
2275 ); 2376 );
2276 } 2377 }
2277} 2378}
… …
2282 warn "enter emergency perl save\n"; 2383 warn "enter emergency perl save\n";
2283 2384
2284 cf::sync_job { 2385 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2386 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2387 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2388 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2389 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2390 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2391 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2392 $pl->valid or next;
2292 $pl->save; 2393 $pl->save;
… …
2298 my $map = $cf::MAP{$path} or next; 2399 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next; 2400 $map->valid or next;
2300 $map->save; 2401 $map->save;
2301 } 2402 }
2302 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";
2303 }; 2408 };
2304 2409
2305 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;
2306} 2418}
2307 2419
2308sub reload() { 2420sub reload() {
2309 # can/must only be called in main 2421 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2422 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2423 warn "can only reload from main coroutine";
2312 return; 2424 return;
2313 } 2425 }
2314 2426
2315 warn "reloading..."; 2427 warn "reloading...";
2316 2428
2317 warn "freezing server"; 2429 warn "entering sync_job";
2318 my $guard = freeze_mainloop; 2430
2431 cf::sync_job {
2432 cf::write_runtime; # external watchdog should not bark
2319 cf::emergency_save; 2433 cf::emergency_save;
2434 cf::write_runtime; # external watchdog should not bark
2320 2435
2321 warn "sync database to disk"; 2436 warn "syncing database to disk";
2322 cf::db_sync; 2437 BDB::db_env_txn_checkpoint $DB_ENV;
2323 IO::AIO::flush;
2324 2438
2325 eval {
2326 # 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
2327 2440
2328 warn "cancel all watchers"; 2441 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2442 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2443 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2444 }
2332 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
2333 warn "cancel all extension coros"; 2457 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2458 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2459 %EXT_CORO = ();
2336 2460
2337 warn "remove commands"; 2461 warn "removing commands";
2338 %COMMAND = (); 2462 %COMMAND = ();
2339 2463
2340 warn "remove ext commands"; 2464 warn "removing ext commands";
2341 %EXTCMD = (); 2465 %EXTCMD = ();
2342 2466
2343 warn "unload/nuke all extensions"; 2467 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2468 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2469 warn "... unloading $pkg";
2346 2470
2347 if (my $cb = $pkg->can ("unload")) { 2471 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2472 eval {
… …
2353 2477
2354 warn "... nuking $pkg"; 2478 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2479 Symbol::delete_package $pkg;
2356 } 2480 }
2357 2481
2358 warn "unload all perl modules loaded from $LIBDIR"; 2482 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2483 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2484 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2485
2362 warn "removing <$k>"; 2486 warn "... unloading $k";
2363 delete $INC{$k}; 2487 delete $INC{$k};
2364 2488
2365 $k =~ s/\.pm$//; 2489 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2490 $k =~ s/\//::/g;
2367 2491
… …
2370 } 2494 }
2371 2495
2372 Symbol::delete_package $k; 2496 Symbol::delete_package $k;
2373 } 2497 }
2374 2498
2375 warn "get rid of safe::, as good as possible"; 2499 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2500 Symbol::delete_package "safe::$_"
2377 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);
2378 2502
2379 warn "unload cf.pm \"a bit\""; 2503 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2504 delete $INC{"cf.pm"};
2381 2505
2382 # don't, removes xs symbols, too, 2506 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2507 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2508 #Symbol::delete_package __PACKAGE__;
2385 2509
2510 warn "unload completed, starting to reload now";
2511
2386 warn "reloading cf.pm"; 2512 warn "reloading cf.pm";
2387 require cf; 2513 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2514 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2515
2390 warn "load config and database again"; 2516 warn "loading config and database again";
2391 cf::cfg_load; 2517 cf::cfg_load;
2392 cf::db_load;
2393 2518
2394 warn "load extensions"; 2519 warn "loading extensions";
2395 cf::load_extensions; 2520 cf::load_extensions;
2396 2521
2397 warn "reattach attachments to objects/players"; 2522 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2523 _global_reattach; # objects, sockets
2399 warn "reattach attachments to maps"; 2524 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2525 reattach $_ for values %MAP;
2401 }; 2526 warn "reattaching attachments to players";
2527 reattach $_ for values %PLAYER;
2402 2528
2403 if ($@) { 2529 warn "loading reloadable resources";
2530 reload_resources;
2531
2532 warn "leaving sync_job";
2533
2534 1
2535 } or do {
2404 warn $@; 2536 warn $@;
2405 warn "error while reloading, exiting."; 2537 warn "error while reloading, exiting.";
2406 exit 1; 2538 exit 1;
2407 } 2539 };
2408 2540
2409 warn "reloaded"; 2541 warn "reloaded";
2410}; 2542};
2411 2543
2412############################################################################# 2544our $RELOAD_WATCHER; # used only during reload
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454 2545
2455register_command "reload" => sub { 2546register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2547 my ($who, $arg) = @_;
2457 2548
2458 if ($who->flag (FLAG_WIZ)) { 2549 if ($who->flag (FLAG_WIZ)) {
2459 $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 {
2460 reload; 2560 reload;
2461 $who->message ("end of reload."); 2561 undef $RELOAD_WATCHER;
2562 },
2563 );
2462 } 2564 }
2463}; 2565};
2464 2566
2465unshift @INC, $LIBDIR; 2567unshift @INC, $LIBDIR;
2568
2569my $bug_warning = 0;
2466 2570
2467$TICK_WATCHER = Event->timer ( 2571$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2572 reentrant => 0,
2573 parked => 1,
2469 prio => 0, 2574 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2575 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2576 data => WF_AUTOCANCEL,
2472 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
2584 $NOW = Event::time;
2585
2473 cf::server_tick; # one server iteration 2586 cf::server_tick; # one server iteration
2474 $RUNTIME += $TICK; 2587 $RUNTIME += $TICK;
2475 $NEXT_TICK += $TICK; 2588 $NEXT_TICK += $TICK;
2476 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
2477 $WAIT_FOR_TICK->broadcast; 2598 $WAIT_FOR_TICK->broadcast;
2478 $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#
2479 2603
2480 # 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
2481 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2605 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2482 2606
2483 $TICK_WATCHER->at ($NEXT_TICK); 2607 $TICK_WATCHER->at ($NEXT_TICK);
2484 $TICK_WATCHER->start; 2608 $TICK_WATCHER->start;
2485 }, 2609 },
2486); 2610);
2487 2611
2612{
2488IO::AIO::max_poll_time $TICK * 0.2; 2613 BDB::max_poll_time $TICK * 0.1;
2489 2614 $BDB_POLL_WATCHER = Event->io (
2490Event->io ( 2615 reentrant => 0,
2491 fd => IO::AIO::poll_fileno, 2616 fd => BDB::poll_fileno,
2492 poll => 'r', 2617 poll => 'r',
2493 prio => 5, 2618 prio => 0,
2494 data => WF_AUTOCANCEL,
2495 cb => \&IO::AIO::poll_cb,
2496);
2497
2498Event->timer (
2499 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2500 after => 0, 2620 cb => \&BDB::poll_cb,
2501 interval => 10, 2621 );
2502 cb => sub { 2622 BDB::min_parallel 8;
2503 (Coro::unblock_sub { 2623
2504 write_runtime 2624 BDB::set_sync_prepare {
2505 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 $@;
2506 })->(); 2658 };
2507 }, 2659 }
2508); 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}
2509 2676
2510END { cf::emergency_save } 2677END { cf::emergency_save }
2511 2678
25121 26791
2513 2680

Diff Legend

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