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.155 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
33 33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
44our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
45our $NEXT_TICK; 51our $NEXT_TICK;
46our $NOW; 52our $NOW;
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($) {
… …
1240 my @paths; 1087 my @paths;
1241 1088
1242 for (@$files) { 1089 for (@$files) {
1243 utf8::decode $_; 1090 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1092 next unless /^$PATH_SEP/o;
1246 1093
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1249 } 1095 }
1250 1096
1251 \@paths 1097 \@paths
1252} 1098}
1253 1099
… …
1279package cf::map; 1125package cf::map;
1280 1126
1281use Fcntl; 1127use Fcntl;
1282use Coro::AIO; 1128use Coro::AIO;
1283 1129
1130use overload
1131 '""' => \&as_string,
1132 fallback => 1;
1133
1284our $MAX_RESET = 3600; 1134our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1135our $DEFAULT_RESET = 3000;
1286 1136
1287sub generate_random_map { 1137sub generate_random_map {
1288 my ($path, $rmp) = @_; 1138 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1139 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1140 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1141 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1142 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1143 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1144 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1145 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1146 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1147 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1148 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1149 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}) 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1152 )
1153}
1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1163sub register {
1164 my (undef, $regex, $prio) = @_;
1165 my $pkg = caller;
1166
1167 no strict;
1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1169
1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1171}
1172
1173# also paths starting with '/'
1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1175
1176sub thawer_merge {
1177 my ($self, $merge) = @_;
1178
1179 # we have to keep some variables in memory intact
1180 local $self->{path};
1181 local $self->{load_path};
1182 local $self->{deny_save};
1183 local $self->{deny_reset};
1184
1185 $self->SUPER::thawer_merge ($merge);
1186}
1187
1188sub normalise {
1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1194
1195 # map plan:
1196 #
1197 # /! non-realised random map exit (special hack!)
1198 # {... are special paths that are not being touched
1199 # ?xxx/... are special absolute paths
1200 # ?random/... random maps
1201 # /... normal maps
1202 # ~user/... per-player map of a specific user
1203
1204 $path =~ s/$PATH_SEP/\//go;
1205
1206 # treat it as relative path if it starts with
1207 # something that looks reasonable
1208 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1209 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1210
1211 $base =~ s{[^/]+/?$}{};
1212 $path = "$base/$path";
1213 }
1214
1215 for ($path) {
1216 redo if s{//}{/};
1217 redo if s{/\.?/}{/};
1218 redo if s{/[^/]+/\.\./}{/};
1219 }
1220
1221 $path
1222}
1223
1224sub new_from_path {
1225 my (undef, $path, $base) = @_;
1226
1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1228
1229 $path = normalise $path, $base;
1230
1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1233 my $self = bless cf::map::new, $pkg;
1234 $self->{path} = $path; $self->path ($path);
1235 $self->init; # pass $1 etc.
1236 return $self;
1237 }
1238 }
1239
1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1241 ()
1242}
1243
1244sub init {
1245 my ($self) = @_;
1246
1247 $self
1248}
1249
1250sub as_string {
1251 my ($self) = @_;
1252
1253 "$self->{path}"
1254}
1255
1256# the displayed name, this is a one way mapping
1257sub visible_name {
1258 &as_string
1259}
1260
1261# the original (read-only) location
1262sub load_path {
1263 my ($self) = @_;
1264
1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1266}
1267
1268# the temporary/swap location
1269sub save_path {
1270 my ($self) = @_;
1271
1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1274}
1275
1276# the unique path, undef == no special unique path
1277sub uniq_path {
1278 my ($self) = @_;
1279
1280 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1281 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304} 1282}
1305 1283
1306# and all this just because we cannot iterate over 1284# and all this just because we cannot iterate over
1307# all maps in C++... 1285# all maps in C++...
1308sub change_all_map_light { 1286sub change_all_map_light {
… …
1310 1288
1311 $_->change_map_light ($change) 1289 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1290 for grep $_->outdoor, values %cf::MAP;
1313} 1291}
1314 1292
1293sub unlink_save {
1294 my ($self) = @_;
1295
1296 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304}
1305
1315sub try_load_header($) { 1306sub load_header_from($) {
1316 my ($path) = @_; 1307 my ($self, $path) = @_;
1317 1308
1318 utf8::encode $path; 1309 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1311 # or return;
1312
1313 $self->_load_header ($path)
1320 or return; 1314 or return;
1321 1315
1322 my $map = cf::map::new 1316 $self->{load_path} = $path;
1317
1318 1
1319}
1320
1321sub load_header_orig {
1322 my ($self) = @_;
1323
1324 $self->load_header_from ($self->load_path)
1325}
1326
1327sub load_header_temp {
1328 my ($self) = @_;
1329
1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1350}
1351
1352sub load_header {
1353 my ($self) = @_;
1354
1355 if ($self->load_header_temp) {
1356 $self->prepare_temp;
1357 } else {
1358 $self->load_header_orig
1323 or return; 1359 or return;
1360 $self->prepare_orig;
1361 }
1324 1362
1325 # for better error messages only, will be overwritten 1363 1
1326 $map->path ($path);
1327
1328 $map->load_header ($path)
1329 or return;
1330
1331 $map->{load_path} = $path;
1332
1333 $map
1334} 1364}
1335 1365
1336sub find; 1366sub find;
1337sub find { 1367sub find {
1338 my ($path, $origin) = @_; 1368 my ($path, $origin) = @_;
1339 1369
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1370 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1371
1345 cf::lock_wait "map_find:$key"; 1372 cf::lock_wait "map_find:$path";
1346 1373
1347 $cf::MAP{$key} || do { 1374 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1375 my $guard = cf::lock_acquire "map_find:$path";
1349 1376 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; 1377 or return;
1369 1378
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; 1379 $map->{last_save} = $cf::RUNTIME;
1382 1380
1383 Coro::cede; 1381 $map->load_header
1382 or return;
1384 1383
1385 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1386 #$cf::WAIT_FOR_TICK->wait;
1386 $map->reset; 1387 $map->reset;
1387 undef $guard; 1388 undef $guard;
1388 $map = find $path 1389 return find $path;
1389 or return;
1390 } 1390 }
1391 1391
1392 $cf::MAP{$key} = $map 1392 $cf::MAP{$path} = $map
1393 } 1393 }
1394} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1395 1398
1396sub load { 1399sub load {
1397 my ($self) = @_; 1400 my ($self) = @_;
1398 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1399 my $path = $self->{path}; 1404 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1405 my $guard = cf::lock_acquire "map_load:$path";
1401 1406
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1408
1404 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1405 1410
1406 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1407 $self->load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1416 or return;
1409 1417
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1419 if delete $self->{load_original};
1412 1420
1413 if (my $uniq = $path->uniq_path) { 1421 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1422 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1423 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1424 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1425 $self->_load_objects ($uniq, 0);
1418 } 1426 }
1419 } 1427 }
1420 1428
1421 Coro::cede; 1429 Coro::cede;
1422 1430
1423 # now do the right thing for maps 1431 # now do the right thing for maps
1424 $self->link_multipart_objects; 1432 $self->link_multipart_objects;
1425 1433
1426 if ($self->{path}->is_style_map) { 1434 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1435 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1436 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1437 $self->update_buttons;
1438 Coro::cede;
1433 $self->set_darkness_map; 1439 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1440 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1441 unless $self->difficulty;
1442 Coro::cede;
1436 $self->activate; 1443 $self->activate;
1437 } 1444 }
1438 1445
1439 Coro::cede; 1446 $self->post_load;
1440 1447
1441 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1449}
1450
1451sub customise_for {
1452 my ($self, $ob) = @_;
1453
1454 return find "~" . $ob->name . "/" . $self->{path}
1455 if $self->per_player;
1456
1457 $self
1458}
1459
1460# find and load all maps in the 3x3 area around a map
1461sub load_diag {
1462 my ($map) = @_;
1463
1464 my @diag; # diagonal neighbours
1465
1466 for (0 .. 3) {
1467 my $neigh = $map->tile_path ($_)
1468 or next;
1469 $neigh = find $neigh, $map
1470 or next;
1471 $neigh->load;
1472
1473 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1474 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1475 }
1476
1477 for (@diag) {
1478 my $neigh = find @$_
1479 or next;
1480 $neigh->load;
1481 }
1442} 1482}
1443 1483
1444sub find_sync { 1484sub find_sync {
1445 my ($path, $origin) = @_; 1485 my ($path, $origin) = @_;
1446 1486
1447 cf::sync_job { cf::map::find $path, $origin } 1487 cf::sync_job { find $path, $origin }
1448} 1488}
1449 1489
1450sub do_load_sync { 1490sub do_load_sync {
1451 my ($map) = @_; 1491 my ($map) = @_;
1452 1492
1453 cf::sync_job { $map->load }; 1493 cf::sync_job { $map->load };
1454} 1494}
1455 1495
1496our %MAP_PREFETCH;
1497our $MAP_PREFETCHER = undef;
1498
1499sub find_async {
1500 my ($path, $origin) = @_;
1501
1502 $path = normalise $path, $origin && $origin->{path};
1503
1504 if (my $map = $cf::MAP{$path}) {
1505 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1506 }
1507
1508 undef $MAP_PREFETCH{$path};
1509 $MAP_PREFETCHER ||= cf::async {
1510 while (%MAP_PREFETCH) {
1511 for my $path (keys %MAP_PREFETCH) {
1512 my $map = find $path
1513 or next;
1514 $map->load;
1515
1516 delete $MAP_PREFETCH{$path};
1517 }
1518 }
1519 undef $MAP_PREFETCHER;
1520 };
1521 $MAP_PREFETCHER->prio (6);
1522
1523 ()
1524}
1525
1456sub save { 1526sub save {
1457 my ($self) = @_; 1527 my ($self) = @_;
1458 1528
1459 my $lock = cf::lock_acquire "map_data:" . $self->path; 1529 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460 1530
1461 $self->{last_save} = $cf::RUNTIME; 1531 $self->{last_save} = $cf::RUNTIME;
1462 1532
1463 return unless $self->dirty; 1533 return unless $self->dirty;
1464 1534
1465 my $save = $self->{path}->save_path; utf8::encode $save; 1535 my $save = $self->save_path; utf8::encode $save;
1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1536 my $uniq = $self->uniq_path; utf8::encode $uniq;
1467 1537
1468 $self->{load_path} = $save; 1538 $self->{load_path} = $save;
1469 1539
1470 return if $self->{deny_save}; 1540 return if $self->{deny_save};
1471 1541
… …
1474 cf::async { 1544 cf::async {
1475 $_->contr->save for $self->players; 1545 $_->contr->save for $self->players;
1476 }; 1546 };
1477 1547
1478 if ($uniq) { 1548 if ($uniq) {
1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1549 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1480 $self->save_objects ($uniq, cf::IO_UNIQUES); 1550 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1481 } else { 1551 } else {
1482 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1552 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1483 } 1553 }
1484} 1554}
1485 1555
1486sub swap_out { 1556sub swap_out {
1487 my ($self) = @_; 1557 my ($self) = @_;
… …
1501 1571
1502sub reset_at { 1572sub reset_at {
1503 my ($self) = @_; 1573 my ($self) = @_;
1504 1574
1505 # TODO: safety, remove and allow resettable per-player maps 1575 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel}; 1576 return 1e99 if $self->isa ("ext::map_per_player");#d#
1507 return 1e99 if $self->{deny_reset}; 1577 return 1e99 if $self->{deny_reset};
1508 1578
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1579 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1580 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1511 1581
… …
1516 my ($self) = @_; 1586 my ($self) = @_;
1517 1587
1518 $self->reset_at <= $cf::RUNTIME 1588 $self->reset_at <= $cf::RUNTIME
1519} 1589}
1520 1590
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 { 1591sub reset {
1543 my ($self) = @_; 1592 my ($self) = @_;
1544 1593
1545 my $lock = cf::lock_acquire "map_data:" . $self->path; 1594 my $lock = cf::lock_acquire "map_data:$self->{path}";
1546 1595
1547 return if $self->players; 1596 return if $self->players;
1548 return if $self->{path}{user_rel};#d# 1597 return if $self->isa ("ext::map_per_player");#d#
1549 1598
1550 warn "resetting map ", $self->path;#d# 1599 warn "resetting map ", $self->path;#d#
1551 1600
1552 delete $cf::MAP{$self->path}; 1601 delete $cf::MAP{$self->path};
1602
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear;
1553 1605
1554 $_->clear_links_to ($self) for values %cf::MAP; 1606 $_->clear_links_to ($self) for values %cf::MAP;
1555 1607
1556 $self->unlink_save; 1608 $self->unlink_save;
1557 $self->destroy; 1609 $self->destroy;
… …
1560my $nuke_counter = "aaaa"; 1612my $nuke_counter = "aaaa";
1561 1613
1562sub nuke { 1614sub nuke {
1563 my ($self) = @_; 1615 my ($self) = @_;
1564 1616
1617 delete $cf::MAP{$self->path};
1618
1619 $self->unlink_save;
1620
1621 bless $self, "cf::map";
1622 delete $self->{deny_reset};
1565 $self->{deny_save} = 1; 1623 $self->{deny_save} = 1;
1566 $self->reset_timeout (1); 1624 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++)); 1625 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1626
1627 $cf::MAP{$self->path} = $self;
1628
1568 $self->reset; # polite request, might not happen 1629 $self->reset; # polite request, might not happen
1569} 1630}
1570 1631
1571sub customise_for { 1632=item cf::map::unique_maps
1572 my ($map, $ob) = @_;
1573 1633
1574 if ($map->per_player) { 1634Returns an arrayref of paths of all shared maps that have
1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1635instantiated unique items. May block.
1576 }
1577 1636
1578 $map 1637=cut
1638
1639sub unique_maps() {
1640 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1641 or return;
1642
1643 my @paths;
1644
1645 for (@$files) {
1646 utf8::decode $_;
1647 next if /\.pst$/;
1648 next unless /^$PATH_SEP/o;
1649
1650 push @paths, cf::map::normalise $_;
1651 }
1652
1653 \@paths
1579} 1654}
1580 1655
1581package cf; 1656package cf;
1582 1657
1583=back 1658=back
… …
1655 1730
1656=item $player_object->enter_link 1731=item $player_object->enter_link
1657 1732
1658Freezes the player and moves him/her to a special map (C<{link}>). 1733Freezes the player and moves him/her to a special map (C<{link}>).
1659 1734
1660The player should be reaosnably safe there for short amounts of time. You 1735The player should be reasonably safe there for short amounts of time. You
1661I<MUST> call C<leave_link> as soon as possible, though. 1736I<MUST> call C<leave_link> as soon as possible, though.
1662 1737
1738Will never block.
1739
1663=item $player_object->leave_link ($map, $x, $y) 1740=item $player_object->leave_link ($map, $x, $y)
1664 1741
1665Moves the player out of the specila link map onto the given map. If the 1742Moves 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 1743map. 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, 1744to the location he/she was before the call to C<enter_link>, or, if that
1668to the emergency map position. 1745fails, to the emergency map position.
1669 1746
1670Might block. 1747Might block.
1671 1748
1672=cut 1749=cut
1750
1751sub link_map {
1752 unless ($LINK_MAP) {
1753 $LINK_MAP = cf::map::find "{link}"
1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1755 $LINK_MAP->load;
1756 }
1757
1758 $LINK_MAP
1759}
1673 1760
1674sub cf::object::player::enter_link { 1761sub cf::object::player::enter_link {
1675 my ($self) = @_; 1762 my ($self) = @_;
1676 1763
1677 $self->deactivate_recursive; 1764 $self->deactivate_recursive;
1678 1765
1679 return if $self->map == $LINK_MAP; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1680 1767
1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1682 if $self->map; 1769 if $self->map;
1683 1770
1684 $self->enter_map ($LINK_MAP, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1685} 1772}
1686 1773
1687sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1688 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1689 1776
… …
1707 # use -1 or undef as default coordinates, not 0, 0 1794 # use -1 or undef as default coordinates, not 0, 0
1708 ($x, $y) = ($map->enter_x, $map->enter_y) 1795 ($x, $y) = ($map->enter_x, $map->enter_y)
1709 if $x <=0 && $y <= 0; 1796 if $x <=0 && $y <= 0;
1710 1797
1711 $map->load; 1798 $map->load;
1799 $map->load_diag;
1712 1800
1713 return unless $self->contr->active; 1801 return unless $self->contr->active;
1714 $self->activate_recursive; 1802 $self->activate_recursive;
1715 $self->enter_map ($map, $x, $y); 1803 $self->enter_map ($map, $x, $y);
1716} 1804}
… …
1752=cut 1840=cut
1753 1841
1754sub cf::object::player::goto { 1842sub cf::object::player::goto {
1755 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1756 1844
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1760 $self->enter_link; 1845 $self->enter_link;
1761 1846
1762 (async { 1847 (async {
1848 my $map = eval {
1763 my $map = cf::map::find $path->as_string; 1849 my $map = cf::map::find $path;
1764 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1765 1851 $map
1766# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1767# if $map;
1768
1769 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1770 1854
1771 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1772 })->prio (1); 1856 })->prio (1);
1773} 1857}
1774 1858
… …
1778 1862
1779sub parse_random_map_params { 1863sub parse_random_map_params {
1780 my ($spec) = @_; 1864 my ($spec) = @_;
1781 1865
1782 my $rmp = { # defaults 1866 my $rmp = { # defaults
1783 xsize => 10, 1867 xsize => (cf::rndm 15, 40),
1784 ysize => 10, 1868 ysize => (cf::rndm 15, 40),
1869 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1870 #layout => string,
1785 }; 1871 };
1786 1872
1787 for (split /\n/, $spec) { 1873 for (split /\n/, $spec) {
1788 my ($k, $v) = split /\s+/, $_, 2; 1874 my ($k, $v) = split /\s+/, $_, 2;
1789 1875
… …
1793 $rmp 1879 $rmp
1794} 1880}
1795 1881
1796sub prepare_random_map { 1882sub prepare_random_map {
1797 my ($exit) = @_; 1883 my ($exit) = @_;
1884
1885 my $guard = cf::lock_acquire "exit_prepare:$exit";
1798 1886
1799 # all this does is basically replace the /! path by 1887 # all this does is basically replace the /! path by
1800 # a new random map path (?random/...) with a seed 1888 # a new random map path (?random/...) with a seed
1801 # that depends on the exit object 1889 # that depends on the exit object
1802 1890
1803 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1804 1892
1805 if ($exit->map) { 1893 if ($exit->map) {
1806 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1807 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1808 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1809 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1810 } 1898 }
1811 1899
1812 $rmp->{random_seed} ||= $exit->random_seed; 1900 $rmp->{random_seed} ||= $exit->random_seed;
1813 1901
1814 my $data = cf::to_json $rmp; 1902 my $data = cf::to_json $rmp;
1815 my $md5 = Digest::MD5::md5_hex $data; 1903 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1816 1905
1817 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1818 aio_write $fh, 0, (length $data), $data, 0; 1907 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh;
1909 aio_rename "$meta~", $meta;
1819 1910
1820 $exit->slaying ("?random/$md5"); 1911 $exit->slaying ("?random/$md5");
1821 $exit->msg (undef); 1912 $exit->msg (undef);
1822 } 1913 }
1823} 1914}
1824 1915
1825sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1826 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1827 1918
1828 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1829 1929
1830 $self->enter_link; 1930 $self->enter_link;
1831 1931
1832 (async { 1932 (async {
1833 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1834 unless (eval { 1934 unless (eval {
1835 prepare_random_map $exit 1935 $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 1936
1841 1; 1937 1;
1842 }) { 1938 }) {
1843 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1844 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
1845 . "Please report this to the dungeon master", 1941 . "Please report this to the dungeon master!",
1846 cf::NDI_UNIQUE | cf::NDI_RED); 1942 cf::NDI_UNIQUE | cf::NDI_RED);
1847 1943
1848 warn "ERROR in enter_exit: $@"; 1944 warn "ERROR in enter_exit: $@";
1849 $self->leave_link; 1945 $self->leave_link;
1850 } 1946 }
… …
2133 sub db_sync() { 2229 sub db_sync() {
2134 db_save if $dirty; 2230 db_save if $dirty;
2135 undef $dirty; 2231 undef $dirty;
2136 } 2232 }
2137 2233
2138 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2139 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2140 }); 2241 );
2141 2242
2142 sub db_dirty() { 2243 sub db_dirty() {
2143 $dirty = 1; 2244 $dirty = 1;
2144 $idle->start; 2245 $idle->start;
2145 } 2246 }
… …
2193 2294
2194sub main { 2295sub main {
2195 # we must not ever block the main coroutine 2296 # we must not ever block the main coroutine
2196 local $Coro::idle = sub { 2297 local $Coro::idle = sub {
2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2298 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2299 (async {
2198 async { Event::one_event }; 2300 Event::one_event;
2301 })->prio (Coro::PRIO_MAX);
2199 }; 2302 };
2200 2303
2201 cfg_load; 2304 cfg_load;
2202 db_load; 2305 db_load;
2203 load_extensions; 2306 load_extensions;
2307
2308 $TICK_WATCHER->start;
2204 Event::loop; 2309 Event::loop;
2205} 2310}
2206 2311
2207############################################################################# 2312#############################################################################
2208# initialisation and cleanup 2313# initialisation and cleanup
2209 2314
2210# install some emergency cleanup handlers 2315# install some emergency cleanup handlers
2211BEGIN { 2316BEGIN {
2212 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2213 Event->signal ( 2318 Event->signal (
2319 reentrant => 0,
2214 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2215 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2216 cb => sub { 2323 cb => sub {
2217 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2218 }, 2325 },
2219 ); 2326 );
2220 } 2327 }
2221} 2328}
2222 2329
2223sub emergency_save { 2330sub emergency_save() {
2224 my $freeze_guard = cf::freeze_mainloop; 2331 my $freeze_guard = cf::freeze_mainloop;
2225 2332
2226 warn "enter emergency perl save\n"; 2333 warn "enter emergency perl save\n";
2227 2334
2228 cf::sync_job { 2335 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl 2336 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players 2337 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously. 2338 # and maps saved/destroyed asynchronously.
2232 warn "begin emergency player save\n"; 2339 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) { 2340 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next; 2341 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next; 2342 $pl->valid or next;
2236 $pl->save; 2343 $pl->save;
… …
2250} 2357}
2251 2358
2252sub reload() { 2359sub reload() {
2253 # can/must only be called in main 2360 # can/must only be called in main
2254 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2255 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2256 return; 2363 return;
2257 } 2364 }
2258 2365
2259 warn "reloading..."; 2366 warn "reloading...";
2260 2367
2261 my $guard = freeze_mainloop; 2368 warn "cancelling server ticker";
2369 $TICK_WATCHER->cancel;
2370
2262 cf::emergency_save; 2371 cf::emergency_save;
2263 2372
2264 eval { 2373 eval {
2265 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2266 2375
2267 # cancel all watchers 2376 warn "syncing database to disk";
2377 cf::db_sync;
2378
2379 warn "cancelling all WF_AUTOCANCEL watchers";
2268 for (Event::all_watchers) { 2380 for (Event::all_watchers) {
2269 $_->cancel if $_->data & WF_AUTOCANCEL; 2381 $_->cancel if $_->data & WF_AUTOCANCEL;
2270 } 2382 }
2271 2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 IO::AIO::flush;
2387 Coro::cede;
2388 last unless IO::AIO::nreqs;
2389 warn "iterate...";
2390 }
2391
2272 # cancel all extension coros 2392 warn "cancelling all extension coros";
2273 $_->cancel for values %EXT_CORO; 2393 $_->cancel for values %EXT_CORO;
2274 %EXT_CORO = (); 2394 %EXT_CORO = ();
2275 2395
2276 # unload all extensions 2396 warn "removing commands";
2277 for (@exts) { 2397 %COMMAND = ();
2398
2399 warn "removing ext commands";
2400 %EXTCMD = ();
2401
2402 warn "unloading/nuking all extensions";
2403 for my $pkg (@EXTS) {
2278 warn "unloading <$_>"; 2404 warn "... unloading $pkg";
2279 unload_extension $_; 2405
2406 if (my $cb = $pkg->can ("unload")) {
2407 eval {
2408 $cb->($pkg);
2409 1
2410 } or warn "$pkg unloaded, but with errors: $@";
2280 } 2411 }
2281 2412
2413 warn "... nuking $pkg";
2414 Symbol::delete_package $pkg;
2415 }
2416
2282 # unload all modules loaded from $LIBDIR 2417 warn "unloading all perl modules loaded from $LIBDIR";
2283 while (my ($k, $v) = each %INC) { 2418 while (my ($k, $v) = each %INC) {
2284 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2419 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2285 2420
2286 warn "removing <$k>"; 2421 warn "... unloading $k";
2287 delete $INC{$k}; 2422 delete $INC{$k};
2288 2423
2289 $k =~ s/\.pm$//; 2424 $k =~ s/\.pm$//;
2290 $k =~ s/\//::/g; 2425 $k =~ s/\//::/g;
2291 2426
… …
2294 } 2429 }
2295 2430
2296 Symbol::delete_package $k; 2431 Symbol::delete_package $k;
2297 } 2432 }
2298 2433
2299 # sync database to disk
2300 cf::db_sync;
2301 IO::AIO::flush;
2302
2303 # get rid of safe::, as good as possible 2434 warn "getting rid of safe::, as good as possible";
2304 Symbol::delete_package "safe::$_" 2435 Symbol::delete_package "safe::$_"
2305 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2306 2437
2307 # remove register_script_function callbacks
2308 # TODO
2309
2310 # unload cf.pm "a bit" 2438 warn "unloading cf.pm \"a bit\"";
2311 delete $INC{"cf.pm"}; 2439 delete $INC{"cf.pm"};
2312 2440
2313 # don't, removes xs symbols, too, 2441 # don't, removes xs symbols, too,
2314 # and global variables created in xs 2442 # and global variables created in xs
2315 #Symbol::delete_package __PACKAGE__; 2443 #Symbol::delete_package __PACKAGE__;
2316 2444
2317 # reload cf.pm 2445 warn "unload completed, starting to reload now";
2446
2318 warn "reloading cf.pm"; 2447 warn "reloading cf.pm";
2319 require cf; 2448 require cf;
2320 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2321 2450
2322 # load config and database again 2451 warn "loading config and database again";
2323 cf::cfg_load; 2452 cf::cfg_load;
2324 cf::db_load; 2453 cf::db_load;
2325 2454
2326 # load extensions
2327 warn "load extensions"; 2455 warn "loading extensions";
2328 cf::load_extensions; 2456 cf::load_extensions;
2329 2457
2330 # reattach attachments to objects 2458 warn "reattaching attachments to objects/players";
2331 warn "reattach";
2332 _global_reattach; 2459 _global_reattach;
2460 warn "reattaching attachments to maps";
2333 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "restarting server ticker";
2464
2465 $TICK_WATCHER->start;
2334 }; 2466 };
2335 2467
2336 if ($@) { 2468 if ($@) {
2337 warn $@; 2469 warn $@;
2338 warn "error while reloading, exiting."; 2470 warn "error while reloading, exiting.";
2339 exit 1; 2471 exit 1;
2340 } 2472 }
2341 2473
2342 warn "reloaded successfully"; 2474 warn "reloaded";
2343}; 2475};
2344 2476
2345############################################################################# 2477our $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 2478
2390register_command "reload" => sub { 2479register_command "reload" => sub {
2391 my ($who, $arg) = @_; 2480 my ($who, $arg) = @_;
2392 2481
2393 if ($who->flag (FLAG_WIZ)) { 2482 if ($who->flag (FLAG_WIZ)) {
2394 $who->message ("start of reload."); 2483 $who->message ("reloading server.");
2484
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2395 reload; 2493 reload;
2396 $who->message ("end of reload."); 2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2397 } 2497 }
2398}; 2498};
2399 2499
2400unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2501
2502my $bug_warning = 0;
2401 2503
2402$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2403 reentrant => 0, 2505 reentrant => 0,
2506 parked => 1,
2404 prio => 0, 2507 prio => 0,
2405 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2406 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2407 cb => sub { 2510 cb => sub {
2511 if ($Coro::current != $Coro::main) {
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10;
2514 return;
2515 }
2516
2517 $NOW = Event::time;
2518
2408 cf::server_tick; # one server iteration 2519 cf::server_tick; # one server iteration
2409 $RUNTIME += $TICK; 2520 $RUNTIME += $TICK;
2410 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2411 2522
2412 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2413 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2414 2531
2415 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2416 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2417 2534
2418 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2419 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2420 }, 2537 },
2421); 2538);
2422 2539
2423IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2424 2541
2425Event->io ( 2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2426 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2427 poll => 'r', 2546 poll => 'r',
2428 prio => 5, 2547 prio => 6,
2429 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2430 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2431); 2550);
2432 2551
2433Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2434 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2435 after => 0, 2555 after => 1,
2436 interval => 10, 2556 interval => 10,
2437 cb => sub { 2557 prio => 6, # keep it lowest so it acts like a watchdog
2438 (Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2439 write_runtime 2559 write_runtime
2440 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2441 })->();
2442 }, 2561 },
2443); 2562);
2444 2563
2445END { cf::emergency_save } 2564END { cf::emergency_save }
2446 2565

Diff Legend

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