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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines