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

Diff Legend

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