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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines