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

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

Diff Legend

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