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.157 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.204 by root, Fri Feb 2 19:59:22 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
33 33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
44our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
45our $NEXT_TICK; 51our $NEXT_TICK;
46our $NOW; 52our $NOW;
53our $USE_FSYNC; # use fsync to write maps - default off
47 54
48our %CFG; 55our %CFG;
49 56
50our $UPTIME; $UPTIME ||= time; 57our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 58our $RUNTIME;
52 59
53our %PLAYER; # all users 60our %PLAYER; # all users
54our %MAP; # all maps 61our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 62our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 63our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions
58 64
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67
68# used to convert map paths into valid unix filenames by replacing / by ∕
69our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61 70
62binmode STDOUT; 71binmode STDOUT;
63binmode STDERR; 72binmode STDERR;
64 73
65# read virtual server time, if available 74# read virtual server time, if available
… …
73mkdir cf::localdir . "/" . cf::playerdir; 82mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 83mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 84mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 85mkdir $RANDOM_MAPS;
77 86
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 87our $EMERGENCY_POSITION;
88
89sub cf::map::normalise;
81 90
82############################################################################# 91#############################################################################
83 92
84=head2 GLOBAL VARIABLES 93=head2 GLOBAL VARIABLES
85 94
… …
156} 165}
157 166
158$Event::DIED = sub { 167$Event::DIED = sub {
159 warn "error in event callback: @_"; 168 warn "error in event callback: @_";
160}; 169};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 170
166=head2 UTILITY FUNCTIONS 171=head2 UTILITY FUNCTIONS
167 172
168=over 4 173=over 4
169 174
… …
257} 262}
258 263
259sub freeze_mainloop { 264sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 265 return unless $TICK_WATCHER->is_active;
261 266
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 267 my $guard = Coro::guard {
268 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 };
271 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 272 $TICK_WATCHER->stop;
264 $guard 273 $guard
265} 274}
266 275
267=item cf::async { BLOCK } 276=item cf::async { BLOCK }
… …
319 } 328 }
320} 329}
321 330
322=item $coro = cf::async_ext { BLOCK } 331=item $coro = cf::async_ext { BLOCK }
323 332
324Like async, but this coro is automcatially being canceled when the 333Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 334extension calling this is being unloaded.
326 335
327=cut 336=cut
328 337
329sub async_ext(&) { 338sub async_ext(&) {
… …
343 my $runtime = cf::localdir . "/runtime"; 352 my $runtime = cf::localdir . "/runtime";
344 353
345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
346 or return; 355 or return;
347 356
357 my $value = $cf::RUNTIME + 90 + 10;
348 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 358 # 10 is the runtime save interval, for a monotonic clock
359 # 60 allows for the watchdog to kill the server.
360
349 (aio_write $fh, 0, (length $value), $value, 0) <= 0 361 (aio_write $fh, 0, (length $value), $value, 0) <= 0
350 and return; 362 and return;
351 363
364 # always fsync - this file is important
352 aio_fsync $fh 365 aio_fsync $fh
353 and return; 366 and return;
354 367
355 close $fh 368 close $fh
356 or return; 369 or return;
… …
362} 375}
363 376
364=back 377=back
365 378
366=cut 379=cut
367
368#############################################################################
369
370package cf::path;
371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
375sub new {
376 my ($class, $path, $base) = @_;
377
378 $path = $path->as_string if ref $path;
379
380 my $self = bless { }, $class;
381
382 # {... are special paths that are not touched
383 # ?xxx/... are special absolute paths
384 # ?random/... random maps
385 # /! non-realised random map exit
386 # /... normal maps
387 # ~/... per-player maps without a specific player (DO NOT USE)
388 # ~user/... per-player map of a specific user
389
390 if ($path =~ /^{/) {
391 # fine as it is
392 } elsif ($path =~ s{^\?random/}{}) {
393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
394 $self->{random} = cf::from_json $data;
395 } else {
396 if ($path =~ s{^~([^/]+)?}{}) {
397 $self->{user_rel} = 1;
398
399 if (defined $1) {
400 $self->{user} = $1;
401 } elsif ($base =~ m{^~([^/]+)/}) {
402 $self->{user} = $1;
403 } else {
404 warn "cannot resolve user-relative path without user <$path,$base>\n";
405 }
406 } elsif ($path =~ /^\//) {
407 # already absolute
408 } else {
409 $base =~ s{[^/]+/?$}{};
410 return $class->new ("$base/$path");
411 }
412
413 for ($path) {
414 redo if s{/\.?/}{/};
415 redo if s{/[^/]+/\.\./}{/};
416 }
417 }
418
419 $self->{path} = $path;
420
421 $self
422}
423
424# the name / primary key / in-game path
425sub as_string {
426 my ($self) = @_;
427
428 $self->{user_rel} ? "~$self->{user}$self->{path}"
429 : $self->{random} ? "?random/$self->{path}"
430 : $self->{path}
431}
432
433# the displayed name, this is a one way mapping
434sub visible_name {
435 my ($self) = @_;
436
437# if (my $rmp = $self->{random}) {
438# # todo: be more intelligent about this
439# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
440# } else {
441 $self->as_string
442# }
443}
444
445# escape the /'s in the path
446sub _escaped_path {
447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
448 $path
449}
450
451# the original (read-only) location
452sub load_path {
453 my ($self) = @_;
454
455 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
456}
457
458# the temporary/swap location
459sub save_path {
460 my ($self) = @_;
461
462 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
463 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
464 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
465}
466
467# the unique path, might be eq to save_path
468sub uniq_path {
469 my ($self) = @_;
470
471 $self->{user_rel} || $self->{random}
472 ? undef
473 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
474}
475
476# return random map parameters, or undef
477sub random_map_params {
478 my ($self) = @_;
479
480 $self->{random}
481}
482
483# this is somewhat ugly, but style maps do need special treatment
484sub is_style_map {
485 $_[0]{path} =~ m{^/styles/}
486}
487
488package cf;
489 380
490############################################################################# 381#############################################################################
491 382
492=head2 ATTACHABLE OBJECTS 383=head2 ATTACHABLE OBJECTS
493 384
… …
619our @CB_TYPE = (); # registry for type (cf-object class) based events 510our @CB_TYPE = (); # registry for type (cf-object class) based events
620our @CB_MAP = (); 511our @CB_MAP = ();
621 512
622my %attachment; 513my %attachment;
623 514
515sub cf::attachable::thawer_merge {
516 # simply override everything except _meta
517 local $_[0]{_meta};
518 %{$_[0]} = %{$_[1]};
519}
520
624sub _attach_cb($$$$) { 521sub _attach_cb($$$$) {
625 my ($registry, $event, $prio, $cb) = @_; 522 my ($registry, $event, $prio, $cb) = @_;
626 523
627 use sort 'stable'; 524 use sort 'stable';
628 525
… …
799# object support 696# object support
800 697
801sub reattach { 698sub reattach {
802 # basically do the same as instantiate, without calling instantiate 699 # basically do the same as instantiate, without calling instantiate
803 my ($obj) = @_; 700 my ($obj) = @_;
701
702 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804 703
805 my $registry = $obj->registry; 704 my $registry = $obj->registry;
806 705
807 @$registry = (); 706 @$registry = ();
808 707
… …
855 $filename, length $$rdata, scalar @$objs; 754 $filename, length $$rdata, scalar @$objs;
856 755
857 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 756 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
858 chmod SAVE_MODE, $fh; 757 chmod SAVE_MODE, $fh;
859 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 758 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
860 aio_fsync $fh; 759 aio_fsync $fh if $cf::USE_FSYNC;
861 close $fh; 760 close $fh;
862 761
863 if (@$objs) { 762 if (@$objs) {
864 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
865 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
866 my $data = Storable::nfreeze { version => 1, objs => $objs }; 765 my $data = Storable::nfreeze { version => 1, objs => $objs };
867 aio_write $fh, 0, (length $data), $data, 0; 766 aio_write $fh, 0, (length $data), $data, 0;
868 aio_fsync $fh; 767 aio_fsync $fh if $cf::USE_FSYNC;
869 close $fh; 768 close $fh;
870 aio_rename "$filename.pst~", "$filename.pst"; 769 aio_rename "$filename.pst~", "$filename.pst";
871 } 770 }
872 } else { 771 } else {
873 aio_unlink "$filename.pst"; 772 aio_unlink "$filename.pst";
… …
879 } 778 }
880 } else { 779 } else {
881 aio_unlink $filename; 780 aio_unlink $filename;
882 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
883 } 782 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
884 } 789 }
885} 790}
886 791
887sub object_freezer_as_string { 792sub object_freezer_as_string {
888 my ($rdata, $objs) = @_; 793 my ($rdata, $objs) = @_;
… …
894 799
895sub object_thawer_load { 800sub object_thawer_load {
896 my ($filename) = @_; 801 my ($filename) = @_;
897 802
898 my ($data, $av); 803 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
899 807
900 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
901 or return; 809 or return;
902 810
903 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
940=cut 848=cut
941 849
942sub register_extcmd { 850sub register_extcmd {
943 my ($name, $cb) = @_; 851 my ($name, $cb) = @_;
944 852
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 853 $EXTCMD{$name} = $cb;
949} 854}
950 855
951cf::player->attach ( 856cf::player->attach (
952 on_command => sub { 857 on_command => sub {
953 my ($pl, $name, $params) = @_; 858 my ($pl, $name, $params) = @_;
… …
966 871
967 my $msg = eval { from_json $buf }; 872 my $msg = eval { from_json $buf };
968 873
969 if (ref $msg) { 874 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 875 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 876 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 877 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 878 }
974 } 879 }
975 } else { 880 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 881 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 883
979 cf::override; 884 cf::override;
980 }, 885 },
981); 886);
982 887
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 888sub load_extension {
990 my ($path) = @_; 889 my ($path) = @_;
991 890
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 892 my $base = $1;
994 my $pkg = $1; 893 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 894 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 895 $pkg = "ext::$pkg";
997 896
998 warn "loading '$path' into '$pkg'\n"; 897 warn "... loading '$path' into '$pkg'\n";
999 898
1000 open my $fh, "<:utf8", $path 899 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 900 or die "$path: $!";
1002 901
1003 my $source = 902 my $source =
1004 "package $pkg; use strict; use utf8;\n" 903 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 904 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 905 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 906 . "\n};\n1";
1008 907
1009 eval $source 908 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 909 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 910 : "extension disabled.\n";
1012 911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 912 warn $@;
1014 $ext_pkg{$base} = $pkg; 913 warn "mandatory extension failed to load, exiting.\n";
1015 914 exit 1;
1016# no strict 'refs'; 915 }
1017# @{"$pkg\::ISA"} = ext::; 916 die $@;
1018
1019 register $base, $pkg;
1020}
1021
1022sub unload_extension {
1023 my ($pkg) = @_;
1024
1025 warn "removing extension $pkg\n";
1026
1027 # remove hooks
1028 #TODO
1029# for my $idx (0 .. $#PLUGIN_EVENT) {
1030# delete $hook[$idx]{$pkg};
1031# } 917 }
1032 918
1033 # remove commands 919 push @EXTS, $pkg;
1034 for my $name (keys %COMMAND) {
1035 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1036
1037 if (@cb) {
1038 $COMMAND{$name} = \@cb;
1039 } else {
1040 delete $COMMAND{$name};
1041 }
1042 }
1043
1044 # remove extcmds
1045 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1046 delete $EXTCMD{$name};
1047 }
1048
1049 if (my $cb = $pkg->can ("unload")) {
1050 eval {
1051 $cb->($pkg);
1052 1
1053 } or warn "$pkg unloaded, but with errors: $@";
1054 }
1055
1056 Symbol::delete_package $pkg;
1057} 920}
1058 921
1059sub load_extensions { 922sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 923 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 924 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 928 } or warn "$ext not loaded: $@";
1066 } 929 }
1067} 930}
1068 931
1069############################################################################# 932#############################################################################
1070# load/save/clean perl data associated with a map
1071
1072*cf::mapsupport::on_clean = sub {
1073 my ($map) = @_;
1074
1075 my $path = $map->tmpname;
1076 defined $path or return;
1077
1078 unlink "$path.pst";
1079};
1080
1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1082
1083#############################################################################
1084 933
1085=head2 CORE EXTENSIONS 934=head2 CORE EXTENSIONS
1086 935
1087Functions and methods that extend core crossfire objects. 936Functions and methods that extend core crossfire objects.
1088 937
… …
1124 973
1125sub exists($) { 974sub exists($) {
1126 my ($login) = @_; 975 my ($login) = @_;
1127 976
1128 $cf::PLAYER{$login} 977 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login } 978 or cf::sync_job { !aio_stat path $login }
1130} 979}
1131 980
1132sub find($) { 981sub find($) {
1133 return $cf::PLAYER{$_[0]} || do { 982 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0]; 983 my $login = $_[0];
… …
1224 \@logins 1073 \@logins
1225} 1074}
1226 1075
1227=item $player->maps 1076=item $player->maps
1228 1077
1229Returns an arrayref of cf::path's of all maps that are private for this 1078Returns an arrayref of map paths that are private for this
1230player. May block. 1079player. May block.
1231 1080
1232=cut 1081=cut
1233 1082
1234sub maps($) { 1083sub maps($) {
1235 my ($pl) = @_; 1084 my ($pl) = @_;
1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1236 1087
1237 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1238 or return; 1089 or return;
1239 1090
1240 my @paths; 1091 my @paths;
1241 1092
1242 for (@$files) { 1093 for (@$files) {
1243 utf8::decode $_; 1094 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1096 next unless /^$PATH_SEP/o;
1246 1097
1247 s/$PATH_SEP/\//g; 1098 push @paths, cf::map::normalise "~$pl/$_";
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 } 1099 }
1250 1100
1251 \@paths 1101 \@paths
1252} 1102}
1253 1103
… …
1279package cf::map; 1129package cf::map;
1280 1130
1281use Fcntl; 1131use Fcntl;
1282use Coro::AIO; 1132use Coro::AIO;
1283 1133
1134use overload
1135 '""' => \&as_string,
1136 fallback => 1;
1137
1284our $MAX_RESET = 3600; 1138our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1139our $DEFAULT_RESET = 3000;
1286 1140
1287sub generate_random_map { 1141sub generate_random_map {
1288 my ($path, $rmp) = @_; 1142 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1143 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1144 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1145 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1146 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1147 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1148 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1149 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1150 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1151 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1152 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1153 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1154 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}) 1155 (cf::region::find $rmp->{region}), $rmp->{custom}
1156 )
1157}
1158
1159=item cf::map->register ($regex, $prio)
1160
1161Register a handler for the map path matching the given regex at the
1162givne priority (higher is better, built-in handlers have priority 0, the
1163default).
1164
1165=cut
1166
1167sub register {
1168 my (undef, $regex, $prio) = @_;
1169 my $pkg = caller;
1170
1171 no strict;
1172 push @{"$pkg\::ISA"}, __PACKAGE__;
1173
1174 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1175}
1176
1177# also paths starting with '/'
1178$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1179
1180sub thawer_merge {
1181 my ($self, $merge) = @_;
1182
1183 # we have to keep some variables in memory intact
1184 local $self->{path};
1185 local $self->{load_path};
1186 local $self->{deny_save};
1187 local $self->{deny_reset};
1188
1189 $self->SUPER::thawer_merge ($merge);
1190}
1191
1192sub normalise {
1193 my ($path, $base) = @_;
1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1198
1199 # map plan:
1200 #
1201 # /! non-realised random map exit (special hack!)
1202 # {... are special paths that are not being touched
1203 # ?xxx/... are special absolute paths
1204 # ?random/... random maps
1205 # /... normal maps
1206 # ~user/... per-player map of a specific user
1207
1208 $path =~ s/$PATH_SEP/\//go;
1209
1210 # treat it as relative path if it starts with
1211 # something that looks reasonable
1212 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1213 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1214
1215 $base =~ s{[^/]+/?$}{};
1216 $path = "$base/$path";
1217 }
1218
1219 for ($path) {
1220 redo if s{//}{/};
1221 redo if s{/\.?/}{/};
1222 redo if s{/[^/]+/\.\./}{/};
1223 }
1224
1225 $path
1226}
1227
1228sub new_from_path {
1229 my (undef, $path, $base) = @_;
1230
1231 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1232
1233 $path = normalise $path, $base;
1234
1235 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1236 if ($path =~ $EXT_MAP{$pkg}[1]) {
1237 my $self = bless cf::map::new, $pkg;
1238 $self->{path} = $path; $self->path ($path);
1239 $self->init; # pass $1 etc.
1240 return $self;
1241 }
1242 }
1243
1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1245 ()
1246}
1247
1248sub init {
1249 my ($self) = @_;
1250
1251 $self
1252}
1253
1254sub as_string {
1255 my ($self) = @_;
1256
1257 "$self->{path}"
1258}
1259
1260# the displayed name, this is a one way mapping
1261sub visible_name {
1262 &as_string
1263}
1264
1265# the original (read-only) location
1266sub load_path {
1267 my ($self) = @_;
1268
1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1270}
1271
1272# the temporary/swap location
1273sub save_path {
1274 my ($self) = @_;
1275
1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1278}
1279
1280# the unique path, undef == no special unique path
1281sub uniq_path {
1282 my ($self) = @_;
1283
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304} 1286}
1305 1287
1306# and all this just because we cannot iterate over 1288# and all this just because we cannot iterate over
1307# all maps in C++... 1289# all maps in C++...
1308sub change_all_map_light { 1290sub change_all_map_light {
… …
1310 1292
1311 $_->change_map_light ($change) 1293 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1294 for grep $_->outdoor, values %cf::MAP;
1313} 1295}
1314 1296
1297sub unlink_save {
1298 my ($self) = @_;
1299
1300 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308}
1309
1315sub try_load_header($) { 1310sub load_header_from($) {
1316 my ($path) = @_; 1311 my ($self, $path) = @_;
1317 1312
1318 utf8::encode $path; 1313 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1314 #aio_open $path, O_RDONLY, 0
1315 # or return;
1316
1317 $self->_load_header ($path)
1320 or return; 1318 or return;
1321 1319
1322 my $map = cf::map::new 1320 $self->{load_path} = $path;
1321
1322 1
1323}
1324
1325sub load_header_orig {
1326 my ($self) = @_;
1327
1328 $self->load_header_from ($self->load_path)
1329}
1330
1331sub load_header_temp {
1332 my ($self) = @_;
1333
1334 $self->load_header_from ($self->save_path)
1335}
1336
1337sub prepare_temp {
1338 my ($self) = @_;
1339
1340 $self->last_access ((delete $self->{last_access})
1341 || $cf::RUNTIME); #d#
1342 # safety
1343 $self->{instantiate_time} = $cf::RUNTIME
1344 if $self->{instantiate_time} > $cf::RUNTIME;
1345}
1346
1347sub prepare_orig {
1348 my ($self) = @_;
1349
1350 $self->{load_original} = 1;
1351 $self->{instantiate_time} = $cf::RUNTIME;
1352 $self->last_access ($cf::RUNTIME);
1353 $self->instantiate;
1354}
1355
1356sub load_header {
1357 my ($self) = @_;
1358
1359 if ($self->load_header_temp) {
1360 $self->prepare_temp;
1361 } else {
1362 $self->load_header_orig
1323 or return; 1363 or return;
1364 $self->prepare_orig;
1365 }
1324 1366
1325 # for better error messages only, will be overwritten 1367 1
1326 $map->path ($path);
1327
1328 $map->load_header ($path)
1329 or return;
1330
1331 $map->{load_path} = $path;
1332
1333 $map
1334} 1368}
1335 1369
1336sub find; 1370sub find;
1337sub find { 1371sub find {
1338 my ($path, $origin) = @_; 1372 my ($path, $origin) = @_;
1339 1373
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1374 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1375
1345 cf::lock_wait "map_find:$key"; 1376 cf::lock_wait "map_find:$path";
1346 1377
1347 $cf::MAP{$key} || do { 1378 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1379 my $guard = cf::lock_acquire "map_find:$path";
1349 1380 my $map = new_from_path cf::map $path
1350 # do it the slow way
1351 my $map = try_load_header $path->save_path;
1352
1353 Coro::cede;
1354
1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1358 # safety
1359 $map->{instantiate_time} = $cf::RUNTIME
1360 if $map->{instantiate_time} > $cf::RUNTIME;
1361 } else {
1362 if (my $rmp = $path->random_map_params) {
1363 $map = generate_random_map $key, $rmp;
1364 } else {
1365 $map = try_load_header $path->load_path;
1366 }
1367
1368 $map or return; 1381 or return;
1369 1382
1370 $map->{load_original} = 1;
1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1373 $map->instantiate;
1374
1375 # per-player maps become, after loading, normal maps
1376 $map->per_player (0) if $path->{user_rel};
1377 }
1378
1379 $map->path ($key);
1380 $map->{path} = $path;
1381 $map->{last_save} = $cf::RUNTIME; 1383 $map->{last_save} = $cf::RUNTIME;
1382 1384
1383 Coro::cede; 1385 $map->load_header
1386 or return;
1384 1387
1385 if ($map->should_reset) { 1388 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1389 # doing this can freeze the server in a sync job, obviously
1390 #$cf::WAIT_FOR_TICK->wait;
1386 $map->reset; 1391 $map->reset;
1387 undef $guard; 1392 undef $guard;
1388 $map = find $path 1393 return find $path;
1389 or return;
1390 } 1394 }
1391 1395
1392 $cf::MAP{$key} = $map 1396 $cf::MAP{$path} = $map
1393 } 1397 }
1394} 1398}
1399
1400sub pre_load { }
1401sub post_load { }
1395 1402
1396sub load { 1403sub load {
1397 my ($self) = @_; 1404 my ($self) = @_;
1398 1405
1406 local $self->{deny_reset} = 1; # loading can take a long time
1407
1399 my $path = $self->{path}; 1408 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1409 my $guard = cf::lock_acquire "map_load:$path";
1401 1410
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1411 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1412
1404 $self->in_memory (cf::MAP_LOADING); 1413 $self->in_memory (cf::MAP_LOADING);
1405 1414
1406 $self->alloc; 1415 $self->alloc;
1416
1417 $self->pre_load;
1418
1407 $self->load_objects ($self->{load_path}, 1) 1419 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1420 or return;
1409 1421
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1423 if delete $self->{load_original};
1412 1424
1413 if (my $uniq = $path->uniq_path) { 1425 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1426 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1428 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1429 $self->_load_objects ($uniq, 0);
1418 } 1430 }
1419 } 1431 }
1420 1432
1421 Coro::cede; 1433 Coro::cede;
1422 1434
1423 # now do the right thing for maps 1435 # now do the right thing for maps
1424 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1425 1437
1426 if ($self->{path}->is_style_map) { 1438 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1439 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1440 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1441 $self->update_buttons;
1442 Coro::cede;
1433 $self->set_darkness_map; 1443 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1444 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1445 unless $self->difficulty;
1446 Coro::cede;
1436 $self->activate; 1447 $self->activate;
1437 } 1448 }
1438 1449
1439 Coro::cede; 1450 $self->post_load;
1440 1451
1441 $self->in_memory (cf::MAP_IN_MEMORY); 1452 $self->in_memory (cf::MAP_IN_MEMORY);
1453}
1454
1455sub customise_for {
1456 my ($self, $ob) = @_;
1457
1458 return find "~" . $ob->name . "/" . $self->{path}
1459 if $self->per_player;
1460
1461 $self
1442} 1462}
1443 1463
1444# find and load all maps in the 3x3 area around a map 1464# find and load all maps in the 3x3 area around a map
1445sub load_diag { 1465sub load_diag {
1446 my ($map) = @_; 1466 my ($map) = @_;
… …
1476 1496
1477 cf::sync_job { $map->load }; 1497 cf::sync_job { $map->load };
1478} 1498}
1479 1499
1480our %MAP_PREFETCH; 1500our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async { 1501our $MAP_PREFETCHER = undef;
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1490 $map->load;
1491 }
1492 Coro::schedule;
1493 }
1494};
1495 1502
1496sub find_async { 1503sub find_async {
1497 my ($path, $origin) = @_; 1504 my ($path, $origin) = @_;
1498 1505
1499 $path = new cf::path $path, $origin && $origin->path; 1506 $path = normalise $path, $origin && $origin->{path};
1500 my $key = $path->as_string;
1501 1507
1502 if (my $map = $cf::MAP{$key}) { 1508 if (my $map = $cf::MAP{$path}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1509 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 } 1510 }
1505 1511
1506 $MAP_PREFETCH{$key} = $path; 1512 undef $MAP_PREFETCH{$path};
1513 $MAP_PREFETCHER ||= cf::async {
1514 while (%MAP_PREFETCH) {
1515 for my $path (keys %MAP_PREFETCH) {
1516 my $map = find $path
1517 or next;
1518 $map->load;
1519
1520 delete $MAP_PREFETCH{$path};
1521 }
1522 }
1523 undef $MAP_PREFETCHER;
1524 };
1507 $MAP_PREFETCHER->ready; 1525 $MAP_PREFETCHER->prio (6);
1508 1526
1509 () 1527 ()
1510} 1528}
1511 1529
1512sub save { 1530sub save {
… …
1516 1534
1517 $self->{last_save} = $cf::RUNTIME; 1535 $self->{last_save} = $cf::RUNTIME;
1518 1536
1519 return unless $self->dirty; 1537 return unless $self->dirty;
1520 1538
1521 my $save = $self->{path}->save_path; utf8::encode $save; 1539 my $save = $self->save_path; utf8::encode $save;
1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1540 my $uniq = $self->uniq_path; utf8::encode $uniq;
1523 1541
1524 $self->{load_path} = $save; 1542 $self->{load_path} = $save;
1525 1543
1526 return if $self->{deny_save}; 1544 return if $self->{deny_save};
1527 1545
… …
1530 cf::async { 1548 cf::async {
1531 $_->contr->save for $self->players; 1549 $_->contr->save for $self->players;
1532 }; 1550 };
1533 1551
1534 if ($uniq) { 1552 if ($uniq) {
1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1553 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536 $self->save_objects ($uniq, cf::IO_UNIQUES); 1554 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1537 } else { 1555 } else {
1538 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1556 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1539 } 1557 }
1540} 1558}
1541 1559
1542sub swap_out { 1560sub swap_out {
1543 my ($self) = @_; 1561 my ($self) = @_;
… …
1557 1575
1558sub reset_at { 1576sub reset_at {
1559 my ($self) = @_; 1577 my ($self) = @_;
1560 1578
1561 # TODO: safety, remove and allow resettable per-player maps 1579 # TODO: safety, remove and allow resettable per-player maps
1562 return 1e99 if $self->{path}{user_rel}; 1580 return 1e99 if $self->isa ("ext::map_per_player");#d#
1563 return 1e99 if $self->{deny_reset}; 1581 return 1e99 if $self->{deny_reset};
1564 1582
1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1583 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1584 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1567 1585
… …
1572 my ($self) = @_; 1590 my ($self) = @_;
1573 1591
1574 $self->reset_at <= $cf::RUNTIME 1592 $self->reset_at <= $cf::RUNTIME
1575} 1593}
1576 1594
1577sub unlink_save {
1578 my ($self) = @_;
1579
1580 utf8::encode (my $save = $self->{path}->save_path);
1581 aioreq_pri 3; IO::AIO::aio_unlink $save;
1582 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1583}
1584
1585sub rename {
1586 my ($self, $new_path) = @_;
1587
1588 $self->unlink_save;
1589
1590 delete $cf::MAP{$self->path};
1591 $self->{path} = new cf::path $new_path;
1592 $self->path ($self->{path}->as_string);
1593 $cf::MAP{$self->path} = $self;
1594
1595 $self->save;
1596}
1597
1598sub reset { 1595sub reset {
1599 my ($self) = @_; 1596 my ($self) = @_;
1600 1597
1601 my $lock = cf::lock_acquire "map_data:" . $self->path; 1598 my $lock = cf::lock_acquire "map_data:$self->{path}";
1602 1599
1603 return if $self->players; 1600 return if $self->players;
1604 return if $self->{path}{user_rel};#d# 1601 return if $self->isa ("ext::map_per_player");#d#
1605 1602
1606 warn "resetting map ", $self->path;#d# 1603 warn "resetting map ", $self->path;#d#
1607 1604
1608 delete $cf::MAP{$self->path}; 1605 delete $cf::MAP{$self->path};
1606
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear;
1609 1609
1610 $_->clear_links_to ($self) for values %cf::MAP; 1610 $_->clear_links_to ($self) for values %cf::MAP;
1611 1611
1612 $self->unlink_save; 1612 $self->unlink_save;
1613 $self->destroy; 1613 $self->destroy;
… …
1616my $nuke_counter = "aaaa"; 1616my $nuke_counter = "aaaa";
1617 1617
1618sub nuke { 1618sub nuke {
1619 my ($self) = @_; 1619 my ($self) = @_;
1620 1620
1621 delete $cf::MAP{$self->path};
1622
1623 $self->unlink_save;
1624
1625 bless $self, "cf::map";
1626 delete $self->{deny_reset};
1621 $self->{deny_save} = 1; 1627 $self->{deny_save} = 1;
1622 $self->reset_timeout (1); 1628 $self->reset_timeout (1);
1623 $self->rename ("{nuke}/" . ($nuke_counter++)); 1629 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1630
1631 $cf::MAP{$self->path} = $self;
1632
1624 $self->reset; # polite request, might not happen 1633 $self->reset; # polite request, might not happen
1625} 1634}
1626 1635
1627sub customise_for { 1636=item cf::map::unique_maps
1628 my ($map, $ob) = @_;
1629 1637
1630 if ($map->per_player) { 1638Returns an arrayref of paths of all shared maps that have
1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1639instantiated unique items. May block.
1632 }
1633 1640
1634 $map 1641=cut
1642
1643sub unique_maps() {
1644 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1645 or return;
1646
1647 my @paths;
1648
1649 for (@$files) {
1650 utf8::decode $_;
1651 next if /\.pst$/;
1652 next unless /^$PATH_SEP/o;
1653
1654 push @paths, cf::map::normalise $_;
1655 }
1656
1657 \@paths
1635} 1658}
1636 1659
1637package cf; 1660package cf;
1638 1661
1639=back 1662=back
… …
1711 1734
1712=item $player_object->enter_link 1735=item $player_object->enter_link
1713 1736
1714Freezes the player and moves him/her to a special map (C<{link}>). 1737Freezes the player and moves him/her to a special map (C<{link}>).
1715 1738
1716The player should be reaosnably safe there for short amounts of time. You 1739The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1740I<MUST> call C<leave_link> as soon as possible, though.
1718 1741
1742Will never block.
1743
1719=item $player_object->leave_link ($map, $x, $y) 1744=item $player_object->leave_link ($map, $x, $y)
1720 1745
1721Moves the player out of the specila link map onto the given map. If the 1746Moves the player out of the special C<{link}> map onto the specified
1722map is not valid (or omitted), the player will be moved back to the 1747map. If the map is not valid (or omitted), the player will be moved back
1723location he/she was before the call to C<enter_link>, or, if that fails, 1748to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1749fails, to the emergency map position.
1725 1750
1726Might block. 1751Might block.
1727 1752
1728=cut 1753=cut
1754
1755sub link_map {
1756 unless ($LINK_MAP) {
1757 $LINK_MAP = cf::map::find "{link}"
1758 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1759 $LINK_MAP->load;
1760 }
1761
1762 $LINK_MAP
1763}
1729 1764
1730sub cf::object::player::enter_link { 1765sub cf::object::player::enter_link {
1731 my ($self) = @_; 1766 my ($self) = @_;
1732 1767
1733 $self->deactivate_recursive; 1768 $self->deactivate_recursive;
1734 1769
1735 return if $self->map == $LINK_MAP; 1770 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1771
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1773 if $self->map;
1739 1774
1740 $self->enter_map ($LINK_MAP, 20, 20); 1775 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1776}
1742 1777
1743sub cf::object::player::leave_link { 1778sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1779 my ($self, $map, $x, $y) = @_;
1745 1780
… …
1809=cut 1844=cut
1810 1845
1811sub cf::object::player::goto { 1846sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1847 my ($self, $path, $x, $y) = @_;
1813 1848
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1817 $self->enter_link; 1849 $self->enter_link;
1818 1850
1819 (async { 1851 (async {
1852 my $map = eval {
1820 my $map = cf::map::find $path->as_string; 1853 my $map = cf::map::find $path;
1821 $map = $map->customise_for ($self) if $map; 1854 $map = $map->customise_for ($self) if $map;
1822 1855 $map
1823# warn "entering ", $map->path, " at ($x, $y)\n" 1856 } or
1824# if $map;
1825
1826 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1857 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1827 1858
1828 $self->leave_link ($map, $x, $y); 1859 $self->leave_link ($map, $x, $y);
1829 })->prio (1); 1860 })->prio (1);
1830} 1861}
1831 1862
… …
1835 1866
1836sub parse_random_map_params { 1867sub parse_random_map_params {
1837 my ($spec) = @_; 1868 my ($spec) = @_;
1838 1869
1839 my $rmp = { # defaults 1870 my $rmp = { # defaults
1840 xsize => 10, 1871 xsize => (cf::rndm 15, 40),
1841 ysize => 10, 1872 ysize => (cf::rndm 15, 40),
1873 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1874 #layout => string,
1842 }; 1875 };
1843 1876
1844 for (split /\n/, $spec) { 1877 for (split /\n/, $spec) {
1845 my ($k, $v) = split /\s+/, $_, 2; 1878 my ($k, $v) = split /\s+/, $_, 2;
1846 1879
… …
1850 $rmp 1883 $rmp
1851} 1884}
1852 1885
1853sub prepare_random_map { 1886sub prepare_random_map {
1854 my ($exit) = @_; 1887 my ($exit) = @_;
1888
1889 my $guard = cf::lock_acquire "exit_prepare:$exit";
1855 1890
1856 # all this does is basically replace the /! path by 1891 # all this does is basically replace the /! path by
1857 # a new random map path (?random/...) with a seed 1892 # a new random map path (?random/...) with a seed
1858 # that depends on the exit object 1893 # that depends on the exit object
1859 1894
1860 my $rmp = parse_random_map_params $exit->msg; 1895 my $rmp = parse_random_map_params $exit->msg;
1861 1896
1862 if ($exit->map) { 1897 if ($exit->map) {
1863 $rmp->{region} = $exit->map->region_name; 1898 $rmp->{region} = $exit->region->name;
1864 $rmp->{origin_map} = $exit->map->path; 1899 $rmp->{origin_map} = $exit->map->path;
1865 $rmp->{origin_x} = $exit->x; 1900 $rmp->{origin_x} = $exit->x;
1866 $rmp->{origin_y} = $exit->y; 1901 $rmp->{origin_y} = $exit->y;
1867 } 1902 }
1868 1903
1869 $rmp->{random_seed} ||= $exit->random_seed; 1904 $rmp->{random_seed} ||= $exit->random_seed;
1870 1905
1871 my $data = cf::to_json $rmp; 1906 my $data = cf::to_json $rmp;
1872 my $md5 = Digest::MD5::md5_hex $data; 1907 my $md5 = Digest::MD5::md5_hex $data;
1908 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1873 1909
1874 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1910 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1875 aio_write $fh, 0, (length $data), $data, 0; 1911 aio_write $fh, 0, (length $data), $data, 0;
1912 undef $fh;
1913 aio_rename "$meta~", $meta;
1876 1914
1877 $exit->slaying ("?random/$md5"); 1915 $exit->slaying ("?random/$md5");
1878 $exit->msg (undef); 1916 $exit->msg (undef);
1879 } 1917 }
1880} 1918}
1881 1919
1882sub cf::object::player::enter_exit { 1920sub cf::object::player::enter_exit {
1883 my ($self, $exit) = @_; 1921 my ($self, $exit) = @_;
1884 1922
1885 return unless $self->type == cf::PLAYER; 1923 return unless $self->type == cf::PLAYER;
1924
1925 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job
1927 cf::sync_job { prepare_random_map $exit };
1928 }
1929
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp;
1932 my $sp = $exit->stats->sp;
1886 1933
1887 $self->enter_link; 1934 $self->enter_link;
1888 1935
1889 (async { 1936 (async {
1890 $self->deactivate_recursive; # just to be sure 1937 $self->deactivate_recursive; # just to be sure
1891 unless (eval { 1938 unless (eval {
1892 prepare_random_map $exit 1939 $self->goto ($slaying, $hp, $sp);
1893 if $exit->slaying eq "/!";
1894
1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1897 1940
1898 1; 1941 1;
1899 }) { 1942 }) {
1900 $self->message ("Something went wrong deep within the crossfire server. " 1943 $self->message ("Something went wrong deep within the crossfire server. "
1901 . "I'll try to bring you back to the map you were before. " 1944 . "I'll try to bring you back to the map you were before. "
1902 . "Please report this to the dungeon master", 1945 . "Please report this to the dungeon master!",
1903 cf::NDI_UNIQUE | cf::NDI_RED); 1946 cf::NDI_UNIQUE | cf::NDI_RED);
1904 1947
1905 warn "ERROR in enter_exit: $@"; 1948 warn "ERROR in enter_exit: $@";
1906 $self->leave_link; 1949 $self->leave_link;
1907 } 1950 }
… …
1962 # get handled first 2005 # get handled first
1963 my $queue = delete $ns->{query_queue} 2006 my $queue = delete $ns->{query_queue}
1964 or return; # be conservative, not sure how that can happen, but we saw a crash here 2007 or return; # be conservative, not sure how that can happen, but we saw a crash here
1965 2008
1966 (shift @$queue)->[1]->($msg); 2009 (shift @$queue)->[1]->($msg);
2010 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1967 2011
1968 push @{ $ns->{query_queue} }, @$queue; 2012 push @{ $ns->{query_queue} }, @$queue;
1969 2013
1970 if (@{ $ns->{query_queue} } == @$queue) { 2014 if (@{ $ns->{query_queue} } == @$queue) {
1971 if (@$queue) { 2015 if (@$queue) {
… …
2190 sub db_sync() { 2234 sub db_sync() {
2191 db_save if $dirty; 2235 db_save if $dirty;
2192 undef $dirty; 2236 undef $dirty;
2193 } 2237 }
2194 2238
2195 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2239 my $idle = Event->idle (
2196 db_sync; 2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2197 }); 2246 );
2198 2247
2199 sub db_dirty() { 2248 sub db_dirty() {
2200 $dirty = 1; 2249 $dirty = 1;
2201 $idle->start; 2250 $idle->start;
2202 } 2251 }
… …
2223 }, 2272 },
2224 ); 2273 );
2225} 2274}
2226 2275
2227############################################################################# 2276#############################################################################
2228# the server's main() 2277# the server's init and main functions
2278
2279sub load_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d#
2282}
2229 2283
2230sub cfg_load { 2284sub cfg_load {
2231 open my $fh, "<:utf8", cf::confdir . "/config" 2285 open my $fh, "<:utf8", cf::confdir . "/config"
2232 or return; 2286 or return;
2233 2287
… …
2246 }; 2300 };
2247 warn $@ if $@; 2301 warn $@ if $@;
2248 } 2302 }
2249} 2303}
2250 2304
2305sub init {
2306 load_resources;
2307}
2308
2251sub main { 2309sub main {
2252 # we must not ever block the main coroutine 2310 # we must not ever block the main coroutine
2253 local $Coro::idle = sub { 2311 local $Coro::idle = sub {
2254 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2312 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2313 (async {
2255 async { Event::one_event }; 2314 Event::one_event;
2315 })->prio (Coro::PRIO_MAX);
2256 }; 2316 };
2257 2317
2258 cfg_load; 2318 cfg_load;
2259 db_load; 2319 db_load;
2260 load_extensions; 2320 load_extensions;
2321
2322 $TICK_WATCHER->start;
2261 Event::loop; 2323 Event::loop;
2262} 2324}
2263 2325
2264############################################################################# 2326#############################################################################
2265# initialisation and cleanup 2327# initialisation and cleanup
2266 2328
2267# install some emergency cleanup handlers 2329# install some emergency cleanup handlers
2268BEGIN { 2330BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2331 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2332 Event->signal (
2333 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2334 data => WF_AUTOCANCEL,
2272 signal => $signal, 2335 signal => $signal,
2336 prio => 0,
2273 cb => sub { 2337 cb => sub {
2274 cf::cleanup "SIG$signal"; 2338 cf::cleanup "SIG$signal";
2275 }, 2339 },
2276 ); 2340 );
2277 } 2341 }
2278} 2342}
… …
2283 warn "enter emergency perl save\n"; 2347 warn "enter emergency perl save\n";
2284 2348
2285 cf::sync_job { 2349 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl 2350 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players 2351 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously. 2352 # and maps saved/destroyed asynchronously.
2289 warn "begin emergency player save\n"; 2353 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) { 2354 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next; 2355 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next; 2356 $pl->valid or next;
2293 $pl->save; 2357 $pl->save;
… …
2307} 2371}
2308 2372
2309sub reload() { 2373sub reload() {
2310 # can/must only be called in main 2374 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2375 if ($Coro::current != $Coro::main) {
2312 warn "can only reload from main coroutine\n"; 2376 warn "can only reload from main coroutine";
2313 return; 2377 return;
2314 } 2378 }
2315 2379
2316 warn "reloading..."; 2380 warn "reloading...";
2317 2381
2318 my $guard = freeze_mainloop; 2382 warn "cancelling server ticker";
2383 $TICK_WATCHER->cancel;
2384
2319 cf::emergency_save; 2385 cf::emergency_save;
2320 2386
2321 eval { 2387 eval {
2322 # if anything goes wrong in here, we should simply crash as we already saved 2388 # if anything goes wrong in here, we should simply crash as we already saved
2323 2389
2324 # cancel all watchers 2390 warn "syncing database to disk";
2391 cf::db_sync;
2392
2393 warn "cancelling all WF_AUTOCANCEL watchers";
2325 for (Event::all_watchers) { 2394 for (Event::all_watchers) {
2326 $_->cancel if $_->data & WF_AUTOCANCEL; 2395 $_->cancel if $_->data & WF_AUTOCANCEL;
2327 } 2396 }
2328 2397
2398 warn "flushing outstanding aio requests";
2399 for (;;) {
2400 IO::AIO::flush;
2401 Coro::cede;
2402 last unless IO::AIO::nreqs;
2403 warn "iterate...";
2404 }
2405
2329 # cancel all extension coros 2406 warn "cancelling all extension coros";
2330 $_->cancel for values %EXT_CORO; 2407 $_->cancel for values %EXT_CORO;
2331 %EXT_CORO = (); 2408 %EXT_CORO = ();
2332 2409
2333 # unload all extensions 2410 warn "removing commands";
2334 for (@exts) { 2411 %COMMAND = ();
2412
2413 warn "removing ext commands";
2414 %EXTCMD = ();
2415
2416 warn "unloading/nuking all extensions";
2417 for my $pkg (@EXTS) {
2335 warn "unloading <$_>"; 2418 warn "... unloading $pkg";
2336 unload_extension $_; 2419
2420 if (my $cb = $pkg->can ("unload")) {
2421 eval {
2422 $cb->($pkg);
2423 1
2424 } or warn "$pkg unloaded, but with errors: $@";
2337 } 2425 }
2338 2426
2427 warn "... nuking $pkg";
2428 Symbol::delete_package $pkg;
2429 }
2430
2339 # unload all modules loaded from $LIBDIR 2431 warn "unloading all perl modules loaded from $LIBDIR";
2340 while (my ($k, $v) = each %INC) { 2432 while (my ($k, $v) = each %INC) {
2341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2433 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342 2434
2343 warn "removing <$k>"; 2435 warn "... unloading $k";
2344 delete $INC{$k}; 2436 delete $INC{$k};
2345 2437
2346 $k =~ s/\.pm$//; 2438 $k =~ s/\.pm$//;
2347 $k =~ s/\//::/g; 2439 $k =~ s/\//::/g;
2348 2440
… …
2351 } 2443 }
2352 2444
2353 Symbol::delete_package $k; 2445 Symbol::delete_package $k;
2354 } 2446 }
2355 2447
2356 # sync database to disk
2357 cf::db_sync;
2358 IO::AIO::flush;
2359
2360 # get rid of safe::, as good as possible 2448 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2449 Symbol::delete_package "safe::$_"
2362 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2450 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363 2451
2364 # remove register_script_function callbacks
2365 # TODO
2366
2367 # unload cf.pm "a bit" 2452 warn "unloading cf.pm \"a bit\"";
2368 delete $INC{"cf.pm"}; 2453 delete $INC{"cf.pm"};
2369 2454
2370 # don't, removes xs symbols, too, 2455 # don't, removes xs symbols, too,
2371 # and global variables created in xs 2456 # and global variables created in xs
2372 #Symbol::delete_package __PACKAGE__; 2457 #Symbol::delete_package __PACKAGE__;
2373 2458
2374 # reload cf.pm 2459 warn "unload completed, starting to reload now";
2460
2375 warn "reloading cf.pm"; 2461 warn "reloading cf.pm";
2376 require cf; 2462 require cf;
2377 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2378 2464
2379 # load config and database again 2465 warn "loading config and database again";
2380 cf::cfg_load; 2466 cf::cfg_load;
2381 cf::db_load; 2467 cf::db_load;
2382 2468
2383 # load extensions
2384 warn "load extensions"; 2469 warn "loading extensions";
2385 cf::load_extensions; 2470 cf::load_extensions;
2386 2471
2387 # reattach attachments to objects 2472 warn "reattaching attachments to objects/players";
2388 warn "reattach";
2389 _global_reattach; 2473 _global_reattach;
2474 warn "reattaching attachments to maps";
2390 reattach $_ for values %MAP; 2475 reattach $_ for values %MAP;
2476
2477 warn "loading reloadable resources";
2478 load_resources;
2479
2480 warn "restarting server ticker";
2481
2482 $TICK_WATCHER->start;
2391 }; 2483 };
2392 2484
2393 if ($@) { 2485 if ($@) {
2394 warn $@; 2486 warn $@;
2395 warn "error while reloading, exiting."; 2487 warn "error while reloading, exiting.";
2396 exit 1; 2488 exit 1;
2397 } 2489 }
2398 2490
2399 warn "reloaded successfully"; 2491 warn "reloaded";
2400}; 2492};
2401 2493
2402############################################################################# 2494our $RELOAD_WATCHER; # used only during reload
2403
2404unless ($LINK_MAP) {
2405 $LINK_MAP = cf::map::new;
2406
2407 $LINK_MAP->width (41);
2408 $LINK_MAP->height (41);
2409 $LINK_MAP->alloc;
2410 $LINK_MAP->path ("{link}");
2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2413
2414 # dirty hack because... archetypes are not yet loaded
2415 Event->timer (
2416 after => 10,
2417 cb => sub {
2418 $_[0]->w->cancel;
2419
2420 # provide some exits "home"
2421 my $exit = cf::object::new "exit";
2422
2423 $exit->slaying ($EMERGENCY_POSITION->[0]);
2424 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2425 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2426
2427 $LINK_MAP->insert ($exit->clone, 19, 19);
2428 $LINK_MAP->insert ($exit->clone, 19, 20);
2429 $LINK_MAP->insert ($exit->clone, 19, 21);
2430 $LINK_MAP->insert ($exit->clone, 20, 19);
2431 $LINK_MAP->insert ($exit->clone, 20, 21);
2432 $LINK_MAP->insert ($exit->clone, 21, 19);
2433 $LINK_MAP->insert ($exit->clone, 21, 20);
2434 $LINK_MAP->insert ($exit->clone, 21, 21);
2435
2436 $exit->destroy;
2437 });
2438
2439 $LINK_MAP->{deny_save} = 1;
2440 $LINK_MAP->{deny_reset} = 1;
2441
2442 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2443}
2444
2445register "<global>", __PACKAGE__;
2446 2495
2447register_command "reload" => sub { 2496register_command "reload" => sub {
2448 my ($who, $arg) = @_; 2497 my ($who, $arg) = @_;
2449 2498
2450 if ($who->flag (FLAG_WIZ)) { 2499 if ($who->flag (FLAG_WIZ)) {
2451 $who->message ("start of reload."); 2500 $who->message ("reloading server.");
2501
2502 # doing reload synchronously and two reloads happen back-to-back,
2503 # coro crashes during coro_state_free->destroy here.
2504
2505 $RELOAD_WATCHER ||= Event->timer (
2506 reentrant => 0,
2507 after => 0,
2508 data => WF_AUTOCANCEL,
2509 cb => sub {
2452 reload; 2510 reload;
2453 $who->message ("end of reload."); 2511 undef $RELOAD_WATCHER;
2512 },
2513 );
2454 } 2514 }
2455}; 2515};
2456 2516
2457unshift @INC, $LIBDIR; 2517unshift @INC, $LIBDIR;
2518
2519my $bug_warning = 0;
2458 2520
2459$TICK_WATCHER = Event->timer ( 2521$TICK_WATCHER = Event->timer (
2460 reentrant => 0, 2522 reentrant => 0,
2523 parked => 1,
2461 prio => 0, 2524 prio => 0,
2462 at => $NEXT_TICK || $TICK, 2525 at => $NEXT_TICK || $TICK,
2463 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2464 cb => sub { 2527 cb => sub {
2528 if ($Coro::current != $Coro::main) {
2529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2530 unless ++$bug_warning > 10;
2531 return;
2532 }
2533
2534 $NOW = Event::time;
2535
2465 cf::server_tick; # one server iteration 2536 cf::server_tick; # one server iteration
2466 $RUNTIME += $TICK; 2537 $RUNTIME += $TICK;
2467 $NEXT_TICK += $TICK; 2538 $NEXT_TICK += $TICK;
2468 2539
2469 $WAIT_FOR_TICK->broadcast; 2540 $WAIT_FOR_TICK->broadcast;
2470 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2542
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d#
2471 2548
2472 # if we are delayed by four ticks or more, skip them all 2549 # if we are delayed by four ticks or more, skip them all
2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2474 2551
2475 $TICK_WATCHER->at ($NEXT_TICK); 2552 $TICK_WATCHER->at ($NEXT_TICK);
2476 $TICK_WATCHER->start; 2553 $TICK_WATCHER->start;
2477 }, 2554 },
2478); 2555);
2479 2556
2480IO::AIO::max_poll_time $TICK * 0.2; 2557IO::AIO::max_poll_time $TICK * 0.1;
2481 2558
2482Event->io ( 2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0,
2483 fd => IO::AIO::poll_fileno, 2562 fd => IO::AIO::poll_fileno,
2484 poll => 'r', 2563 poll => 'r',
2485 prio => 5, 2564 prio => 6,
2486 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2487 cb => \&IO::AIO::poll_cb, 2566 cb => \&IO::AIO::poll_cb,
2488); 2567);
2489 2568
2490Event->timer ( 2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2491 data => WF_AUTOCANCEL, 2571 data => WF_AUTOCANCEL,
2492 after => 0, 2572 after => 1,
2493 interval => 10, 2573 interval => 10,
2494 cb => sub { 2574 prio => 6, # keep it lowest so it acts like a watchdog
2495 (Coro::unblock_sub { 2575 cb => Coro::unblock_sub {
2496 write_runtime 2576 write_runtime
2497 or warn "ERROR: unable to write runtime file: $!"; 2577 or warn "ERROR: unable to write runtime file: $!";
2498 })->();
2499 }, 2578 },
2500); 2579);
2501 2580
2502END { cf::emergency_save } 2581END { cf::emergency_save }
2503 2582

Diff Legend

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