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.231 by root, Wed Apr 4 00:02:06 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;
357 and return; 373 and return;
358 374
359 1 375 1
360} 376}
361 377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387}
388
362=back 389=back
363 390
364=cut 391=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 392
493############################################################################# 393#############################################################################
494 394
495=head2 ATTACHABLE OBJECTS 395=head2 ATTACHABLE OBJECTS
496 396
622our @CB_TYPE = (); # registry for type (cf-object class) based events 522our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 523our @CB_MAP = ();
624 524
625my %attachment; 525my %attachment;
626 526
527sub cf::attachable::thawer_merge {
528 # simply override everything except _meta
529 local $_[0]{_meta};
530 %{$_[0]} = %{$_[1]};
531}
532
627sub _attach_cb($$$$) { 533sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 534 my ($registry, $event, $prio, $cb) = @_;
629 535
630 use sort 'stable'; 536 use sort 'stable';
631 537
802# object support 708# object support
803 709
804sub reattach { 710sub reattach {
805 # basically do the same as instantiate, without calling instantiate 711 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 712 my ($obj) = @_;
713
714 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 715
808 my $registry = $obj->registry; 716 my $registry = $obj->registry;
809 717
810 @$registry = (); 718 @$registry = ();
811 719
858 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
859 767
860 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
861 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
862 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
863 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
864 close $fh; 772 close $fh;
865 773
866 if (@$objs) { 774 if (@$objs) {
867 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) {
868 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
869 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
870 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
871 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
872 close $fh; 780 close $fh;
873 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
874 } 782 }
875 } else { 783 } else {
876 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
987 my $base = $1; 895 my $base = $1;
988 my $pkg = $1; 896 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 897 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 898 $pkg = "ext::$pkg";
991 899
992 warn "loading '$path' into '$pkg'\n"; 900 warn "... loading '$path' into '$pkg'\n";
993 901
994 open my $fh, "<:utf8", $path 902 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 903 or die "$path: $!";
996 904
997 my $source = 905 my $source =
998 "package $pkg; use strict; use utf8;\n" 906 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 907 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 908 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 909 . "\n};\n1";
1002 910
1003 eval $source 911 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 912 my $msg = $@ ? "$path: $@\n"
1005 : "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 }
1006 921
1007 push @EXTS, $pkg; 922 push @EXTS, $pkg;
1008} 923}
1009 924
1010sub load_extensions { 925sub load_extensions {
1016 } or warn "$ext not loaded: $@"; 931 } or warn "$ext not loaded: $@";
1017 } 932 }
1018} 933}
1019 934
1020############################################################################# 935#############################################################################
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 936
1036=head2 CORE EXTENSIONS 937=head2 CORE EXTENSIONS
1037 938
1038Functions and methods that extend core crossfire objects. 939Functions and methods that extend core crossfire objects.
1039 940
1075 976
1076sub exists($) { 977sub exists($) {
1077 my ($login) = @_; 978 my ($login) = @_;
1078 979
1079 $cf::PLAYER{$login} 980 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login } 981 or cf::sync_job { !aio_stat path $login }
1081} 982}
1082 983
1083sub find($) { 984sub find($) {
1084 return $cf::PLAYER{$_[0]} || do { 985 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0]; 986 my $login = $_[0];
1131 1032
1132=cut 1033=cut
1133 1034
1134sub quit_character { 1035sub quit_character {
1135 my ($pl) = @_; 1036 my ($pl) = @_;
1037
1038 my $name = $pl->ob->name;
1136 1039
1137 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1138 $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
1139 1042
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1145 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1149 $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
1150 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;
1151} 1074}
1152 1075
1153=item cf::player::list_logins 1076=item cf::player::list_logins
1154 1077
1155Returns 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
1175 \@logins 1098 \@logins
1176} 1099}
1177 1100
1178=item $player->maps 1101=item $player->maps
1179 1102
1180Returns 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
1181player. May block. 1104player. May block.
1182 1105
1183=cut 1106=cut
1184 1107
1185sub maps($) { 1108sub maps($) {
1186 my ($pl) = @_; 1109 my ($pl) = @_;
1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1187 1112
1188 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1189 or return; 1114 or return;
1190 1115
1191 my @paths; 1116 my @paths;
1193 for (@$files) { 1118 for (@$files) {
1194 utf8::decode $_; 1119 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1197 1122
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1123 push @paths, cf::map::normalise "~$pl/$_";
1199 } 1124 }
1200 1125
1201 \@paths 1126 \@paths
1202} 1127}
1203 1128
1204=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1205 1130
1206Sends an ext reply to the player. 1131Sends an ext reply to the player.
1207 1132
1208=cut 1133=cut
1209 1134
1210sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1211 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1212 1137
1213 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 delete $msg{msgid};
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1214 1155
1215 $self->send ("ext " . cf::to_json \%msg); 1156 $self->send ("ext " . cf::to_json \%msg);
1216} 1157}
1217 1158
1218package cf; 1159package cf;
1229package cf::map; 1170package cf::map;
1230 1171
1231use Fcntl; 1172use Fcntl;
1232use Coro::AIO; 1173use Coro::AIO;
1233 1174
1175use overload
1176 '""' => \&as_string,
1177 fallback => 1;
1178
1234our $MAX_RESET = 3600; 1179our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1180our $DEFAULT_RESET = 3000;
1236 1181
1237sub generate_random_map { 1182sub generate_random_map {
1238 my ($path, $rmp) = @_; 1183 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1184 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1185 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1186 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1187 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1188 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1189 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1190 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1191 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1192 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1193 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1194 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1195 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1196 (cf::region::find $rmp->{region}), $rmp->{custom}
1197 )
1198}
1199
1200=item cf::map->register ($regex, $prio)
1201
1202Register a handler for the map path matching the given regex at the
1203givne priority (higher is better, built-in handlers have priority 0, the
1204default).
1205
1206=cut
1207
1208sub register {
1209 my (undef, $regex, $prio) = @_;
1210 my $pkg = caller;
1211
1212 no strict;
1213 push @{"$pkg\::ISA"}, __PACKAGE__;
1214
1215 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1216}
1217
1218# also paths starting with '/'
1219$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1220
1221sub thawer_merge {
1222 my ($self, $merge) = @_;
1223
1224 # we have to keep some variables in memory intact
1225 local $self->{path};
1226 local $self->{load_path};
1227 local $self->{deny_save};
1228 local $self->{deny_reset};
1229
1230 $self->SUPER::thawer_merge ($merge);
1231}
1232
1233sub normalise {
1234 my ($path, $base) = @_;
1235
1236 $path = "$path"; # make sure its a string
1237
1238 $path =~ s/\.map$//;
1239
1240 # map plan:
1241 #
1242 # /! non-realised random map exit (special hack!)
1243 # {... are special paths that are not being touched
1244 # ?xxx/... are special absolute paths
1245 # ?random/... random maps
1246 # /... normal maps
1247 # ~user/... per-player map of a specific user
1248
1249 $path =~ s/$PATH_SEP/\//go;
1250
1251 # treat it as relative path if it starts with
1252 # something that looks reasonable
1253 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1254 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1255
1256 $base =~ s{[^/]+/?$}{};
1257 $path = "$base/$path";
1258 }
1259
1260 for ($path) {
1261 redo if s{//}{/};
1262 redo if s{/\.?/}{/};
1263 redo if s{/[^/]+/\.\./}{/};
1264 }
1265
1266 $path
1267}
1268
1269sub new_from_path {
1270 my (undef, $path, $base) = @_;
1271
1272 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1273
1274 $path = normalise $path, $base;
1275
1276 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1277 if ($path =~ $EXT_MAP{$pkg}[1]) {
1278 my $self = bless cf::map::new, $pkg;
1279 $self->{path} = $path; $self->path ($path);
1280 $self->init; # pass $1 etc.
1281 return $self;
1282 }
1283 }
1284
1285 Carp::carp "unable to resolve path '$path' (base '$base').";
1286 ()
1287}
1288
1289sub init {
1290 my ($self) = @_;
1291
1292 $self
1293}
1294
1295sub as_string {
1296 my ($self) = @_;
1297
1298 "$self->{path}"
1299}
1300
1301# the displayed name, this is a one way mapping
1302sub visible_name {
1303 &as_string
1304}
1305
1306# the original (read-only) location
1307sub load_path {
1308 my ($self) = @_;
1309
1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1311}
1312
1313# the temporary/swap location
1314sub save_path {
1315 my ($self) = @_;
1316
1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1319}
1320
1321# the unique path, undef == no special unique path
1322sub uniq_path {
1323 my ($self) = @_;
1324
1325 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1326 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1327}
1255 1328
1256# and all this just because we cannot iterate over 1329# and all this just because we cannot iterate over
1257# all maps in C++... 1330# all maps in C++...
1258sub change_all_map_light { 1331sub change_all_map_light {
1260 1333
1261 $_->change_map_light ($change) 1334 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1335 for grep $_->outdoor, values %cf::MAP;
1263} 1336}
1264 1337
1338sub unlink_save {
1339 my ($self) = @_;
1340
1341 utf8::encode (my $save = $self->save_path);
1342 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1343 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1344}
1345
1265sub try_load_header($) { 1346sub load_header_from($) {
1266 my ($path) = @_; 1347 my ($self, $path) = @_;
1267 1348
1268 utf8::encode $path; 1349 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1350 #aio_open $path, O_RDONLY, 0
1351 # or return;
1352
1353 $self->_load_header ($path)
1270 or return; 1354 or return;
1271 1355
1272 my $map = cf::map::new 1356 $self->{load_path} = $path;
1357
1358 1
1359}
1360
1361sub load_header_orig {
1362 my ($self) = @_;
1363
1364 $self->load_header_from ($self->load_path)
1365}
1366
1367sub load_header_temp {
1368 my ($self) = @_;
1369
1370 $self->load_header_from ($self->save_path)
1371}
1372
1373sub prepare_temp {
1374 my ($self) = @_;
1375
1376 $self->last_access ((delete $self->{last_access})
1377 || $cf::RUNTIME); #d#
1378 # safety
1379 $self->{instantiate_time} = $cf::RUNTIME
1380 if $self->{instantiate_time} > $cf::RUNTIME;
1381}
1382
1383sub prepare_orig {
1384 my ($self) = @_;
1385
1386 $self->{load_original} = 1;
1387 $self->{instantiate_time} = $cf::RUNTIME;
1388 $self->last_access ($cf::RUNTIME);
1389 $self->instantiate;
1390}
1391
1392sub load_header {
1393 my ($self) = @_;
1394
1395 if ($self->load_header_temp) {
1396 $self->prepare_temp;
1397 } else {
1398 $self->load_header_orig
1273 or return; 1399 or return;
1400 $self->prepare_orig;
1401 }
1274 1402
1275 # for better error messages only, will be overwritten 1403 1
1276 $map->path ($path);
1277
1278 $map->load_header ($path)
1279 or return;
1280
1281 $map->{load_path} = $path;
1282
1283 $map
1284} 1404}
1285 1405
1286sub find; 1406sub find;
1287sub find { 1407sub find {
1288 my ($path, $origin) = @_; 1408 my ($path, $origin) = @_;
1289 1409
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1410 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1411
1295 cf::lock_wait "map_find:$key"; 1412 cf::lock_wait "map_find:$path";
1296 1413
1297 $cf::MAP{$key} || do { 1414 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1415 my $guard = cf::lock_acquire "map_find:$path";
1299 1416 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; 1417 or return;
1319 1418
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; 1419 $map->{last_save} = $cf::RUNTIME;
1332 1420
1333 Coro::cede; 1421 $map->load_header
1422 or return;
1334 1423
1335 if ($map->should_reset) { 1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1425 # doing this can freeze the server in a sync job, obviously
1426 #$cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1427 $map->reset;
1337 undef $guard; 1428 undef $guard;
1338 $map = find $path 1429 return find $path;
1339 or return;
1340 } 1430 }
1341 1431
1342 $cf::MAP{$key} = $map 1432 $cf::MAP{$path} = $map
1343 } 1433 }
1344} 1434}
1435
1436sub pre_load { }
1437sub post_load { }
1345 1438
1346sub load { 1439sub load {
1347 my ($self) = @_; 1440 my ($self) = @_;
1348 1441
1442 local $self->{deny_reset} = 1; # loading can take a long time
1443
1349 my $path = $self->{path}; 1444 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1445 my $guard = cf::lock_acquire "map_load:$path";
1351 1446
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1447 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1448
1354 $self->in_memory (cf::MAP_LOADING); 1449 $self->in_memory (cf::MAP_LOADING);
1355 1450
1356 $self->alloc; 1451 $self->alloc;
1452
1453 $self->pre_load;
1454
1357 $self->load_objects ($self->{load_path}, 1) 1455 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1456 or return;
1359 1457
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1459 if delete $self->{load_original};
1362 1460
1363 if (my $uniq = $path->uniq_path) { 1461 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1462 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1463 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1464 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1465 $self->_load_objects ($uniq, 0);
1368 } 1466 }
1369 } 1467 }
1370 1468
1371 Coro::cede; 1469 Coro::cede;
1372 1470
1373 # now do the right thing for maps 1471 # now do the right thing for maps
1374 $self->link_multipart_objects; 1472 $self->link_multipart_objects;
1375 1473
1376 if ($self->{path}->is_style_map) { 1474 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1475 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1476 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1477 $self->update_buttons;
1478 Coro::cede;
1383 $self->set_darkness_map; 1479 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1480 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1481 unless $self->difficulty;
1482 Coro::cede;
1386 $self->activate; 1483 $self->activate;
1387 } 1484 }
1388 1485
1389 Coro::cede; 1486 $self->post_load;
1390 1487
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1488 $self->in_memory (cf::MAP_IN_MEMORY);
1489}
1490
1491sub customise_for {
1492 my ($self, $ob) = @_;
1493
1494 return find "~" . $ob->name . "/" . $self->{path}
1495 if $self->per_player;
1496
1497 $self
1392} 1498}
1393 1499
1394# find and load all maps in the 3x3 area around a map 1500# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1501sub load_diag {
1396 my ($map) = @_; 1502 my ($map) = @_;
1426 1532
1427 cf::sync_job { $map->load }; 1533 cf::sync_job { $map->load };
1428} 1534}
1429 1535
1430our %MAP_PREFETCH; 1536our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1537our $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 1538
1446sub find_async { 1539sub find_async {
1447 my ($path, $origin) = @_; 1540 my ($path, $origin) = @_;
1448 1541
1449 $path = new cf::path $path, $origin && $origin->path; 1542 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1543
1452 if (my $map = $cf::MAP{$key}) { 1544 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1545 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1546 }
1455 1547
1456 $MAP_PREFETCH{$key} = $path; 1548 undef $MAP_PREFETCH{$path};
1549 $MAP_PREFETCHER ||= cf::async {
1550 while (%MAP_PREFETCH) {
1551 for my $path (keys %MAP_PREFETCH) {
1552 my $map = find $path
1553 or next;
1554 $map->load;
1555
1556 delete $MAP_PREFETCH{$path};
1557 }
1558 }
1559 undef $MAP_PREFETCHER;
1560 };
1457 $MAP_PREFETCHER->ready; 1561 $MAP_PREFETCHER->prio (6);
1458 1562
1459 () 1563 ()
1460} 1564}
1461 1565
1462sub save { 1566sub save {
1466 1570
1467 $self->{last_save} = $cf::RUNTIME; 1571 $self->{last_save} = $cf::RUNTIME;
1468 1572
1469 return unless $self->dirty; 1573 return unless $self->dirty;
1470 1574
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1575 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1576 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1577
1474 $self->{load_path} = $save; 1578 $self->{load_path} = $save;
1475 1579
1476 return if $self->{deny_save}; 1580 return if $self->{deny_save};
1477 1581
1480 cf::async { 1584 cf::async {
1481 $_->contr->save for $self->players; 1585 $_->contr->save for $self->players;
1482 }; 1586 };
1483 1587
1484 if ($uniq) { 1588 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1589 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1590 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1591 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1592 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1593 }
1490} 1594}
1491 1595
1492sub swap_out { 1596sub swap_out {
1493 my ($self) = @_; 1597 my ($self) = @_;
1507 1611
1508sub reset_at { 1612sub reset_at {
1509 my ($self) = @_; 1613 my ($self) = @_;
1510 1614
1511 # TODO: safety, remove and allow resettable per-player maps 1615 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1616 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1617 return 1e99 if $self->{deny_reset};
1514 1618
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1619 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1620 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1621
1522 my ($self) = @_; 1626 my ($self) = @_;
1523 1627
1524 $self->reset_at <= $cf::RUNTIME 1628 $self->reset_at <= $cf::RUNTIME
1525} 1629}
1526 1630
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 { 1631sub reset {
1549 my ($self) = @_; 1632 my ($self) = @_;
1550 1633
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1634 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1635
1553 return if $self->players; 1636 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1637 return if $self->isa ("ext::map_per_player");#d#
1555 1638
1556 warn "resetting map ", $self->path;#d# 1639 warn "resetting map ", $self->path;#d#
1557 1640
1641 $self->in_memory (cf::MAP_SWAPPED);
1642
1643 # need to save uniques path
1644 unless ($self->{deny_save}) {
1645 my $uniq = $self->uniq_path; utf8::encode $uniq;
1646
1647 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1648 if $uniq;
1649 }
1650
1558 delete $cf::MAP{$self->path}; 1651 delete $cf::MAP{$self->path};
1652
1653 $self->clear;
1559 1654
1560 $_->clear_links_to ($self) for values %cf::MAP; 1655 $_->clear_links_to ($self) for values %cf::MAP;
1561 1656
1562 $self->unlink_save; 1657 $self->unlink_save;
1563 $self->destroy; 1658 $self->destroy;
1566my $nuke_counter = "aaaa"; 1661my $nuke_counter = "aaaa";
1567 1662
1568sub nuke { 1663sub nuke {
1569 my ($self) = @_; 1664 my ($self) = @_;
1570 1665
1666 delete $cf::MAP{$self->path};
1667
1668 $self->unlink_save;
1669
1670 bless $self, "cf::map";
1671 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1672 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1673 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1674 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1675
1676 $cf::MAP{$self->path} = $self;
1677
1574 $self->reset; # polite request, might not happen 1678 $self->reset; # polite request, might not happen
1575} 1679}
1576 1680
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 1681=item cf::map::unique_maps
1588 1682
1589Returns an arrayref of cf::path's of all shared maps that have 1683Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1684instantiated unique items. May block.
1591 1685
1592=cut 1686=cut
1593 1687
1594sub unique_maps() { 1688sub unique_maps() {
1600 for (@$files) { 1694 for (@$files) {
1601 utf8::decode $_; 1695 utf8::decode $_;
1602 next if /\.pst$/; 1696 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1697 next unless /^$PATH_SEP/o;
1604 1698
1605 push @paths, new cf::path $_; 1699 push @paths, cf::map::normalise $_;
1606 } 1700 }
1607 1701
1608 \@paths 1702 \@paths
1609} 1703}
1610 1704
1685 1779
1686=item $player_object->enter_link 1780=item $player_object->enter_link
1687 1781
1688Freezes the player and moves him/her to a special map (C<{link}>). 1782Freezes the player and moves him/her to a special map (C<{link}>).
1689 1783
1690The player should be reaosnably safe there for short amounts of time. You 1784The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1785I<MUST> call C<leave_link> as soon as possible, though.
1692 1786
1787Will never block.
1788
1693=item $player_object->leave_link ($map, $x, $y) 1789=item $player_object->leave_link ($map, $x, $y)
1694 1790
1695Moves the player out of the specila link map onto the given map. If the 1791Moves 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 1792map. 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, 1793to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1794fails, to the emergency map position.
1699 1795
1700Might block. 1796Might block.
1701 1797
1702=cut 1798=cut
1799
1800sub link_map {
1801 unless ($LINK_MAP) {
1802 $LINK_MAP = cf::map::find "{link}"
1803 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1804 $LINK_MAP->load;
1805 }
1806
1807 $LINK_MAP
1808}
1703 1809
1704sub cf::object::player::enter_link { 1810sub cf::object::player::enter_link {
1705 my ($self) = @_; 1811 my ($self) = @_;
1706 1812
1707 $self->deactivate_recursive; 1813 $self->deactivate_recursive;
1708 1814
1709 return if $self->map == $LINK_MAP; 1815 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1816
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1818 if $self->map;
1713 1819
1714 $self->enter_map ($LINK_MAP, 20, 20); 1820 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1821}
1716 1822
1717sub cf::object::player::leave_link { 1823sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1824 my ($self, $map, $x, $y) = @_;
1719 1825
1741 $map->load; 1847 $map->load;
1742 $map->load_diag; 1848 $map->load_diag;
1743 1849
1744 return unless $self->contr->active; 1850 return unless $self->contr->active;
1745 $self->activate_recursive; 1851 $self->activate_recursive;
1852
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1854 $self->enter_map ($map, $x, $y);
1747} 1855}
1748 1856
1749cf::player->attach ( 1857cf::player->attach (
1750 on_logout => sub { 1858 on_logout => sub {
1763 # try to abort aborted map switching on player login :) 1871 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1872 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1873 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1874 $pl->ob->enter_link;
1767 (async { 1875 (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, 1876 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1877 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.", 1878 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED); 1879 cf::NDI_RED);
1880 # we need this sleep as the login has a concurrent enter_exit running
1881 # and this sleep increases chances of the player not ending up in scorn
1774 Coro::Timer::sleep 1; 1882 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1883 $pl->ob->leave_link;
1776 })->prio (2); 1884 })->prio (2);
1777 } 1885 }
1778 }, 1886 },
1783=cut 1891=cut
1784 1892
1785sub cf::object::player::goto { 1893sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1894 my ($self, $path, $x, $y) = @_;
1787 1895
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1896 $self->enter_link;
1791 1897
1792 (async { 1898 (async {
1899 my $map = eval {
1793 my $map = cf::map::find $path->as_string; 1900 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1901 $map = $map->customise_for ($self) if $map;
1795 1902 $map
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1903 } or
1797# if $map;
1798
1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1904 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1800 1905
1801 $self->leave_link ($map, $x, $y); 1906 $self->leave_link ($map, $x, $y);
1802 })->prio (1); 1907 })->prio (1);
1803} 1908}
1804 1909
1808 1913
1809sub parse_random_map_params { 1914sub parse_random_map_params {
1810 my ($spec) = @_; 1915 my ($spec) = @_;
1811 1916
1812 my $rmp = { # defaults 1917 my $rmp = { # defaults
1813 xsize => 10, 1918 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1919 ysize => (cf::rndm 15, 40),
1920 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1921 #layout => string,
1815 }; 1922 };
1816 1923
1817 for (split /\n/, $spec) { 1924 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1925 my ($k, $v) = split /\s+/, $_, 2;
1819 1926
1823 $rmp 1930 $rmp
1824} 1931}
1825 1932
1826sub prepare_random_map { 1933sub prepare_random_map {
1827 my ($exit) = @_; 1934 my ($exit) = @_;
1935
1936 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1937
1829 # all this does is basically replace the /! path by 1938 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1939 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1940 # that depends on the exit object
1832 1941
1833 my $rmp = parse_random_map_params $exit->msg; 1942 my $rmp = parse_random_map_params $exit->msg;
1834 1943
1835 if ($exit->map) { 1944 if ($exit->map) {
1836 $rmp->{region} = $exit->map->region_name; 1945 $rmp->{region} = $exit->region->name;
1837 $rmp->{origin_map} = $exit->map->path; 1946 $rmp->{origin_map} = $exit->map->path;
1838 $rmp->{origin_x} = $exit->x; 1947 $rmp->{origin_x} = $exit->x;
1839 $rmp->{origin_y} = $exit->y; 1948 $rmp->{origin_y} = $exit->y;
1840 } 1949 }
1841 1950
1842 $rmp->{random_seed} ||= $exit->random_seed; 1951 $rmp->{random_seed} ||= $exit->random_seed;
1843 1952
1844 my $data = cf::to_json $rmp; 1953 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1954 my $md5 = Digest::MD5::md5_hex $data;
1955 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1956
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1957 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 1958 aio_write $fh, 0, (length $data), $data, 0;
1959 undef $fh;
1960 aio_rename "$meta~", $meta;
1849 1961
1850 $exit->slaying ("?random/$md5"); 1962 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1963 $exit->msg (undef);
1852 } 1964 }
1853} 1965}
1854 1966
1855sub cf::object::player::enter_exit { 1967sub cf::object::player::enter_exit {
1856 my ($self, $exit) = @_; 1968 my ($self, $exit) = @_;
1857 1969
1858 return unless $self->type == cf::PLAYER; 1970 return unless $self->type == cf::PLAYER;
1971
1972 if ($exit->slaying eq "/!") {
1973 #TODO: this should de-fi-ni-te-ly not be a sync-job
1974 cf::sync_job { prepare_random_map $exit };
1975 }
1976
1977 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978 my $hp = $exit->stats->hp;
1979 my $sp = $exit->stats->sp;
1859 1980
1860 $self->enter_link; 1981 $self->enter_link;
1861 1982
1862 (async { 1983 (async {
1863 $self->deactivate_recursive; # just to be sure 1984 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1985 unless (eval {
1865 prepare_random_map $exit 1986 $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 1987
1871 1; 1988 1;
1872 }) { 1989 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1990 $self->message ("Something went wrong deep within the crossfire server. "
1874 . "I'll try to bring you back to the map you were before. " 1991 . "I'll try to bring you back to the map you were before. "
1894 2011
1895sub cf::client::send_drawinfo { 2012sub cf::client::send_drawinfo {
1896 my ($self, $text, $flags) = @_; 2013 my ($self, $text, $flags) = @_;
1897 2014
1898 utf8::encode $text; 2015 utf8::encode $text;
1899 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1900} 2017}
1901 2018
1902 2019
1903=item $success = $client->query ($flags, "text", \&cb) 2020=item $success = $client->query ($flags, "text", \&cb)
1904 2021
1935 # get handled first 2052 # get handled first
1936 my $queue = delete $ns->{query_queue} 2053 my $queue = delete $ns->{query_queue}
1937 or return; # be conservative, not sure how that can happen, but we saw a crash here 2054 or return; # be conservative, not sure how that can happen, but we saw a crash here
1938 2055
1939 (shift @$queue)->[1]->($msg); 2056 (shift @$queue)->[1]->($msg);
2057 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1940 2058
1941 push @{ $ns->{query_queue} }, @$queue; 2059 push @{ $ns->{query_queue} }, @$queue;
1942 2060
1943 if (@{ $ns->{query_queue} } == @$queue) { 2061 if (@{ $ns->{query_queue} } == @$queue) {
1944 if (@$queue) { 2062 if (@$queue) {
2002 2120
2003# here we export the classes and methods available to script code 2121# here we export the classes and methods available to script code
2004 2122
2005=pod 2123=pod
2006 2124
2007The following fucntions and emthods are available within a safe environment: 2125The following functions and methods are available within a safe environment:
2008 2126
2009 cf::object contr pay_amount pay_player map 2127 cf::object contr pay_amount pay_player map
2010 cf::object::player player 2128 cf::object::player player
2011 cf::player peaceful 2129 cf::player peaceful
2012 cf::map trigger 2130 cf::map trigger
2105The parameter C<$family> should best start with the name of the extension 2223The parameter C<$family> should best start with the name of the extension
2106using it, it should be unique. 2224using it, it should be unique.
2107 2225
2108=over 4 2226=over 4
2109 2227
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 2228=item $value = cf::db_get $family => $key
2117 2229
2118Returns a single value from the database 2230Returns 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 2231
2125=item cf::db_put $family => $key => $value 2232=item cf::db_put $family => $key => $value
2126 2233
2127Stores the given C<$value> in the family hash. Updates are delayed, if you 2234Stores 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 2235
2138=cut 2236=cut
2139 2237
2140our $DB; 2238our $DB;
2141 2239
2142{ 2240sub db_init {
2241 unless ($DB) {
2242 $DB = BDB::db_create $DB_ENV;
2243
2244 cf::sync_job {
2245 eval {
2246 $DB->set_flags (BDB::CHKSUM);
2247
2248 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2249 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2250 cf::cleanup "db_open(db): $!" if $!;
2251 };
2252 cf::cleanup "db_open(db): $@" if $@;
2253 };
2254
2143 my $path = cf::localdir . "/database.pst"; 2255 my $path = cf::localdir . "/database.pst";
2256 if (stat $path) {
2257 cf::sync_job {
2258 my $pst = Storable::retrieve $path;
2144 2259
2145 sub db_load() { 2260 cf::db_put (board => data => $pst->{board});
2146 $DB = stat $path ? Storable::retrieve $path : { }; 2261 cf::db_put (guildrules => data => $pst->{guildrules});
2147 } 2262 cf::db_put (rent => balance => $pst->{rent}{balance});
2263 BDB::db_env_txn_checkpoint $DB_ENV;
2148 2264
2149 my $pid; 2265 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 } 2266 };
2159 } 2267 }
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 }); 2268 }
2269}
2171 2270
2172 sub db_dirty() {
2173 $dirty = 1;
2174 $idle->start;
2175 }
2176
2177 sub db_get($;$) { 2271sub db_get($$) {
2178 @_ >= 2 2272 my $key = "$_[0]/$_[1]";
2179 ? $DB->{$_[0]}{$_[1]}
2180 : ($DB->{$_[0]} ||= { })
2181 }
2182 2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
2183 sub db_put($$;$) { 2282sub db_put($$$) {
2184 if (@_ >= 3) { 2283 BDB::dbreq_pri 4;
2185 $DB->{$_[0]}{$_[1]} = $_[2]; 2284 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2285}
2286
2287#############################################################################
2288# the server's init and main functions
2289
2290sub load_facedata {
2291 my $path = sprintf "%s/facedata", cf::datadir;
2292
2293 warn "loading facedata from $path\n";
2294
2295 my $faces;
2296 0 < aio_load $path, $faces
2297 or die "$path: $!";
2298
2299 Coro::cede;
2300 $faces = Storable::thaw $faces;
2301 Coro::cede;
2302
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1
2305 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306
2307 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312 Coro::cede;
2313 }
2314
2315 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth};
2317 my $idx = cf::face::find $face
2318 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth;
2186 } else { 2321 } else {
2187 $DB->{$_[0]} = $_[1]; 2322 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 }, 2323 }
2197 ); 2324 Coro::cede;
2198} 2325 }
2199 2326
2200############################################################################# 2327 1
2201# the server's main() 2328}
2329
2330sub reload_resources {
2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2332 or die "unable to load regions file\n";#d#
2333 load_facedata
2334 or die "unable to load facedata\n";#d#
2335}
2336
2337sub init {
2338 reload_resources;
2339}
2202 2340
2203sub cfg_load { 2341sub cfg_load {
2204 open my $fh, "<:utf8", cf::confdir . "/config" 2342 open my $fh, "<:utf8", cf::confdir . "/config"
2205 or return; 2343 or return;
2206 2344
2223 2361
2224sub main { 2362sub main {
2225 # we must not ever block the main coroutine 2363 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2364 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2365 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2366 (async {
2228 async { Event::one_event }; 2367 Event::one_event;
2368 })->prio (Coro::PRIO_MAX);
2229 }; 2369 };
2230 2370
2231 cfg_load; 2371 cfg_load;
2232 db_load; 2372 db_init;
2233 load_extensions; 2373 load_extensions;
2374
2375 $TICK_WATCHER->start;
2234 Event::loop; 2376 Event::loop;
2235} 2377}
2236 2378
2237############################################################################# 2379#############################################################################
2238# initialisation and cleanup 2380# initialisation and cleanup
2239 2381
2240# install some emergency cleanup handlers 2382# install some emergency cleanup handlers
2241BEGIN { 2383BEGIN {
2242 for my $signal (qw(INT HUP TERM)) { 2384 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal ( 2385 Event->signal (
2386 reentrant => 0,
2244 data => WF_AUTOCANCEL, 2387 data => WF_AUTOCANCEL,
2245 signal => $signal, 2388 signal => $signal,
2389 prio => 0,
2246 cb => sub { 2390 cb => sub {
2247 cf::cleanup "SIG$signal"; 2391 cf::cleanup "SIG$signal";
2248 }, 2392 },
2249 ); 2393 );
2250 } 2394 }
2251} 2395}
2256 warn "enter emergency perl save\n"; 2400 warn "enter emergency perl save\n";
2257 2401
2258 cf::sync_job { 2402 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2403 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2404 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2405 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2406 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2407 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2408 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2409 $pl->valid or next;
2266 $pl->save; 2410 $pl->save;
2272 my $map = $cf::MAP{$path} or next; 2416 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next; 2417 $map->valid or next;
2274 $map->save; 2418 $map->save;
2275 } 2419 }
2276 warn "end emergency map save\n"; 2420 warn "end emergency map save\n";
2421
2422 warn "begin emergency database checkpoint\n";
2423 BDB::db_env_txn_checkpoint $DB_ENV;
2424 warn "end emergency database checkpoint\n";
2277 }; 2425 };
2278 2426
2279 warn "leave emergency perl save\n"; 2427 warn "leave emergency perl save\n";
2428}
2429
2430sub post_cleanup {
2431 my ($make_core) = @_;
2432
2433 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core;
2280} 2435}
2281 2436
2282sub reload() { 2437sub reload() {
2283 # can/must only be called in main 2438 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2439 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2440 warn "can only reload from main coroutine";
2286 return; 2441 return;
2287 } 2442 }
2288 2443
2289 warn "reloading..."; 2444 warn "reloading...";
2290 2445
2291 warn "freezing server"; 2446 warn "entering sync_job";
2292 my $guard = freeze_mainloop; 2447
2448 cf::sync_job {
2449 cf::write_runtime; # external watchdog should not bark
2293 cf::emergency_save; 2450 cf::emergency_save;
2451 cf::write_runtime; # external watchdog should not bark
2294 2452
2295 warn "sync database to disk"; 2453 warn "syncing database to disk";
2296 cf::db_sync; 2454 BDB::db_env_txn_checkpoint $DB_ENV;
2297 IO::AIO::flush;
2298 2455
2299 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 2456 # if anything goes wrong in here, we should simply crash as we already saved
2301 2457
2302 warn "cancel all watchers"; 2458 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2459 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2460 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2461 }
2306 2462
2463 warn "flushing outstanding aio requests";
2464 for (;;) {
2465 BDB::flush;
2466 IO::AIO::flush;
2467 Coro::cede;
2468 last unless IO::AIO::nreqs || BDB::nreqs;
2469 warn "iterate...";
2470 }
2471
2472 ++$RELOAD;
2473
2307 warn "cancel all extension coros"; 2474 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2475 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2476 %EXT_CORO = ();
2310 2477
2311 warn "remove commands"; 2478 warn "removing commands";
2312 %COMMAND = (); 2479 %COMMAND = ();
2313 2480
2314 warn "remove ext commands"; 2481 warn "removing ext commands";
2315 %EXTCMD = (); 2482 %EXTCMD = ();
2316 2483
2317 warn "unload/nuke all extensions"; 2484 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2485 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2486 warn "... unloading $pkg";
2320 2487
2321 if (my $cb = $pkg->can ("unload")) { 2488 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2489 eval {
2323 $cb->($pkg); 2490 $cb->($pkg);
2324 1 2491 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2492 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2493 }
2327 2494
2495 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2496 Symbol::delete_package $pkg;
2329 } 2497 }
2330 2498
2331 warn "unload all perl modules loaded from $LIBDIR"; 2499 warn "unloading all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2500 while (my ($k, $v) = each %INC) {
2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2501 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2334 2502
2335 warn "removing <$k>"; 2503 warn "... unloading $k";
2336 delete $INC{$k}; 2504 delete $INC{$k};
2337 2505
2338 $k =~ s/\.pm$//; 2506 $k =~ s/\.pm$//;
2339 $k =~ s/\//::/g; 2507 $k =~ s/\//::/g;
2340 2508
2343 } 2511 }
2344 2512
2345 Symbol::delete_package $k; 2513 Symbol::delete_package $k;
2346 } 2514 }
2347 2515
2348 warn "get rid of safe::, as good as possible"; 2516 warn "getting rid of safe::, as good as possible";
2349 Symbol::delete_package "safe::$_" 2517 Symbol::delete_package "safe::$_"
2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2518 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2351 2519
2352 warn "unload cf.pm \"a bit\""; 2520 warn "unloading cf.pm \"a bit\"";
2353 delete $INC{"cf.pm"}; 2521 delete $INC{"cf.pm"};
2354 2522
2355 # don't, removes xs symbols, too, 2523 # don't, removes xs symbols, too,
2356 # and global variables created in xs 2524 # and global variables created in xs
2357 #Symbol::delete_package __PACKAGE__; 2525 #Symbol::delete_package __PACKAGE__;
2358 2526
2527 warn "unload completed, starting to reload now";
2528
2359 warn "reloading cf.pm"; 2529 warn "reloading cf.pm";
2360 require cf; 2530 require cf;
2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2362 2532
2363 warn "load config and database again"; 2533 warn "loading config and database again";
2364 cf::cfg_load; 2534 cf::cfg_load;
2365 cf::db_load;
2366 2535
2367 warn "load extensions"; 2536 warn "loading extensions";
2368 cf::load_extensions; 2537 cf::load_extensions;
2369 2538
2370 warn "reattach attachments to objects/players"; 2539 warn "reattaching attachments to objects/players";
2371 _global_reattach; 2540 _global_reattach; # objects, sockets
2372 warn "reattach attachments to maps"; 2541 warn "reattaching attachments to maps";
2373 reattach $_ for values %MAP; 2542 reattach $_ for values %MAP;
2374 }; 2543 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER;
2375 2545
2376 if ($@) { 2546 warn "loading reloadable resources";
2547 reload_resources;
2548
2549 warn "leaving sync_job";
2550
2551 1
2552 } or do {
2377 warn $@; 2553 warn $@;
2378 warn "error while reloading, exiting."; 2554 warn "error while reloading, exiting.";
2379 exit 1; 2555 exit 1;
2380 } 2556 };
2381 2557
2382 warn "reloaded"; 2558 warn "reloaded";
2383}; 2559};
2384 2560
2385############################################################################# 2561our $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 2562
2428register_command "reload" => sub { 2563register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2564 my ($who, $arg) = @_;
2430 2565
2431 if ($who->flag (FLAG_WIZ)) { 2566 if ($who->flag (FLAG_WIZ)) {
2432 $who->message ("start of reload."); 2567 $who->message ("reloading server.");
2568
2569 # doing reload synchronously and two reloads happen back-to-back,
2570 # coro crashes during coro_state_free->destroy here.
2571
2572 $RELOAD_WATCHER ||= Event->timer (
2573 reentrant => 0,
2574 after => 0,
2575 data => WF_AUTOCANCEL,
2576 cb => sub {
2433 reload; 2577 reload;
2434 $who->message ("end of reload."); 2578 undef $RELOAD_WATCHER;
2579 },
2580 );
2435 } 2581 }
2436}; 2582};
2437 2583
2438unshift @INC, $LIBDIR; 2584unshift @INC, $LIBDIR;
2585
2586my $bug_warning = 0;
2439 2587
2440$TICK_WATCHER = Event->timer ( 2588$TICK_WATCHER = Event->timer (
2441 reentrant => 0, 2589 reentrant => 0,
2590 parked => 1,
2442 prio => 0, 2591 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2592 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2593 data => WF_AUTOCANCEL,
2445 cb => sub { 2594 cb => sub {
2595 if ($Coro::current != $Coro::main) {
2596 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2597 unless ++$bug_warning > 10;
2598 return;
2599 }
2600
2601 $NOW = Event::time;
2602
2446 cf::server_tick; # one server iteration 2603 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2604 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2605 $NEXT_TICK += $TICK;
2449 2606
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10;
2609 Coro::async_pool {
2610 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!";
2612 };
2613 }
2614
2450 $WAIT_FOR_TICK->broadcast; 2615 $WAIT_FOR_TICK->broadcast;
2451 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618# my $AFTER = Event::time;
2619# warn $AFTER - $NOW;#d#
2452 2620
2453 # if we are delayed by four ticks or more, skip them all 2621 # if we are delayed by four ticks or more, skip them all
2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2455 2623
2456 $TICK_WATCHER->at ($NEXT_TICK); 2624 $TICK_WATCHER->at ($NEXT_TICK);
2457 $TICK_WATCHER->start; 2625 $TICK_WATCHER->start;
2458 }, 2626 },
2459); 2627);
2460 2628
2629{
2461IO::AIO::max_poll_time $TICK * 0.2; 2630 BDB::max_poll_time $TICK * 0.1;
2462 2631 $BDB_POLL_WATCHER = Event->io (
2463Event->io ( 2632 reentrant => 0,
2464 fd => IO::AIO::poll_fileno, 2633 fd => BDB::poll_fileno,
2465 poll => 'r', 2634 poll => 'r',
2466 prio => 5, 2635 prio => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb,
2469);
2470
2471Event->timer (
2472 data => WF_AUTOCANCEL, 2636 data => WF_AUTOCANCEL,
2473 after => 0, 2637 cb => \&BDB::poll_cb,
2474 interval => 10, 2638 );
2475 cb => sub { 2639 BDB::min_parallel 8;
2476 (Coro::unblock_sub { 2640
2477 write_runtime 2641 BDB::set_sync_prepare {
2478 or warn "ERROR: unable to write runtime file: $!"; 2642 my $status;
2643 my $current = $Coro::current;
2644 (
2645 sub {
2646 $status = $!;
2647 $current->ready; undef $current;
2648 },
2649 sub {
2650 Coro::schedule while defined $current;
2651 $! = $status;
2652 },
2653 )
2654 };
2655
2656 unless ($DB_ENV) {
2657 $DB_ENV = BDB::db_env_create;
2658
2659 cf::sync_job {
2660 eval {
2661 BDB::db_env_open
2662 $DB_ENV,
2663 $BDB_ENV_DIR,
2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2666 0666;
2667
2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2669
2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2671 $DB_ENV->set_lk_detect;
2672 };
2673
2674 cf::cleanup "db_env_open(db): $@" if $@;
2479 })->(); 2675 };
2480 }, 2676 }
2481); 2677}
2678
2679{
2680 IO::AIO::min_parallel 8;
2681
2682 undef $Coro::AIO::WATCHER;
2683 IO::AIO::max_poll_time $TICK * 0.1;
2684 $AIO_POLL_WATCHER = Event->io (
2685 reentrant => 0,
2686 data => WF_AUTOCANCEL,
2687 fd => IO::AIO::poll_fileno,
2688 poll => 'r',
2689 prio => 6,
2690 cb => \&IO::AIO::poll_cb,
2691 );
2692}
2482 2693
2483END { cf::emergency_save } 2694END { cf::emergency_save }
2484 2695
24851 26961
2486 2697

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines