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.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.202 by root, Mon Jan 29 20:16:28 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
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378sub new {
379 my ($class, $path, $base) = @_;
380
381 $path = $path->as_string if ref $path;
382
383 my $self = bless { }, $class;
384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else {
401 if ($path =~ s{^~([^/]+)?}{}) {
402 $self->{user_rel} = 1;
403
404 if (defined $1) {
405 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1;
408 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 }
411 } elsif ($path =~ /^\//) {
412 # already absolute
413 } else {
414 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path");
416 }
417
418 for ($path) {
419 redo if s{/\.?/}{/};
420 redo if s{/[^/]+/\.\./}{/};
421 }
422 }
423
424 $self->{path} = $path;
425
426 $self
427}
428
429# the name / primary key / in-game path
430sub as_string {
431 my ($self) = @_;
432
433 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}"
435 : $self->{path}
436}
437
438# the displayed name, this is a one way mapping
439sub visible_name {
440 my ($self) = @_;
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448}
449
450# escape the /'s in the path
451sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453 $path
454}
455
456# the original (read-only) location
457sub load_path {
458 my ($self) = @_;
459
460 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461}
462
463# the temporary/swap location
464sub save_path {
465 my ($self) = @_;
466
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470}
471
472# the unique path, might be eq to save_path
473sub uniq_path {
474 my ($self) = @_;
475
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486}
487
488# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map {
490 $_[0]{path} =~ m{^/styles/}
491}
492
493package cf;
494 378
495############################################################################# 379#############################################################################
496 380
497=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
498 382
624our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
625our @CB_MAP = (); 509our @CB_MAP = ();
626 510
627my %attachment; 511my %attachment;
628 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
629sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
630 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
631 521
632 use sort 'stable'; 522 use sort 'stable';
633 523
804# object support 694# object support
805 695
806sub reattach { 696sub reattach {
807 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
808 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
809 701
810 my $registry = $obj->registry; 702 my $registry = $obj->registry;
811 703
812 @$registry = (); 704 @$registry = ();
813 705
884 } 776 }
885 } else { 777 } else {
886 aio_unlink $filename; 778 aio_unlink $filename;
887 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
888 } 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 }
889 } 787 }
890} 788}
891 789
892sub object_freezer_as_string { 790sub object_freezer_as_string {
893 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
899 797
900sub object_thawer_load { 798sub object_thawer_load {
901 my ($filename) = @_; 799 my ($filename) = @_;
902 800
903 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$//;
904 805
905 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
906 or return; 807 or return;
907 808
908 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
945=cut 846=cut
946 847
947sub register_extcmd { 848sub register_extcmd {
948 my ($name, $cb) = @_; 849 my ($name, $cb) = @_;
949 850
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 851 $EXTCMD{$name} = $cb;
954} 852}
955 853
956cf::player->attach ( 854cf::player->attach (
957 on_command => sub { 855 on_command => sub {
958 my ($pl, $name, $params) = @_; 856 my ($pl, $name, $params) = @_;
971 869
972 my $msg = eval { from_json $buf }; 870 my $msg = eval { from_json $buf };
973 871
974 if (ref $msg) { 872 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 873 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 874 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 875 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 876 }
979 } 877 }
980 } else { 878 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 879 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
983 881
984 cf::override; 882 cf::override;
985 }, 883 },
986); 884);
987 885
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 886sub load_extension {
995 my ($path) = @_; 887 my ($path) = @_;
996 888
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 889 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 890 my $base = $1;
999 my $pkg = $1; 891 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 892 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 893 $pkg = "ext::$pkg";
1002 894
1003 warn "loading '$path' into '$pkg'\n"; 895 warn "... loading '$path' into '$pkg'\n";
1004 896
1005 open my $fh, "<:utf8", $path 897 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 898 or die "$path: $!";
1007 899
1008 my $source = 900 my $source =
1009 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 904 . "\n};\n1";
1013 905
1014 eval $source 906 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 908 : "extension disabled.\n";
1017 909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 910 warn $@;
1019 $ext_pkg{$base} = $pkg; 911 warn "mandatory extension failed to load, exiting.\n";
1020 912 exit 1;
1021# no strict 'refs'; 913 }
1022# @{"$pkg\::ISA"} = ext::; 914 die $@;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# } 915 }
1037 916
1038 # remove commands 917 push @EXTS, $pkg;
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 918}
1063 919
1064sub load_extensions { 920sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 921 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 922 next unless -r $ext;
1070 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1071 } 927 }
1072} 928}
1073 929
1074############################################################################# 930#############################################################################
1075# load/save/clean perl data associated with a map
1076
1077*cf::mapsupport::on_clean = sub {
1078 my ($map) = @_;
1079
1080 my $path = $map->tmpname;
1081 defined $path or return;
1082
1083 unlink "$path.pst";
1084};
1085
1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088#############################################################################
1089 931
1090=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1091 933
1092Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1093 935
1129 971
1130sub exists($) { 972sub exists($) {
1131 my ($login) = @_; 973 my ($login) = @_;
1132 974
1133 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1135} 977}
1136 978
1137sub find($) { 979sub find($) {
1138 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0]; 981 my $login = $_[0];
1229 \@logins 1071 \@logins
1230} 1072}
1231 1073
1232=item $player->maps 1074=item $player->maps
1233 1075
1234Returns 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
1235player. May block. 1077player. May block.
1236 1078
1237=cut 1079=cut
1238 1080
1239sub maps($) { 1081sub maps($) {
1240 my ($pl) = @_; 1082 my ($pl) = @_;
1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1241 1085
1242 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1243 or return; 1087 or return;
1244 1088
1245 my @paths; 1089 my @paths;
1247 for (@$files) { 1091 for (@$files) {
1248 utf8::decode $_; 1092 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1251 1095
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1096 push @paths, cf::map::normalise "~$pl/$_";
1253 } 1097 }
1254 1098
1255 \@paths 1099 \@paths
1256} 1100}
1257 1101
1283package cf::map; 1127package cf::map;
1284 1128
1285use Fcntl; 1129use Fcntl;
1286use Coro::AIO; 1130use Coro::AIO;
1287 1131
1132use overload
1133 '""' => \&as_string,
1134 fallback => 1;
1135
1288our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1290 1138
1291sub generate_random_map { 1139sub generate_random_map {
1292 my ($path, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1293
1294 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1142 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1146 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1147 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1148 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1149 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1150 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $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},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (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
1308} 1284}
1309 1285
1310# and all this just because we cannot iterate over 1286# and all this just because we cannot iterate over
1311# all maps in C++... 1287# all maps in C++...
1312sub change_all_map_light { 1288sub change_all_map_light {
1314 1290
1315 $_->change_map_light ($change) 1291 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1292 for grep $_->outdoor, values %cf::MAP;
1317} 1293}
1318 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
1319sub try_load_header($) { 1308sub load_header_from($) {
1320 my ($path) = @_; 1309 my ($self, $path) = @_;
1321 1310
1322 utf8::encode $path; 1311 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1313 # or return;
1314
1315 $self->_load_header ($path)
1324 or return; 1316 or return;
1325 1317
1326 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
1327 or return; 1361 or return;
1362 $self->prepare_orig;
1363 }
1328 1364
1329 # for better error messages only, will be overwritten 1365 1
1330 $map->path ($path);
1331
1332 $map->load_header ($path)
1333 or return;
1334
1335 $map->{load_path} = $path;
1336
1337 $map
1338} 1366}
1339 1367
1340sub find; 1368sub find;
1341sub find { 1369sub find {
1342 my ($path, $origin) = @_; 1370 my ($path, $origin) = @_;
1343 1371
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1372 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1373
1349 cf::lock_wait "map_find:$key"; 1374 cf::lock_wait "map_find:$path";
1350 1375
1351 $cf::MAP{$key} || do { 1376 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1377 my $guard = cf::lock_acquire "map_find:$path";
1353 1378 my $map = new_from_path cf::map $path
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1379 or return;
1373 1380
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1386 1382
1387 Coro::cede; 1383 $map->load_header
1384 or return;
1388 1385
1389 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;
1390 $map->reset; 1389 $map->reset;
1391 undef $guard; 1390 undef $guard;
1392 $map = find $path 1391 return find $path;
1393 or return;
1394 } 1392 }
1395 1393
1396 $cf::MAP{$key} = $map 1394 $cf::MAP{$path} = $map
1397 } 1395 }
1398} 1396}
1397
1398sub pre_load { }
1399sub post_load { }
1399 1400
1400sub load { 1401sub load {
1401 my ($self) = @_; 1402 my ($self) = @_;
1402 1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1405
1403 my $path = $self->{path}; 1406 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1407 my $guard = cf::lock_acquire "map_load:$path";
1405 1408
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1410
1408 $self->in_memory (cf::MAP_LOADING); 1411 $self->in_memory (cf::MAP_LOADING);
1409 1412
1410 $self->alloc; 1413 $self->alloc;
1414
1415 $self->pre_load;
1416
1411 $self->load_objects ($self->{load_path}, 1) 1417 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1418 or return;
1413 1419
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1421 if delete $self->{load_original};
1416 1422
1417 if (my $uniq = $path->uniq_path) { 1423 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1424 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1425 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1426 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1427 $self->_load_objects ($uniq, 0);
1422 } 1428 }
1423 } 1429 }
1424 1430
1425 Coro::cede; 1431 Coro::cede;
1426 1432
1427 # now do the right thing for maps 1433 # now do the right thing for maps
1428 $self->link_multipart_objects; 1434 $self->link_multipart_objects;
1429 1435
1430 if ($self->{path}->is_style_map) { 1436 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1437 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1438 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1439 $self->update_buttons;
1440 Coro::cede;
1437 $self->set_darkness_map; 1441 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1442 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1443 unless $self->difficulty;
1444 Coro::cede;
1440 $self->activate; 1445 $self->activate;
1441 } 1446 }
1442 1447
1443 Coro::cede; 1448 $self->post_load;
1444 1449
1445 $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
1446} 1460}
1447 1461
1448# find and load all maps in the 3x3 area around a map 1462# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1463sub load_diag {
1450 my ($map) = @_; 1464 my ($map) = @_;
1480 1494
1481 cf::sync_job { $map->load }; 1495 cf::sync_job { $map->load };
1482} 1496}
1483 1497
1484our %MAP_PREFETCH; 1498our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1499our $MAP_PREFETCHER = undef;
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495 }
1496 Coro::schedule;
1497 }
1498};
1499 1500
1500sub find_async { 1501sub find_async {
1501 my ($path, $origin) = @_; 1502 my ($path, $origin) = @_;
1502 1503
1503 $path = new cf::path $path, $origin && $origin->path; 1504 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1505
1506 if (my $map = $cf::MAP{$key}) { 1506 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1508 }
1509 1509
1510 $MAP_PREFETCH{$key} = $path; 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 };
1511 $MAP_PREFETCHER->ready; 1523 $MAP_PREFETCHER->prio (6);
1512 1524
1513 () 1525 ()
1514} 1526}
1515 1527
1516sub save { 1528sub save {
1520 1532
1521 $self->{last_save} = $cf::RUNTIME; 1533 $self->{last_save} = $cf::RUNTIME;
1522 1534
1523 return unless $self->dirty; 1535 return unless $self->dirty;
1524 1536
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1537 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1538 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1539
1528 $self->{load_path} = $save; 1540 $self->{load_path} = $save;
1529 1541
1530 return if $self->{deny_save}; 1542 return if $self->{deny_save};
1531 1543
1534 cf::async { 1546 cf::async {
1535 $_->contr->save for $self->players; 1547 $_->contr->save for $self->players;
1536 }; 1548 };
1537 1549
1538 if ($uniq) { 1550 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1551 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1552 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1553 } else {
1542 $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);
1543 } 1555 }
1544} 1556}
1545 1557
1546sub swap_out { 1558sub swap_out {
1547 my ($self) = @_; 1559 my ($self) = @_;
1561 1573
1562sub reset_at { 1574sub reset_at {
1563 my ($self) = @_; 1575 my ($self) = @_;
1564 1576
1565 # TODO: safety, remove and allow resettable per-player maps 1577 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1578 return 1e99 if $self->isa ("ext::map_per_player");#d#
1567 return 1e99 if $self->{deny_reset}; 1579 return 1e99 if $self->{deny_reset};
1568 1580
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1581 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 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;
1571 1583
1576 my ($self) = @_; 1588 my ($self) = @_;
1577 1589
1578 $self->reset_at <= $cf::RUNTIME 1590 $self->reset_at <= $cf::RUNTIME
1579} 1591}
1580 1592
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename {
1590 my ($self, $new_path) = @_;
1591
1592 $self->unlink_save;
1593
1594 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path;
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self;
1598
1599 $self->save;
1600}
1601
1602sub reset { 1593sub reset {
1603 my ($self) = @_; 1594 my ($self) = @_;
1604 1595
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1596 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1597
1607 return if $self->players; 1598 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1599 return if $self->isa ("ext::map_per_player");#d#
1609 1600
1610 warn "resetting map ", $self->path;#d# 1601 warn "resetting map ", $self->path;#d#
1611 1602
1612 delete $cf::MAP{$self->path}; 1603 delete $cf::MAP{$self->path};
1604
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear;
1613 1607
1614 $_->clear_links_to ($self) for values %cf::MAP; 1608 $_->clear_links_to ($self) for values %cf::MAP;
1615 1609
1616 $self->unlink_save; 1610 $self->unlink_save;
1617 $self->destroy; 1611 $self->destroy;
1620my $nuke_counter = "aaaa"; 1614my $nuke_counter = "aaaa";
1621 1615
1622sub nuke { 1616sub nuke {
1623 my ($self) = @_; 1617 my ($self) = @_;
1624 1618
1619 delete $cf::MAP{$self->path};
1620
1621 $self->unlink_save;
1622
1623 bless $self, "cf::map";
1624 delete $self->{deny_reset};
1625 $self->{deny_save} = 1; 1625 $self->{deny_save} = 1;
1626 $self->reset_timeout (1); 1626 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1627 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1628
1629 $cf::MAP{$self->path} = $self;
1630
1628 $self->reset; # polite request, might not happen 1631 $self->reset; # polite request, might not happen
1629} 1632}
1630 1633
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps 1634=item cf::map::unique_maps
1642 1635
1643Returns an arrayref of cf::path's of all shared maps that have 1636Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1637instantiated unique items. May block.
1645 1638
1646=cut 1639=cut
1647 1640
1648sub unique_maps() { 1641sub unique_maps() {
1654 for (@$files) { 1647 for (@$files) {
1655 utf8::decode $_; 1648 utf8::decode $_;
1656 next if /\.pst$/; 1649 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1658 1651
1659 push @paths, new cf::path $_; 1652 push @paths, cf::map::normalise $_;
1660 } 1653 }
1661 1654
1662 \@paths 1655 \@paths
1663} 1656}
1664 1657
1739 1732
1740=item $player_object->enter_link 1733=item $player_object->enter_link
1741 1734
1742Freezes 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}>).
1743 1736
1744The 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
1745I<MUST> call C<leave_link> as soon as possible, though. 1738I<MUST> call C<leave_link> as soon as possible, though.
1746 1739
1740Will never block.
1741
1747=item $player_object->leave_link ($map, $x, $y) 1742=item $player_object->leave_link ($map, $x, $y)
1748 1743
1749Moves 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
1750map 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
1751location 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
1752to the emergency map position. 1747fails, to the emergency map position.
1753 1748
1754Might block. 1749Might block.
1755 1750
1756=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}
1757 1762
1758sub cf::object::player::enter_link { 1763sub cf::object::player::enter_link {
1759 my ($self) = @_; 1764 my ($self) = @_;
1760 1765
1761 $self->deactivate_recursive; 1766 $self->deactivate_recursive;
1762 1767
1763 return if $self->map == $LINK_MAP; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1769
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1771 if $self->map;
1767 1772
1768 $self->enter_map ($LINK_MAP, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1769} 1774}
1770 1775
1771sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1773 1778
1837=cut 1842=cut
1838 1843
1839sub cf::object::player::goto { 1844sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1841 1846
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1847 $self->enter_link;
1845 1848
1846 (async { 1849 (async {
1850 my $map = eval {
1847 my $map = cf::map::find $path->as_string; 1851 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1849 1853 $map
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1851# if $map;
1852
1853 $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);
1854 1856
1855 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1856 })->prio (1); 1858 })->prio (1);
1857} 1859}
1858 1860
1862 1864
1863sub parse_random_map_params { 1865sub parse_random_map_params {
1864 my ($spec) = @_; 1866 my ($spec) = @_;
1865 1867
1866 my $rmp = { # defaults 1868 my $rmp = { # defaults
1867 xsize => 10, 1869 xsize => (cf::rndm 15, 40),
1868 ysize => 10, 1870 ysize => (cf::rndm 15, 40),
1871 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1872 #layout => string,
1869 }; 1873 };
1870 1874
1871 for (split /\n/, $spec) { 1875 for (split /\n/, $spec) {
1872 my ($k, $v) = split /\s+/, $_, 2; 1876 my ($k, $v) = split /\s+/, $_, 2;
1873 1877
1877 $rmp 1881 $rmp
1878} 1882}
1879 1883
1880sub prepare_random_map { 1884sub prepare_random_map {
1881 my ($exit) = @_; 1885 my ($exit) = @_;
1886
1887 my $guard = cf::lock_acquire "exit_prepare:$exit";
1882 1888
1883 # all this does is basically replace the /! path by 1889 # all this does is basically replace the /! path by
1884 # a new random map path (?random/...) with a seed 1890 # a new random map path (?random/...) with a seed
1885 # that depends on the exit object 1891 # that depends on the exit object
1886 1892
1887 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1888 1894
1889 if ($exit->map) { 1895 if ($exit->map) {
1890 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1891 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1892 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1893 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1894 } 1900 }
1895 1901
1896 $rmp->{random_seed} ||= $exit->random_seed; 1902 $rmp->{random_seed} ||= $exit->random_seed;
1897 1903
1898 my $data = cf::to_json $rmp; 1904 my $data = cf::to_json $rmp;
1899 my $md5 = Digest::MD5::md5_hex $data; 1905 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1900 1907
1901 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) {
1902 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;
1903 1912
1904 $exit->slaying ("?random/$md5"); 1913 $exit->slaying ("?random/$md5");
1905 $exit->msg (undef); 1914 $exit->msg (undef);
1906 } 1915 }
1907} 1916}
1908 1917
1909sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1910 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1911 1920
1912 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;
1913 1931
1914 $self->enter_link; 1932 $self->enter_link;
1915 1933
1916 (async { 1934 (async {
1917 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1936 unless (eval {
1919 prepare_random_map $exit 1937 $self->goto ($slaying, $hp, $sp);
1920 if $exit->slaying eq "/!";
1921
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1938
1925 1; 1939 1;
1926 }) { 1940 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1928 . "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. "
1989 # get handled first 2003 # get handled first
1990 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1991 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
1992 2006
1993 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1994 2009
1995 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1996 2011
1997 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1998 if (@$queue) { 2013 if (@$queue) {
2217 sub db_sync() { 2232 sub db_sync() {
2218 db_save if $dirty; 2233 db_save if $dirty;
2219 undef $dirty; 2234 undef $dirty;
2220 } 2235 }
2221 2236
2222 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2223 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2224 }); 2244 );
2225 2245
2226 sub db_dirty() { 2246 sub db_dirty() {
2227 $dirty = 1; 2247 $dirty = 1;
2228 $idle->start; 2248 $idle->start;
2229 } 2249 }
2277 2297
2278sub main { 2298sub main {
2279 # we must not ever block the main coroutine 2299 # we must not ever block the main coroutine
2280 local $Coro::idle = sub { 2300 local $Coro::idle = sub {
2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2301 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2302 (async {
2282 async { Event::one_event }; 2303 Event::one_event;
2304 })->prio (Coro::PRIO_MAX);
2283 }; 2305 };
2284 2306
2285 cfg_load; 2307 cfg_load;
2286 db_load; 2308 db_load;
2287 load_extensions; 2309 load_extensions;
2310
2311 $TICK_WATCHER->start;
2288 Event::loop; 2312 Event::loop;
2289} 2313}
2290 2314
2291############################################################################# 2315#############################################################################
2292# initialisation and cleanup 2316# initialisation and cleanup
2293 2317
2294# install some emergency cleanup handlers 2318# install some emergency cleanup handlers
2295BEGIN { 2319BEGIN {
2296 for my $signal (qw(INT HUP TERM)) { 2320 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal ( 2321 Event->signal (
2322 reentrant => 0,
2298 data => WF_AUTOCANCEL, 2323 data => WF_AUTOCANCEL,
2299 signal => $signal, 2324 signal => $signal,
2325 prio => 0,
2300 cb => sub { 2326 cb => sub {
2301 cf::cleanup "SIG$signal"; 2327 cf::cleanup "SIG$signal";
2302 }, 2328 },
2303 ); 2329 );
2304 } 2330 }
2305} 2331}
2310 warn "enter emergency perl save\n"; 2336 warn "enter emergency perl save\n";
2311 2337
2312 cf::sync_job { 2338 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2339 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2340 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2341 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2342 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2343 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2344 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2345 $pl->valid or next;
2320 $pl->save; 2346 $pl->save;
2334} 2360}
2335 2361
2336sub reload() { 2362sub reload() {
2337 # can/must only be called in main 2363 # can/must only be called in main
2338 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
2339 warn "can only reload from main coroutine\n"; 2365 warn "can only reload from main coroutine";
2340 return; 2366 return;
2341 } 2367 }
2342 2368
2343 warn "reloading..."; 2369 warn "reloading...";
2344 2370
2345 my $guard = freeze_mainloop; 2371 warn "cancelling server ticker";
2372 $TICK_WATCHER->cancel;
2373
2346 cf::emergency_save; 2374 cf::emergency_save;
2347 2375
2348 eval { 2376 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2377 # if anything goes wrong in here, we should simply crash as we already saved
2350 2378
2351 # cancel all watchers 2379 warn "syncing database to disk";
2380 cf::db_sync;
2381
2382 warn "cancelling all WF_AUTOCANCEL watchers";
2352 for (Event::all_watchers) { 2383 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2384 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2385 }
2355 2386
2387 warn "flushing outstanding aio requests";
2388 for (;;) {
2389 IO::AIO::flush;
2390 Coro::cede;
2391 last unless IO::AIO::nreqs;
2392 warn "iterate...";
2393 }
2394
2356 # cancel all extension coros 2395 warn "cancelling all extension coros";
2357 $_->cancel for values %EXT_CORO; 2396 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2397 %EXT_CORO = ();
2359 2398
2360 # unload all extensions 2399 warn "removing commands";
2361 for (@exts) { 2400 %COMMAND = ();
2401
2402 warn "removing ext commands";
2403 %EXTCMD = ();
2404
2405 warn "unloading/nuking all extensions";
2406 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2407 warn "... unloading $pkg";
2363 unload_extension $_; 2408
2409 if (my $cb = $pkg->can ("unload")) {
2410 eval {
2411 $cb->($pkg);
2412 1
2413 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2414 }
2365 2415
2416 warn "... nuking $pkg";
2417 Symbol::delete_package $pkg;
2418 }
2419
2366 # unload all modules loaded from $LIBDIR 2420 warn "unloading all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2421 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2422 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2423
2370 warn "removing <$k>"; 2424 warn "... unloading $k";
2371 delete $INC{$k}; 2425 delete $INC{$k};
2372 2426
2373 $k =~ s/\.pm$//; 2427 $k =~ s/\.pm$//;
2374 $k =~ s/\//::/g; 2428 $k =~ s/\//::/g;
2375 2429
2378 } 2432 }
2379 2433
2380 Symbol::delete_package $k; 2434 Symbol::delete_package $k;
2381 } 2435 }
2382 2436
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2437 warn "getting rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2438 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2439 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2440
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2441 warn "unloading cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2442 delete $INC{"cf.pm"};
2396 2443
2397 # don't, removes xs symbols, too, 2444 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2445 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2446 #Symbol::delete_package __PACKAGE__;
2400 2447
2401 # reload cf.pm 2448 warn "unload completed, starting to reload now";
2449
2402 warn "reloading cf.pm"; 2450 warn "reloading cf.pm";
2403 require cf; 2451 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2452 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2453
2406 # load config and database again 2454 warn "loading config and database again";
2407 cf::cfg_load; 2455 cf::cfg_load;
2408 cf::db_load; 2456 cf::db_load;
2409 2457
2410 # load extensions
2411 warn "load extensions"; 2458 warn "loading extensions";
2412 cf::load_extensions; 2459 cf::load_extensions;
2413 2460
2414 # reattach attachments to objects 2461 warn "reattaching attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2462 _global_reattach;
2463 warn "reattaching attachments to maps";
2417 reattach $_ for values %MAP; 2464 reattach $_ for values %MAP;
2465
2466 warn "restarting server ticker";
2467
2468 $TICK_WATCHER->start;
2418 }; 2469 };
2419 2470
2420 if ($@) { 2471 if ($@) {
2421 warn $@; 2472 warn $@;
2422 warn "error while reloading, exiting."; 2473 warn "error while reloading, exiting.";
2423 exit 1; 2474 exit 1;
2424 } 2475 }
2425 2476
2426 warn "reloaded successfully"; 2477 warn "reloaded";
2427}; 2478};
2428 2479
2429############################################################################# 2480our $RELOAD_WATCHER; # used only during reload
2430
2431unless ($LINK_MAP) {
2432 $LINK_MAP = cf::map::new;
2433
2434 $LINK_MAP->width (41);
2435 $LINK_MAP->height (41);
2436 $LINK_MAP->alloc;
2437 $LINK_MAP->path ("{link}");
2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470}
2471
2472register "<global>", __PACKAGE__;
2473 2481
2474register_command "reload" => sub { 2482register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2483 my ($who, $arg) = @_;
2476 2484
2477 if ($who->flag (FLAG_WIZ)) { 2485 if ($who->flag (FLAG_WIZ)) {
2478 $who->message ("start of reload."); 2486 $who->message ("reloading server.");
2487
2488 # doing reload synchronously and two reloads happen back-to-back,
2489 # coro crashes during coro_state_free->destroy here.
2490
2491 $RELOAD_WATCHER ||= Event->timer (
2492 reentrant => 0,
2493 after => 0,
2494 data => WF_AUTOCANCEL,
2495 cb => sub {
2479 reload; 2496 reload;
2480 $who->message ("end of reload."); 2497 undef $RELOAD_WATCHER;
2498 },
2499 );
2481 } 2500 }
2482}; 2501};
2483 2502
2484unshift @INC, $LIBDIR; 2503unshift @INC, $LIBDIR;
2504
2505my $bug_warning = 0;
2485 2506
2486$TICK_WATCHER = Event->timer ( 2507$TICK_WATCHER = Event->timer (
2487 reentrant => 0, 2508 reentrant => 0,
2509 parked => 1,
2488 prio => 0, 2510 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2511 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2512 data => WF_AUTOCANCEL,
2491 cb => sub { 2513 cb => sub {
2514 if ($Coro::current != $Coro::main) {
2515 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2516 unless ++$bug_warning > 10;
2517 return;
2518 }
2519
2520 $NOW = Event::time;
2521
2492 cf::server_tick; # one server iteration 2522 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2523 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2524 $NEXT_TICK += $TICK;
2495 2525
2496 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528
2529 Event::sweep;
2530 Coro::cede_notself;
2531
2532# my $AFTER = Event::time;
2533# warn $AFTER - $NOW;#d#
2498 2534
2499 # if we are delayed by four ticks or more, skip them all 2535 # if we are delayed by four ticks or more, skip them all
2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2501 2537
2502 $TICK_WATCHER->at ($NEXT_TICK); 2538 $TICK_WATCHER->at ($NEXT_TICK);
2503 $TICK_WATCHER->start; 2539 $TICK_WATCHER->start;
2504 }, 2540 },
2505); 2541);
2506 2542
2507IO::AIO::max_poll_time $TICK * 0.2; 2543IO::AIO::max_poll_time $TICK * 0.1;
2508 2544
2509Event->io ( 2545undef $Coro::AIO::WATCHER;
2546$AIO_POLL_WATCHER = Event->io (
2547 reentrant => 0,
2510 fd => IO::AIO::poll_fileno, 2548 fd => IO::AIO::poll_fileno,
2511 poll => 'r', 2549 poll => 'r',
2512 prio => 5, 2550 prio => 6,
2513 data => WF_AUTOCANCEL, 2551 data => WF_AUTOCANCEL,
2514 cb => \&IO::AIO::poll_cb, 2552 cb => \&IO::AIO::poll_cb,
2515); 2553);
2516 2554
2517Event->timer ( 2555$WRITE_RUNTIME_WATCHER = Event->timer (
2556 reentrant => 0,
2518 data => WF_AUTOCANCEL, 2557 data => WF_AUTOCANCEL,
2519 after => 0, 2558 after => 1,
2520 interval => 10, 2559 interval => 10,
2521 cb => sub { 2560 prio => 6, # keep it lowest so it acts like a watchdog
2522 (Coro::unblock_sub { 2561 cb => Coro::unblock_sub {
2523 write_runtime 2562 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!"; 2563 or warn "ERROR: unable to write runtime file: $!";
2525 })->();
2526 }, 2564 },
2527); 2565);
2528 2566
2529END { cf::emergency_save } 2567END { cf::emergency_save }
2530 2568

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines