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.156 by root, Tue Jan 9 22:07:08 2007 UTC vs.
Revision 1.203 by root, Thu Feb 1 19:40:42 2007 UTC

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

Diff Legend

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