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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines