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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.204 by root, Fri Feb 2 19:59: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;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
53our $USE_FSYNC; # use fsync to write maps - default off
51 54
52our %CFG; 55our %CFG;
53 56
54our $UPTIME; $UPTIME ||= time; 57our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 58our $RUNTIME;
56 59
57our %PLAYER; # all users 60our %PLAYER; # all users
58our %MAP; # all maps 61our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 62our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 63our $RANDOM_MAPS = cf::localdir . "/random";
61 64
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $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
64 70
65binmode STDOUT; 71binmode STDOUT;
66binmode STDERR; 72binmode STDERR;
67 73
68# read virtual server time, if available 74# read virtual server time, if available
… …
76mkdir cf::localdir . "/" . cf::playerdir; 82mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 83mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 84mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 85mkdir $RANDOM_MAPS;
80 86
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 87our $EMERGENCY_POSITION;
88
89sub cf::map::normalise;
84 90
85############################################################################# 91#############################################################################
86 92
87=head2 GLOBAL VARIABLES 93=head2 GLOBAL VARIABLES
88 94
… …
256} 262}
257 263
258sub freeze_mainloop { 264sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 265 return unless $TICK_WATCHER->is_active;
260 266
261 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;
262 $TICK_WATCHER->stop; 272 $TICK_WATCHER->stop;
263 $guard 273 $guard
264} 274}
265 275
266=item cf::async { BLOCK } 276=item cf::async { BLOCK }
… …
342 my $runtime = cf::localdir . "/runtime"; 352 my $runtime = cf::localdir . "/runtime";
343 353
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 355 or return;
346 356
357 my $value = $cf::RUNTIME + 90 + 10;
347 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
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 361 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 362 and return;
350 363
364 # always fsync - this file is important
351 aio_fsync $fh 365 aio_fsync $fh
352 and return; 366 and return;
353 367
354 close $fh 368 close $fh
355 or return; 369 or return;
… …
361} 375}
362 376
363=back 377=back
364 378
365=cut 379=cut
366
367#############################################################################
368
369package cf::path;
370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
383sub new {
384 my ($class, $path, $base) = @_;
385
386 return $path if ref $path;
387
388 my $self = {};
389
390 # {... are special paths that are not being touched
391 # ?xxx/... are special absolute paths
392 # ?random/... random maps
393 # /! non-realised random map exit
394 # /... normal maps
395 # ~/... per-player maps without a specific player (DO NOT USE)
396 # ~user/... per-player map of a specific user
397
398 $path =~ s/$PATH_SEP/\//go;
399
400 if ($path =~ /^{/) {
401 # fine as it is
402 } else {
403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
405 $self->{user_rel} = 1;
406
407 if (defined $1) {
408 $self->{user} = $1;
409 } elsif ($base =~ m{^~([^/]+)/}) {
410 $self->{user} = $1;
411 } else {
412 warn "cannot resolve user-relative path without user <$path,$base>\n";
413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
420 } elsif ($path =~ /^\//) {
421 # /...
422 # already absolute
423 } else {
424 # relative
425 $base =~ s{[^/]+/?$}{};
426 return $class->new ("$base/$path");
427 }
428
429 for ($path) {
430 redo if s{/\.?/}{/};
431 redo if s{/[^/]+/\.\./}{/};
432 }
433 }
434
435 $self->{path} = $path;
436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
458}
459
460# the name / primary key / in-game path
461sub as_string {
462 my ($self) = @_;
463
464 $self->{user_rel} ? "~$self->{user}$self->{path}"
465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
466 : $self->{path}
467}
468
469# the displayed name, this is a one way mapping
470sub visible_name {
471 &as_string
472}
473
474# escape the /'s in the path
475sub _escaped_path {
476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 380
523############################################################################# 381#############################################################################
524 382
525=head2 ATTACHABLE OBJECTS 383=head2 ATTACHABLE OBJECTS
526 384
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 510our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 511our @CB_MAP = ();
654 512
655my %attachment; 513my %attachment;
656 514
515sub cf::attachable::thawer_merge {
516 # simply override everything except _meta
517 local $_[0]{_meta};
518 %{$_[0]} = %{$_[1]};
519}
520
657sub _attach_cb($$$$) { 521sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 522 my ($registry, $event, $prio, $cb) = @_;
659 523
660 use sort 'stable'; 524 use sort 'stable';
661 525
… …
832# object support 696# object support
833 697
834sub reattach { 698sub reattach {
835 # basically do the same as instantiate, without calling instantiate 699 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 700 my ($obj) = @_;
701
702 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 703
838 my $registry = $obj->registry; 704 my $registry = $obj->registry;
839 705
840 @$registry = (); 706 @$registry = ();
841 707
… …
888 $filename, length $$rdata, scalar @$objs; 754 $filename, length $$rdata, scalar @$objs;
889 755
890 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 756 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
891 chmod SAVE_MODE, $fh; 757 chmod SAVE_MODE, $fh;
892 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 758 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
893 aio_fsync $fh; 759 aio_fsync $fh if $cf::USE_FSYNC;
894 close $fh; 760 close $fh;
895 761
896 if (@$objs) { 762 if (@$objs) {
897 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) {
898 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
899 my $data = Storable::nfreeze { version => 1, objs => $objs }; 765 my $data = Storable::nfreeze { version => 1, objs => $objs };
900 aio_write $fh, 0, (length $data), $data, 0; 766 aio_write $fh, 0, (length $data), $data, 0;
901 aio_fsync $fh; 767 aio_fsync $fh if $cf::USE_FSYNC;
902 close $fh; 768 close $fh;
903 aio_rename "$filename.pst~", "$filename.pst"; 769 aio_rename "$filename.pst~", "$filename.pst";
904 } 770 }
905 } else { 771 } else {
906 aio_unlink "$filename.pst"; 772 aio_unlink "$filename.pst";
… …
912 } 778 }
913 } else { 779 } else {
914 aio_unlink $filename; 780 aio_unlink $filename;
915 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
916 } 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 }
917 } 789 }
918} 790}
919 791
920sub object_freezer_as_string { 792sub object_freezer_as_string {
921 my ($rdata, $objs) = @_; 793 my ($rdata, $objs) = @_;
… …
927 799
928sub object_thawer_load { 800sub object_thawer_load {
929 my ($filename) = @_; 801 my ($filename) = @_;
930 802
931 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$//;
932 807
933 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
934 or return; 809 or return;
935 810
936 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1028 "package $pkg; use strict; use utf8;\n" 903 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 904 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 905 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 906 . "\n};\n1";
1032 907
1033 eval $source 908 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 909 my $msg = $@ ? "$path: $@\n"
1035 : "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 }
1036 918
1037 push @EXTS, $pkg; 919 push @EXTS, $pkg;
1038} 920}
1039 921
1040sub load_extensions { 922sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 928 } or warn "$ext not loaded: $@";
1047 } 929 }
1048} 930}
1049 931
1050############################################################################# 932#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 933
1066=head2 CORE EXTENSIONS 934=head2 CORE EXTENSIONS
1067 935
1068Functions and methods that extend core crossfire objects. 936Functions and methods that extend core crossfire objects.
1069 937
… …
1105 973
1106sub exists($) { 974sub exists($) {
1107 my ($login) = @_; 975 my ($login) = @_;
1108 976
1109 $cf::PLAYER{$login} 977 $cf::PLAYER{$login}
1110 or cf::sync_job { !aio_stat $login } 978 or cf::sync_job { !aio_stat path $login }
1111} 979}
1112 980
1113sub find($) { 981sub find($) {
1114 return $cf::PLAYER{$_[0]} || do { 982 return $cf::PLAYER{$_[0]} || do {
1115 my $login = $_[0]; 983 my $login = $_[0];
… …
1205 \@logins 1073 \@logins
1206} 1074}
1207 1075
1208=item $player->maps 1076=item $player->maps
1209 1077
1210Returns 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
1211player. May block. 1079player. May block.
1212 1080
1213=cut 1081=cut
1214 1082
1215sub maps($) { 1083sub maps($) {
1216 my ($pl) = @_; 1084 my ($pl) = @_;
1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1217 1087
1218 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1219 or return; 1089 or return;
1220 1090
1221 my @paths; 1091 my @paths;
… …
1223 for (@$files) { 1093 for (@$files) {
1224 utf8::decode $_; 1094 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1227 1097
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1098 push @paths, cf::map::normalise "~$pl/$_";
1229 } 1099 }
1230 1100
1231 \@paths 1101 \@paths
1232} 1102}
1233 1103
… …
1259package cf::map; 1129package cf::map;
1260 1130
1261use Fcntl; 1131use Fcntl;
1262use Coro::AIO; 1132use Coro::AIO;
1263 1133
1134use overload
1135 '""' => \&as_string,
1136 fallback => 1;
1137
1264our $MAX_RESET = 3600; 1138our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1139our $DEFAULT_RESET = 3000;
1266 1140
1267sub generate_random_map { 1141sub generate_random_map {
1268 my ($path, $rmp) = @_; 1142 my ($self, $rmp) = @_;
1269
1270 # mit "rum" bekleckern, nicht 1143 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1144 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1145 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1146 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1147 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1148 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1149 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1154 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1155 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1156 )
1285} 1157}
1286 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
1286}
1287
1287# and all this just because we cannot iterate over 1288# and all this just because we cannot iterate over
1288# all maps in C++... 1289# all maps in C++...
1289sub change_all_map_light { 1290sub change_all_map_light {
1290 my ($change) = @_; 1291 my ($change) = @_;
1291 1292
1292 $_->change_map_light ($change) 1293 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1294 for grep $_->outdoor, values %cf::MAP;
1294} 1295}
1295 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
1296sub load_map_header($) { 1310sub load_header_from($) {
1297 my ($path) = @_; 1311 my ($self, $path) = @_;
1298 1312
1299 utf8::encode $path; 1313 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1314 #aio_open $path, O_RDONLY, 0
1315 # or return;
1316
1317 $self->_load_header ($path)
1301 or return; 1318 or return;
1302 1319
1303 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
1304 or return; 1363 or return;
1364 $self->prepare_orig;
1365 }
1305 1366
1306 # for better error messages only, will be overwritten later 1367 1
1307 $map->path ($path);
1308
1309 $map->load_header ($path)
1310 or return;
1311
1312 $map->{load_path} = $path;
1313
1314 $map
1315} 1368}
1316 1369
1317sub find; 1370sub find;
1318sub find { 1371sub find {
1319 my ($path, $origin) = @_; 1372 my ($path, $origin) = @_;
1320 1373
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1374 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1375
1326 cf::lock_wait "map_find:$key"; 1376 cf::lock_wait "map_find:$path";
1327 1377
1328 $cf::MAP{$key} || do { 1378 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1379 my $guard = cf::lock_acquire "map_find:$path";
1330 1380 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1381 or return;
1345 1382
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1383 $map->{last_save} = $cf::RUNTIME;
1358 1384
1359 Coro::cede; 1385 $map->load_header
1386 or return;
1360 1387
1361 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;
1362 $map->reset; 1391 $map->reset;
1363 undef $guard; 1392 undef $guard;
1364 $map = find $path 1393 return find $path;
1365 or return;
1366 } 1394 }
1367 1395
1368 $cf::MAP{$key} = $map 1396 $cf::MAP{$path} = $map
1369 } 1397 }
1370} 1398}
1399
1400sub pre_load { }
1401sub post_load { }
1371 1402
1372sub load { 1403sub load {
1373 my ($self) = @_; 1404 my ($self) = @_;
1374 1405
1406 local $self->{deny_reset} = 1; # loading can take a long time
1407
1375 my $path = $self->{path}; 1408 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1409 my $guard = cf::lock_acquire "map_load:$path";
1377 1410
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1411 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1412
1380 $self->in_memory (cf::MAP_LOADING); 1413 $self->in_memory (cf::MAP_LOADING);
1381 1414
1382 $self->alloc; 1415 $self->alloc;
1416
1417 $self->pre_load;
1418
1383 $self->load_objects ($self->{load_path}, 1) 1419 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1420 or return;
1385 1421
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1423 if delete $self->{load_original};
1388 1424
1389 if (my $uniq = $path->uniq_path) { 1425 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1426 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1428 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1429 $self->_load_objects ($uniq, 0);
1394 } 1430 }
1395 } 1431 }
1396 1432
1397 Coro::cede; 1433 Coro::cede;
1398 1434
1399 # now do the right thing for maps 1435 # now do the right thing for maps
1400 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1401 1437
1402 if ($self->{path}->is_style_map) { 1438 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1439 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1440 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1441 $self->update_buttons;
1442 Coro::cede;
1409 $self->set_darkness_map; 1443 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1444 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1445 unless $self->difficulty;
1446 Coro::cede;
1412 $self->activate; 1447 $self->activate;
1413 } 1448 }
1414 1449
1415 Coro::cede; 1450 $self->post_load;
1416 1451
1417 $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
1418} 1462}
1419 1463
1420# 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
1421sub load_diag { 1465sub load_diag {
1422 my ($map) = @_; 1466 my ($map) = @_;
… …
1452 1496
1453 cf::sync_job { $map->load }; 1497 cf::sync_job { $map->load };
1454} 1498}
1455 1499
1456our %MAP_PREFETCH; 1500our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1501our $MAP_PREFETCHER = undef;
1458 while () {
1459 while (%MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path
1465 or next;
1466 $map->load;
1467 }
1468 Coro::schedule;
1469 }
1470};
1471 1502
1472sub find_async { 1503sub find_async {
1473 my ($path, $origin) = @_; 1504 my ($path, $origin) = @_;
1474 1505
1475 $path = new cf::path $path, $origin && $origin->path; 1506 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1507
1478 if (my $map = $cf::MAP{$key}) { 1508 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1509 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1510 }
1481 1511
1482 $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 };
1483 $MAP_PREFETCHER->ready; 1525 $MAP_PREFETCHER->prio (6);
1484 1526
1485 () 1527 ()
1486} 1528}
1487 1529
1488sub save { 1530sub save {
… …
1492 1534
1493 $self->{last_save} = $cf::RUNTIME; 1535 $self->{last_save} = $cf::RUNTIME;
1494 1536
1495 return unless $self->dirty; 1537 return unless $self->dirty;
1496 1538
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1539 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1540 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1541
1500 $self->{load_path} = $save; 1542 $self->{load_path} = $save;
1501 1543
1502 return if $self->{deny_save}; 1544 return if $self->{deny_save};
1503 1545
… …
1506 cf::async { 1548 cf::async {
1507 $_->contr->save for $self->players; 1549 $_->contr->save for $self->players;
1508 }; 1550 };
1509 1551
1510 if ($uniq) { 1552 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1553 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1554 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1555 } else {
1514 $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);
1515 } 1557 }
1516} 1558}
1517 1559
1518sub swap_out { 1560sub swap_out {
1519 my ($self) = @_; 1561 my ($self) = @_;
… …
1533 1575
1534sub reset_at { 1576sub reset_at {
1535 my ($self) = @_; 1577 my ($self) = @_;
1536 1578
1537 # TODO: safety, remove and allow resettable per-player maps 1579 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1580 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1581 return 1e99 if $self->{deny_reset};
1540 1582
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1583 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 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;
1543 1585
… …
1548 my ($self) = @_; 1590 my ($self) = @_;
1549 1591
1550 $self->reset_at <= $cf::RUNTIME 1592 $self->reset_at <= $cf::RUNTIME
1551} 1593}
1552 1594
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 1595sub reset {
1575 my ($self) = @_; 1596 my ($self) = @_;
1576 1597
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1598 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1599
1579 return if $self->players; 1600 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1601 return if $self->isa ("ext::map_per_player");#d#
1581 1602
1582 warn "resetting map ", $self->path;#d# 1603 warn "resetting map ", $self->path;#d#
1583 1604
1584 delete $cf::MAP{$self->path}; 1605 delete $cf::MAP{$self->path};
1606
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear;
1585 1609
1586 $_->clear_links_to ($self) for values %cf::MAP; 1610 $_->clear_links_to ($self) for values %cf::MAP;
1587 1611
1588 $self->unlink_save; 1612 $self->unlink_save;
1589 $self->destroy; 1613 $self->destroy;
… …
1592my $nuke_counter = "aaaa"; 1616my $nuke_counter = "aaaa";
1593 1617
1594sub nuke { 1618sub nuke {
1595 my ($self) = @_; 1619 my ($self) = @_;
1596 1620
1621 delete $cf::MAP{$self->path};
1622
1623 $self->unlink_save;
1624
1625 bless $self, "cf::map";
1626 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1627 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1628 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1629 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1630
1631 $cf::MAP{$self->path} = $self;
1632
1600 $self->reset; # polite request, might not happen 1633 $self->reset; # polite request, might not happen
1601} 1634}
1602 1635
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1636=item cf::map::unique_maps
1614 1637
1615Returns an arrayref of cf::path's of all shared maps that have 1638Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1639instantiated unique items. May block.
1617 1640
1618=cut 1641=cut
1619 1642
1620sub unique_maps() { 1643sub unique_maps() {
… …
1626 for (@$files) { 1649 for (@$files) {
1627 utf8::decode $_; 1650 utf8::decode $_;
1628 next if /\.pst$/; 1651 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1652 next unless /^$PATH_SEP/o;
1630 1653
1631 push @paths, new cf::path $_; 1654 push @paths, cf::map::normalise $_;
1632 } 1655 }
1633 1656
1634 \@paths 1657 \@paths
1635} 1658}
1636 1659
… …
1711 1734
1712=item $player_object->enter_link 1735=item $player_object->enter_link
1713 1736
1714Freezes 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}>).
1715 1738
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1740I<MUST> call C<leave_link> as soon as possible, though.
1718 1741
1742Will never block.
1743
1719=item $player_object->leave_link ($map, $x, $y) 1744=item $player_object->leave_link ($map, $x, $y)
1720 1745
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1749fails, to the emergency map position.
1725 1750
1726Might block. 1751Might block.
1727 1752
1728=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}
1729 1764
1730sub cf::object::player::enter_link { 1765sub cf::object::player::enter_link {
1731 my ($self) = @_; 1766 my ($self) = @_;
1732 1767
1733 $self->deactivate_recursive; 1768 $self->deactivate_recursive;
1734 1769
1735 return if $self->map == $LINK_MAP; 1770 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1771
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1773 if $self->map;
1739 1774
1740 $self->enter_map ($LINK_MAP, 20, 20); 1775 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1776}
1742 1777
1743sub cf::object::player::leave_link { 1778sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1779 my ($self, $map, $x, $y) = @_;
1745 1780
… …
1809=cut 1844=cut
1810 1845
1811sub cf::object::player::goto { 1846sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1847 my ($self, $path, $x, $y) = @_;
1813 1848
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1849 $self->enter_link;
1817 1850
1818 (async { 1851 (async {
1852 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 1853 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1854 $map = $map->customise_for ($self) if $map;
1821 1855 $map
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1856 } or
1823# if $map;
1824
1825 $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);
1826 1858
1827 $self->leave_link ($map, $x, $y); 1859 $self->leave_link ($map, $x, $y);
1828 })->prio (1); 1860 })->prio (1);
1829} 1861}
1830 1862
… …
1834 1866
1835sub parse_random_map_params { 1867sub parse_random_map_params {
1836 my ($spec) = @_; 1868 my ($spec) = @_;
1837 1869
1838 my $rmp = { # defaults 1870 my $rmp = { # defaults
1839 xsize => 10, 1871 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1872 ysize => (cf::rndm 15, 40),
1873 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1874 #layout => string,
1841 }; 1875 };
1842 1876
1843 for (split /\n/, $spec) { 1877 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1878 my ($k, $v) = split /\s+/, $_, 2;
1845 1879
… …
1849 $rmp 1883 $rmp
1850} 1884}
1851 1885
1852sub prepare_random_map { 1886sub prepare_random_map {
1853 my ($exit) = @_; 1887 my ($exit) = @_;
1888
1889 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1890
1855 # all this does is basically replace the /! path by 1891 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1892 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1893 # that depends on the exit object
1858 1894
1859 my $rmp = parse_random_map_params $exit->msg; 1895 my $rmp = parse_random_map_params $exit->msg;
1860 1896
1861 if ($exit->map) { 1897 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 1898 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 1899 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 1900 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 1901 $rmp->{origin_y} = $exit->y;
1866 } 1902 }
1867 1903
1868 $rmp->{random_seed} ||= $exit->random_seed; 1904 $rmp->{random_seed} ||= $exit->random_seed;
1869 1905
1870 my $data = cf::to_json $rmp; 1906 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1907 my $md5 = Digest::MD5::md5_hex $data;
1908 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1909
1873 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) {
1874 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;
1875 1914
1876 $exit->slaying ("?random/$md5"); 1915 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1916 $exit->msg (undef);
1878 } 1917 }
1879} 1918}
1880 1919
1881sub cf::object::player::enter_exit { 1920sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1921 my ($self, $exit) = @_;
1883 1922
1884 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;
1885 1933
1886 $self->enter_link; 1934 $self->enter_link;
1887 1935
1888 (async { 1936 (async {
1889 $self->deactivate_recursive; # just to be sure 1937 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1938 unless (eval {
1891 prepare_random_map $exit 1939 $self->goto ($slaying, $hp, $sp);
1892 if $exit->slaying eq "/!";
1893
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1940
1897 1; 1941 1;
1898 }) { 1942 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1943 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "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. "
… …
1961 # get handled first 2005 # get handled first
1962 my $queue = delete $ns->{query_queue} 2006 my $queue = delete $ns->{query_queue}
1963 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
1964 2008
1965 (shift @$queue)->[1]->($msg); 2009 (shift @$queue)->[1]->($msg);
2010 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2011
1967 push @{ $ns->{query_queue} }, @$queue; 2012 push @{ $ns->{query_queue} }, @$queue;
1968 2013
1969 if (@{ $ns->{query_queue} } == @$queue) { 2014 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2015 if (@$queue) {
… …
2189 sub db_sync() { 2234 sub db_sync() {
2190 db_save if $dirty; 2235 db_save if $dirty;
2191 undef $dirty; 2236 undef $dirty;
2192 } 2237 }
2193 2238
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2239 my $idle = Event->idle (
2195 db_sync; 2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2196 }); 2246 );
2197 2247
2198 sub db_dirty() { 2248 sub db_dirty() {
2199 $dirty = 1; 2249 $dirty = 1;
2200 $idle->start; 2250 $idle->start;
2201 } 2251 }
… …
2222 }, 2272 },
2223 ); 2273 );
2224} 2274}
2225 2275
2226############################################################################# 2276#############################################################################
2227# 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}
2228 2283
2229sub cfg_load { 2284sub cfg_load {
2230 open my $fh, "<:utf8", cf::confdir . "/config" 2285 open my $fh, "<:utf8", cf::confdir . "/config"
2231 or return; 2286 or return;
2232 2287
… …
2245 }; 2300 };
2246 warn $@ if $@; 2301 warn $@ if $@;
2247 } 2302 }
2248} 2303}
2249 2304
2305sub init {
2306 load_resources;
2307}
2308
2250sub main { 2309sub main {
2251 # we must not ever block the main coroutine 2310 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2311 local $Coro::idle = sub {
2253 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 {
2254 async { Event::one_event }; 2314 Event::one_event;
2315 })->prio (Coro::PRIO_MAX);
2255 }; 2316 };
2256 2317
2257 cfg_load; 2318 cfg_load;
2258 db_load; 2319 db_load;
2259 load_extensions; 2320 load_extensions;
2321
2322 $TICK_WATCHER->start;
2260 Event::loop; 2323 Event::loop;
2261} 2324}
2262 2325
2263############################################################################# 2326#############################################################################
2264# initialisation and cleanup 2327# initialisation and cleanup
2265 2328
2266# install some emergency cleanup handlers 2329# install some emergency cleanup handlers
2267BEGIN { 2330BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2331 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2332 Event->signal (
2333 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2334 data => WF_AUTOCANCEL,
2271 signal => $signal, 2335 signal => $signal,
2336 prio => 0,
2272 cb => sub { 2337 cb => sub {
2273 cf::cleanup "SIG$signal"; 2338 cf::cleanup "SIG$signal";
2274 }, 2339 },
2275 ); 2340 );
2276 } 2341 }
2277} 2342}
… …
2282 warn "enter emergency perl save\n"; 2347 warn "enter emergency perl save\n";
2283 2348
2284 cf::sync_job { 2349 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2350 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2351 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2352 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2353 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2354 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2355 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2356 $pl->valid or next;
2292 $pl->save; 2357 $pl->save;
… …
2306} 2371}
2307 2372
2308sub reload() { 2373sub reload() {
2309 # can/must only be called in main 2374 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2375 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2376 warn "can only reload from main coroutine";
2312 return; 2377 return;
2313 } 2378 }
2314 2379
2315 warn "reloading..."; 2380 warn "reloading...";
2316 2381
2317 warn "freezing server"; 2382 warn "cancelling server ticker";
2318 my $guard = freeze_mainloop; 2383 $TICK_WATCHER->cancel;
2384
2319 cf::emergency_save; 2385 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324 2386
2325 eval { 2387 eval {
2326 # 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
2327 2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392
2328 warn "cancel all watchers"; 2393 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2394 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2395 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2396 }
2332 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
2333 warn "cancel all extension coros"; 2406 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2407 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2408 %EXT_CORO = ();
2336 2409
2337 warn "remove commands"; 2410 warn "removing commands";
2338 %COMMAND = (); 2411 %COMMAND = ();
2339 2412
2340 warn "remove ext commands"; 2413 warn "removing ext commands";
2341 %EXTCMD = (); 2414 %EXTCMD = ();
2342 2415
2343 warn "unload/nuke all extensions"; 2416 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2417 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2418 warn "... unloading $pkg";
2346 2419
2347 if (my $cb = $pkg->can ("unload")) { 2420 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2421 eval {
… …
2353 2426
2354 warn "... nuking $pkg"; 2427 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2428 Symbol::delete_package $pkg;
2356 } 2429 }
2357 2430
2358 warn "unload all perl modules loaded from $LIBDIR"; 2431 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2432 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2433 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2434
2362 warn "removing <$k>"; 2435 warn "... unloading $k";
2363 delete $INC{$k}; 2436 delete $INC{$k};
2364 2437
2365 $k =~ s/\.pm$//; 2438 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2439 $k =~ s/\//::/g;
2367 2440
… …
2370 } 2443 }
2371 2444
2372 Symbol::delete_package $k; 2445 Symbol::delete_package $k;
2373 } 2446 }
2374 2447
2375 warn "get rid of safe::, as good as possible"; 2448 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2449 Symbol::delete_package "safe::$_"
2377 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);
2378 2451
2379 warn "unload cf.pm \"a bit\""; 2452 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2453 delete $INC{"cf.pm"};
2381 2454
2382 # don't, removes xs symbols, too, 2455 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2456 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2457 #Symbol::delete_package __PACKAGE__;
2385 2458
2459 warn "unload completed, starting to reload now";
2460
2386 warn "reloading cf.pm"; 2461 warn "reloading cf.pm";
2387 require cf; 2462 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2464
2390 warn "load config and database again"; 2465 warn "loading config and database again";
2391 cf::cfg_load; 2466 cf::cfg_load;
2392 cf::db_load; 2467 cf::db_load;
2393 2468
2394 warn "load extensions"; 2469 warn "loading extensions";
2395 cf::load_extensions; 2470 cf::load_extensions;
2396 2471
2397 warn "reattach attachments to objects/players"; 2472 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2473 _global_reattach;
2399 warn "reattach attachments to maps"; 2474 warn "reattaching attachments to maps";
2400 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;
2401 }; 2483 };
2402 2484
2403 if ($@) { 2485 if ($@) {
2404 warn $@; 2486 warn $@;
2405 warn "error while reloading, exiting."; 2487 warn "error while reloading, exiting.";
… …
2407 } 2489 }
2408 2490
2409 warn "reloaded"; 2491 warn "reloaded";
2410}; 2492};
2411 2493
2412############################################################################# 2494our $RELOAD_WATCHER; # used only during reload
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454 2495
2455register_command "reload" => sub { 2496register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2497 my ($who, $arg) = @_;
2457 2498
2458 if ($who->flag (FLAG_WIZ)) { 2499 if ($who->flag (FLAG_WIZ)) {
2459 $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 {
2460 reload; 2510 reload;
2461 $who->message ("end of reload."); 2511 undef $RELOAD_WATCHER;
2512 },
2513 );
2462 } 2514 }
2463}; 2515};
2464 2516
2465unshift @INC, $LIBDIR; 2517unshift @INC, $LIBDIR;
2518
2519my $bug_warning = 0;
2466 2520
2467$TICK_WATCHER = Event->timer ( 2521$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2522 reentrant => 0,
2523 parked => 1,
2469 prio => 0, 2524 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2525 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2472 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
2473 $NOW = Event::time; 2534 $NOW = Event::time;
2474 2535
2475 cf::server_tick; # one server iteration 2536 cf::server_tick; # one server iteration
2476 $RUNTIME += $TICK; 2537 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 2538 $NEXT_TICK += $TICK;
2478 2539
2479 $WAIT_FOR_TICK->broadcast; 2540 $WAIT_FOR_TICK->broadcast;
2480 $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#
2481 2548
2482 # 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
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2484 2551
2485 $TICK_WATCHER->at ($NEXT_TICK); 2552 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 2553 $TICK_WATCHER->start;
2487 }, 2554 },
2488); 2555);
2489 2556
2490IO::AIO::max_poll_time $TICK * 0.2; 2557IO::AIO::max_poll_time $TICK * 0.1;
2491 2558
2492Event->io ( 2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 2562 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2563 poll => 'r',
2495 prio => 5, 2564 prio => 6,
2496 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2566 cb => \&IO::AIO::poll_cb,
2498); 2567);
2499 2568
2500Event->timer ( 2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2501 data => WF_AUTOCANCEL, 2571 data => WF_AUTOCANCEL,
2502 after => 0, 2572 after => 1,
2503 interval => 10, 2573 interval => 10,
2504 cb => sub { 2574 prio => 6, # keep it lowest so it acts like a watchdog
2505 (Coro::unblock_sub { 2575 cb => Coro::unblock_sub {
2506 write_runtime 2576 write_runtime
2507 or warn "ERROR: unable to write runtime file: $!"; 2577 or warn "ERROR: unable to write runtime file: $!";
2508 })->();
2509 }, 2578 },
2510); 2579);
2511 2580
2512END { cf::emergency_save } 2581END { cf::emergency_save }
2513 2582

Diff Legend

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