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.159 by root, Wed Jan 10 22:50:12 2007 UTC vs.
Revision 1.228 by root, Mon Mar 26 16:53:33 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines