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.162 by root, Thu Jan 11 00:41:08 2007 UTC vs.
Revision 1.207 by root, Sun Feb 11 22:42:09 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;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
… …
44our @EVENT; 45our @EVENT;
45our $LIBDIR = datadir . "/ext"; 46our $LIBDIR = datadir . "/ext";
46 47
47our $TICK = MAX_TIME * 1e-6; 48our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 49our $TICK_WATCHER;
50our $AIO_POLL_WATCHER;
51our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 52our $NEXT_TICK;
50our $NOW; 53our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off
55
56our $BDB_POLL_WATCHER;
57our $DB_ENV;
51 58
52our %CFG; 59our %CFG;
53 60
54our $UPTIME; $UPTIME ||= time; 61our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 62our $RUNTIME;
56 63
57our %PLAYER; # all users 64our %PLAYER; # all users
58our %MAP; # all maps 65our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 66our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 67our $RANDOM_MAPS = cf::localdir . "/random";
68our $BDB_ENV_DIR = cf::localdir . "/db";
61 69
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 70our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 71our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
72
73# used to convert map paths into valid unix filenames by replacing / by ∕
74our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 75
65binmode STDOUT; 76binmode STDOUT;
66binmode STDERR; 77binmode STDERR;
67 78
68# read virtual server time, if available 79# read virtual server time, if available
… …
75mkdir cf::localdir; 86mkdir cf::localdir;
76mkdir cf::localdir . "/" . cf::playerdir; 87mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 88mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 89mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 90mkdir $RANDOM_MAPS;
91mkdir $BDB_ENV_DIR;
80 92
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 93our $EMERGENCY_POSITION;
94
95sub cf::map::normalise;
84 96
85############################################################################# 97#############################################################################
86 98
87=head2 GLOBAL VARIABLES 99=head2 GLOBAL VARIABLES
88 100
… …
256} 268}
257 269
258sub freeze_mainloop { 270sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 271 return unless $TICK_WATCHER->is_active;
260 272
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 273 my $guard = Coro::guard {
274 $TICK_WATCHER->start;
275 $WRITE_RUNTIME_WATCHER->start;
276 };
277 $WRITE_RUNTIME_WATCHER->stop;
262 $TICK_WATCHER->stop; 278 $TICK_WATCHER->stop;
263 $guard 279 $guard
264} 280}
265 281
266=item cf::async { BLOCK } 282=item cf::async { BLOCK }
… …
342 my $runtime = cf::localdir . "/runtime"; 358 my $runtime = cf::localdir . "/runtime";
343 359
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 361 or return;
346 362
363 my $value = $cf::RUNTIME + 90 + 10;
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 364 # 10 is the runtime save interval, for a monotonic clock
365 # 60 allows for the watchdog to kill the server.
366
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 367 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 368 and return;
350 369
370 # always fsync - this file is important
351 aio_fsync $fh 371 aio_fsync $fh
352 and return; 372 and return;
353 373
354 close $fh 374 close $fh
355 or return; 375 or return;
… …
361} 381}
362 382
363=back 383=back
364 384
365=cut 385=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 386
523############################################################################# 387#############################################################################
524 388
525=head2 ATTACHABLE OBJECTS 389=head2 ATTACHABLE OBJECTS
526 390
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 516our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 517our @CB_MAP = ();
654 518
655my %attachment; 519my %attachment;
656 520
521sub cf::attachable::thawer_merge {
522 # simply override everything except _meta
523 local $_[0]{_meta};
524 %{$_[0]} = %{$_[1]};
525}
526
657sub _attach_cb($$$$) { 527sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 528 my ($registry, $event, $prio, $cb) = @_;
659 529
660 use sort 'stable'; 530 use sort 'stable';
661 531
… …
832# object support 702# object support
833 703
834sub reattach { 704sub reattach {
835 # basically do the same as instantiate, without calling instantiate 705 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 706 my ($obj) = @_;
707
708 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 709
838 my $registry = $obj->registry; 710 my $registry = $obj->registry;
839 711
840 @$registry = (); 712 @$registry = ();
841 713
… …
888 $filename, length $$rdata, scalar @$objs; 760 $filename, length $$rdata, scalar @$objs;
889 761
890 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 762 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
891 chmod SAVE_MODE, $fh; 763 chmod SAVE_MODE, $fh;
892 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 764 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
893 aio_fsync $fh; 765 aio_fsync $fh if $cf::USE_FSYNC;
894 close $fh; 766 close $fh;
895 767
896 if (@$objs) { 768 if (@$objs) {
897 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 769 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
898 chmod SAVE_MODE, $fh; 770 chmod SAVE_MODE, $fh;
899 my $data = Storable::nfreeze { version => 1, objs => $objs }; 771 my $data = Storable::nfreeze { version => 1, objs => $objs };
900 aio_write $fh, 0, (length $data), $data, 0; 772 aio_write $fh, 0, (length $data), $data, 0;
901 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
902 close $fh; 774 close $fh;
903 aio_rename "$filename.pst~", "$filename.pst"; 775 aio_rename "$filename.pst~", "$filename.pst";
904 } 776 }
905 } else { 777 } else {
906 aio_unlink "$filename.pst"; 778 aio_unlink "$filename.pst";
… …
912 } 784 }
913 } else { 785 } else {
914 aio_unlink $filename; 786 aio_unlink $filename;
915 aio_unlink "$filename.pst"; 787 aio_unlink "$filename.pst";
916 } 788 }
789
790 #d##TODO# nuke non .map-files if exist
791 if ($filename =~ s/\.map$//) {
792 aio_unlink $filename;
793 aio_unlink "$filename.pst";
794 }
917 } 795 }
918} 796}
919 797
920sub object_freezer_as_string { 798sub object_freezer_as_string {
921 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
927 805
928sub object_thawer_load { 806sub object_thawer_load {
929 my ($filename) = @_; 807 my ($filename) = @_;
930 808
931 my ($data, $av); 809 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
932 813
933 (aio_load $filename, $data) >= 0 814 (aio_load $filename, $data) >= 0
934 or return; 815 or return;
935 816
936 unless (aio_stat "$filename.pst") { 817 unless (aio_stat "$filename.pst") {
… …
1028 "package $pkg; use strict; use utf8;\n" 909 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 910 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 911 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 912 . "\n};\n1";
1032 913
1033 eval $source 914 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 915 my $msg = $@ ? "$path: $@\n"
1035 : "extension disabled.\n"; 916 : "extension disabled.\n";
917 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
918 warn $@;
919 warn "mandatory extension failed to load, exiting.\n";
920 exit 1;
921 }
922 die $@;
923 }
1036 924
1037 push @EXTS, $pkg; 925 push @EXTS, $pkg;
1038} 926}
1039 927
1040sub load_extensions { 928sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 934 } or warn "$ext not loaded: $@";
1047 } 935 }
1048} 936}
1049 937
1050############################################################################# 938#############################################################################
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 939
1066=head2 CORE EXTENSIONS 940=head2 CORE EXTENSIONS
1067 941
1068Functions and methods that extend core crossfire objects. 942Functions and methods that extend core crossfire objects.
1069 943
… …
1105 979
1106sub exists($) { 980sub exists($) {
1107 my ($login) = @_; 981 my ($login) = @_;
1108 982
1109 $cf::PLAYER{$login} 983 $cf::PLAYER{$login}
1110 or cf::sync_job { !aio_stat $login } 984 or cf::sync_job { !aio_stat path $login }
1111} 985}
1112 986
1113sub find($) { 987sub find($) {
1114 return $cf::PLAYER{$_[0]} || do { 988 return $cf::PLAYER{$_[0]} || do {
1115 my $login = $_[0]; 989 my $login = $_[0];
… …
1205 \@logins 1079 \@logins
1206} 1080}
1207 1081
1208=item $player->maps 1082=item $player->maps
1209 1083
1210Returns an arrayref of cf::path's of all maps that are private for this 1084Returns an arrayref of map paths that are private for this
1211player. May block. 1085player. May block.
1212 1086
1213=cut 1087=cut
1214 1088
1215sub maps($) { 1089sub maps($) {
1216 my ($pl) = @_; 1090 my ($pl) = @_;
1091
1092 $pl = ref $pl ? $pl->ob->name : $pl;
1217 1093
1218 my $files = aio_readdir playerdir $pl 1094 my $files = aio_readdir playerdir $pl
1219 or return; 1095 or return;
1220 1096
1221 my @paths; 1097 my @paths;
… …
1223 for (@$files) { 1099 for (@$files) {
1224 utf8::decode $_; 1100 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1101 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1102 next unless /^$PATH_SEP/o;
1227 1103
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1104 push @paths, cf::map::normalise "~$pl/$_";
1229 } 1105 }
1230 1106
1231 \@paths 1107 \@paths
1232} 1108}
1233 1109
… …
1259package cf::map; 1135package cf::map;
1260 1136
1261use Fcntl; 1137use Fcntl;
1262use Coro::AIO; 1138use Coro::AIO;
1263 1139
1140use overload
1141 '""' => \&as_string,
1142 fallback => 1;
1143
1264our $MAX_RESET = 3600; 1144our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1145our $DEFAULT_RESET = 3000;
1266 1146
1267sub generate_random_map { 1147sub generate_random_map {
1268 my ($path, $rmp) = @_; 1148 my ($self, $rmp) = @_;
1269
1270 # mit "rum" bekleckern, nicht 1149 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1150 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1154 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1155 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1161 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1162 )
1285} 1163}
1286 1164
1165=item cf::map->register ($regex, $prio)
1166
1167Register a handler for the map path matching the given regex at the
1168givne priority (higher is better, built-in handlers have priority 0, the
1169default).
1170
1171=cut
1172
1173sub register {
1174 my (undef, $regex, $prio) = @_;
1175 my $pkg = caller;
1176
1177 no strict;
1178 push @{"$pkg\::ISA"}, __PACKAGE__;
1179
1180 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1181}
1182
1183# also paths starting with '/'
1184$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1185
1186sub thawer_merge {
1187 my ($self, $merge) = @_;
1188
1189 # we have to keep some variables in memory intact
1190 local $self->{path};
1191 local $self->{load_path};
1192 local $self->{deny_save};
1193 local $self->{deny_reset};
1194
1195 $self->SUPER::thawer_merge ($merge);
1196}
1197
1198sub normalise {
1199 my ($path, $base) = @_;
1200
1201 $path = "$path"; # make sure its a string
1202
1203 $path =~ s/\.map$//;
1204
1205 # map plan:
1206 #
1207 # /! non-realised random map exit (special hack!)
1208 # {... are special paths that are not being touched
1209 # ?xxx/... are special absolute paths
1210 # ?random/... random maps
1211 # /... normal maps
1212 # ~user/... per-player map of a specific user
1213
1214 $path =~ s/$PATH_SEP/\//go;
1215
1216 # treat it as relative path if it starts with
1217 # something that looks reasonable
1218 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1219 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1220
1221 $base =~ s{[^/]+/?$}{};
1222 $path = "$base/$path";
1223 }
1224
1225 for ($path) {
1226 redo if s{//}{/};
1227 redo if s{/\.?/}{/};
1228 redo if s{/[^/]+/\.\./}{/};
1229 }
1230
1231 $path
1232}
1233
1234sub new_from_path {
1235 my (undef, $path, $base) = @_;
1236
1237 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1238
1239 $path = normalise $path, $base;
1240
1241 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1242 if ($path =~ $EXT_MAP{$pkg}[1]) {
1243 my $self = bless cf::map::new, $pkg;
1244 $self->{path} = $path; $self->path ($path);
1245 $self->init; # pass $1 etc.
1246 return $self;
1247 }
1248 }
1249
1250 Carp::carp "unable to resolve path '$path' (base '$base').";
1251 ()
1252}
1253
1254sub init {
1255 my ($self) = @_;
1256
1257 $self
1258}
1259
1260sub as_string {
1261 my ($self) = @_;
1262
1263 "$self->{path}"
1264}
1265
1266# the displayed name, this is a one way mapping
1267sub visible_name {
1268 &as_string
1269}
1270
1271# the original (read-only) location
1272sub load_path {
1273 my ($self) = @_;
1274
1275 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1276}
1277
1278# the temporary/swap location
1279sub save_path {
1280 my ($self) = @_;
1281
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1284}
1285
1286# the unique path, undef == no special unique path
1287sub uniq_path {
1288 my ($self) = @_;
1289
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1292}
1293
1287# and all this just because we cannot iterate over 1294# and all this just because we cannot iterate over
1288# all maps in C++... 1295# all maps in C++...
1289sub change_all_map_light { 1296sub change_all_map_light {
1290 my ($change) = @_; 1297 my ($change) = @_;
1291 1298
1292 $_->change_map_light ($change) 1299 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1300 for grep $_->outdoor, values %cf::MAP;
1294} 1301}
1295 1302
1303sub unlink_save {
1304 my ($self) = @_;
1305
1306 utf8::encode (my $save = $self->save_path);
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1309
1310 #d#TODO remove .map and also nuke
1311 $save =~ s/\.map// or return;#d#
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1314}
1315
1296sub load_map_header($) { 1316sub load_header_from($) {
1297 my ($path) = @_; 1317 my ($self, $path) = @_;
1298 1318
1299 utf8::encode $path; 1319 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1320 #aio_open $path, O_RDONLY, 0
1321 # or return;
1322
1323 $self->_load_header ($path)
1301 or return; 1324 or return;
1302 1325
1303 my $map = cf::map::new 1326 $self->{load_path} = $path;
1327
1328 1
1329}
1330
1331sub load_header_orig {
1332 my ($self) = @_;
1333
1334 $self->load_header_from ($self->load_path)
1335}
1336
1337sub load_header_temp {
1338 my ($self) = @_;
1339
1340 $self->load_header_from ($self->save_path)
1341}
1342
1343sub prepare_temp {
1344 my ($self) = @_;
1345
1346 $self->last_access ((delete $self->{last_access})
1347 || $cf::RUNTIME); #d#
1348 # safety
1349 $self->{instantiate_time} = $cf::RUNTIME
1350 if $self->{instantiate_time} > $cf::RUNTIME;
1351}
1352
1353sub prepare_orig {
1354 my ($self) = @_;
1355
1356 $self->{load_original} = 1;
1357 $self->{instantiate_time} = $cf::RUNTIME;
1358 $self->last_access ($cf::RUNTIME);
1359 $self->instantiate;
1360}
1361
1362sub load_header {
1363 my ($self) = @_;
1364
1365 if ($self->load_header_temp) {
1366 $self->prepare_temp;
1367 } else {
1368 $self->load_header_orig
1304 or return; 1369 or return;
1370 $self->prepare_orig;
1371 }
1305 1372
1306 # for better error messages only, will be overwritten later 1373 1
1307 $map->path ($path);
1308
1309 $map->load_header ($path)
1310 or return;
1311
1312 $map->{load_path} = $path;
1313
1314 $map
1315} 1374}
1316 1375
1317sub find; 1376sub find;
1318sub find { 1377sub find {
1319 my ($path, $origin) = @_; 1378 my ($path, $origin) = @_;
1320 1379
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1380 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1381
1326 cf::lock_wait "map_find:$key"; 1382 cf::lock_wait "map_find:$path";
1327 1383
1328 $cf::MAP{$key} || do { 1384 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1385 my $guard = cf::lock_acquire "map_find:$path";
1330 1386 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; 1387 or return;
1345 1388
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; 1389 $map->{last_save} = $cf::RUNTIME;
1358 1390
1359 Coro::cede; 1391 $map->load_header
1392 or return;
1360 1393
1361 if ($map->should_reset) { 1394 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1395 # doing this can freeze the server in a sync job, obviously
1396 #$cf::WAIT_FOR_TICK->wait;
1362 $map->reset; 1397 $map->reset;
1363 undef $guard; 1398 undef $guard;
1364 $map = find $path 1399 return find $path;
1365 or return;
1366 } 1400 }
1367 1401
1368 $cf::MAP{$key} = $map 1402 $cf::MAP{$path} = $map
1369 } 1403 }
1370} 1404}
1405
1406sub pre_load { }
1407sub post_load { }
1371 1408
1372sub load { 1409sub load {
1373 my ($self) = @_; 1410 my ($self) = @_;
1374 1411
1412 local $self->{deny_reset} = 1; # loading can take a long time
1413
1375 my $path = $self->{path}; 1414 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1415 my $guard = cf::lock_acquire "map_load:$path";
1377 1416
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1417 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1418
1380 $self->in_memory (cf::MAP_LOADING); 1419 $self->in_memory (cf::MAP_LOADING);
1381 1420
1382 $self->alloc; 1421 $self->alloc;
1422
1423 $self->pre_load;
1424
1383 $self->load_objects ($self->{load_path}, 1) 1425 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1426 or return;
1385 1427
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1428 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1429 if delete $self->{load_original};
1388 1430
1389 if (my $uniq = $path->uniq_path) { 1431 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1432 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1433 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1434 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1435 $self->_load_objects ($uniq, 0);
1394 } 1436 }
1395 } 1437 }
1396 1438
1397 Coro::cede; 1439 Coro::cede;
1398 1440
1399 # now do the right thing for maps 1441 # now do the right thing for maps
1400 $self->link_multipart_objects; 1442 $self->link_multipart_objects;
1401 1443
1402 if ($self->{path}->is_style_map) { 1444 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1445 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1446 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1447 $self->update_buttons;
1448 Coro::cede;
1409 $self->set_darkness_map; 1449 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1450 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1451 unless $self->difficulty;
1452 Coro::cede;
1412 $self->activate; 1453 $self->activate;
1413 } 1454 }
1414 1455
1415 Coro::cede; 1456 $self->post_load;
1416 1457
1417 $self->in_memory (cf::MAP_IN_MEMORY); 1458 $self->in_memory (cf::MAP_IN_MEMORY);
1459}
1460
1461sub customise_for {
1462 my ($self, $ob) = @_;
1463
1464 return find "~" . $ob->name . "/" . $self->{path}
1465 if $self->per_player;
1466
1467 $self
1418} 1468}
1419 1469
1420# find and load all maps in the 3x3 area around a map 1470# find and load all maps in the 3x3 area around a map
1421sub load_diag { 1471sub load_diag {
1422 my ($map) = @_; 1472 my ($map) = @_;
… …
1452 1502
1453 cf::sync_job { $map->load }; 1503 cf::sync_job { $map->load };
1454} 1504}
1455 1505
1456our %MAP_PREFETCH; 1506our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1507our $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 1508
1472sub find_async { 1509sub find_async {
1473 my ($path, $origin) = @_; 1510 my ($path, $origin) = @_;
1474 1511
1475 $path = new cf::path $path, $origin && $origin->path; 1512 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1513
1478 if (my $map = $cf::MAP{$key}) { 1514 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1515 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1516 }
1481 1517
1482 $MAP_PREFETCH{$key} = $path; 1518 undef $MAP_PREFETCH{$path};
1519 $MAP_PREFETCHER ||= cf::async {
1520 while (%MAP_PREFETCH) {
1521 for my $path (keys %MAP_PREFETCH) {
1522 my $map = find $path
1523 or next;
1524 $map->load;
1525
1526 delete $MAP_PREFETCH{$path};
1527 }
1528 }
1529 undef $MAP_PREFETCHER;
1530 };
1483 $MAP_PREFETCHER->ready; 1531 $MAP_PREFETCHER->prio (6);
1484 1532
1485 () 1533 ()
1486} 1534}
1487 1535
1488sub save { 1536sub save {
… …
1492 1540
1493 $self->{last_save} = $cf::RUNTIME; 1541 $self->{last_save} = $cf::RUNTIME;
1494 1542
1495 return unless $self->dirty; 1543 return unless $self->dirty;
1496 1544
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1545 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1546 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1547
1500 $self->{load_path} = $save; 1548 $self->{load_path} = $save;
1501 1549
1502 return if $self->{deny_save}; 1550 return if $self->{deny_save};
1503 1551
… …
1506 cf::async { 1554 cf::async {
1507 $_->contr->save for $self->players; 1555 $_->contr->save for $self->players;
1508 }; 1556 };
1509 1557
1510 if ($uniq) { 1558 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1559 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1560 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1561 } else {
1514 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1562 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1515 } 1563 }
1516} 1564}
1517 1565
1518sub swap_out { 1566sub swap_out {
1519 my ($self) = @_; 1567 my ($self) = @_;
… …
1533 1581
1534sub reset_at { 1582sub reset_at {
1535 my ($self) = @_; 1583 my ($self) = @_;
1536 1584
1537 # TODO: safety, remove and allow resettable per-player maps 1585 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1586 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1587 return 1e99 if $self->{deny_reset};
1540 1588
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1589 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1590 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1543 1591
… …
1548 my ($self) = @_; 1596 my ($self) = @_;
1549 1597
1550 $self->reset_at <= $cf::RUNTIME 1598 $self->reset_at <= $cf::RUNTIME
1551} 1599}
1552 1600
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 { 1601sub reset {
1575 my ($self) = @_; 1602 my ($self) = @_;
1576 1603
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1604 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1605
1579 return if $self->players; 1606 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1607 return if $self->isa ("ext::map_per_player");#d#
1581 1608
1582 warn "resetting map ", $self->path;#d# 1609 warn "resetting map ", $self->path;#d#
1583 1610
1584 delete $cf::MAP{$self->path}; 1611 delete $cf::MAP{$self->path};
1612
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear;
1585 1615
1586 $_->clear_links_to ($self) for values %cf::MAP; 1616 $_->clear_links_to ($self) for values %cf::MAP;
1587 1617
1588 $self->unlink_save; 1618 $self->unlink_save;
1589 $self->destroy; 1619 $self->destroy;
… …
1592my $nuke_counter = "aaaa"; 1622my $nuke_counter = "aaaa";
1593 1623
1594sub nuke { 1624sub nuke {
1595 my ($self) = @_; 1625 my ($self) = @_;
1596 1626
1627 delete $cf::MAP{$self->path};
1628
1629 $self->unlink_save;
1630
1631 bless $self, "cf::map";
1632 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1633 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1634 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1635 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1636
1637 $cf::MAP{$self->path} = $self;
1638
1600 $self->reset; # polite request, might not happen 1639 $self->reset; # polite request, might not happen
1601} 1640}
1602 1641
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 1642=item cf::map::unique_maps
1614 1643
1615Returns an arrayref of cf::path's of all shared maps that have 1644Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1645instantiated unique items. May block.
1617 1646
1618=cut 1647=cut
1619 1648
1620sub unique_maps() { 1649sub unique_maps() {
… …
1626 for (@$files) { 1655 for (@$files) {
1627 utf8::decode $_; 1656 utf8::decode $_;
1628 next if /\.pst$/; 1657 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1658 next unless /^$PATH_SEP/o;
1630 1659
1631 push @paths, new cf::path $_; 1660 push @paths, cf::map::normalise $_;
1632 } 1661 }
1633 1662
1634 \@paths 1663 \@paths
1635} 1664}
1636 1665
… …
1711 1740
1712=item $player_object->enter_link 1741=item $player_object->enter_link
1713 1742
1714Freezes the player and moves him/her to a special map (C<{link}>). 1743Freezes the player and moves him/her to a special map (C<{link}>).
1715 1744
1716The player should be reaosnably safe there for short amounts of time. You 1745The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1746I<MUST> call C<leave_link> as soon as possible, though.
1718 1747
1748Will never block.
1749
1719=item $player_object->leave_link ($map, $x, $y) 1750=item $player_object->leave_link ($map, $x, $y)
1720 1751
1721Moves the player out of the specila link map onto the given map. If the 1752Moves 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 1753map. 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, 1754to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1755fails, to the emergency map position.
1725 1756
1726Might block. 1757Might block.
1727 1758
1728=cut 1759=cut
1760
1761sub link_map {
1762 unless ($LINK_MAP) {
1763 $LINK_MAP = cf::map::find "{link}"
1764 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1765 $LINK_MAP->load;
1766 }
1767
1768 $LINK_MAP
1769}
1729 1770
1730sub cf::object::player::enter_link { 1771sub cf::object::player::enter_link {
1731 my ($self) = @_; 1772 my ($self) = @_;
1732 1773
1733 $self->deactivate_recursive; 1774 $self->deactivate_recursive;
1734 1775
1735 return if $self->map == $LINK_MAP; 1776 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1777
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1779 if $self->map;
1739 1780
1740 $self->enter_map ($LINK_MAP, 20, 20); 1781 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1782}
1742 1783
1743sub cf::object::player::leave_link { 1784sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1785 my ($self, $map, $x, $y) = @_;
1745 1786
… …
1809=cut 1850=cut
1810 1851
1811sub cf::object::player::goto { 1852sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1813 1854
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1855 $self->enter_link;
1817 1856
1818 (async { 1857 (async {
1858 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 1859 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1821 1861 $map
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1823# if $map;
1824
1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1826 1864
1827 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1828 })->prio (1); 1866 })->prio (1);
1829} 1867}
1830 1868
… …
1834 1872
1835sub parse_random_map_params { 1873sub parse_random_map_params {
1836 my ($spec) = @_; 1874 my ($spec) = @_;
1837 1875
1838 my $rmp = { # defaults 1876 my $rmp = { # defaults
1839 xsize => 10, 1877 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1878 ysize => (cf::rndm 15, 40),
1879 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1880 #layout => string,
1841 }; 1881 };
1842 1882
1843 for (split /\n/, $spec) { 1883 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1884 my ($k, $v) = split /\s+/, $_, 2;
1845 1885
… …
1849 $rmp 1889 $rmp
1850} 1890}
1851 1891
1852sub prepare_random_map { 1892sub prepare_random_map {
1853 my ($exit) = @_; 1893 my ($exit) = @_;
1894
1895 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1896
1855 # all this does is basically replace the /! path by 1897 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1898 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1899 # that depends on the exit object
1858 1900
1859 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1860 1902
1861 if ($exit->map) { 1903 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1866 } 1908 }
1867 1909
1868 $rmp->{random_seed} ||= $exit->random_seed; 1910 $rmp->{random_seed} ||= $exit->random_seed;
1869 1911
1870 my $data = cf::to_json $rmp; 1912 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1913 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1915
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1916 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1917 aio_write $fh, 0, (length $data), $data, 0;
1918 undef $fh;
1919 aio_rename "$meta~", $meta;
1875 1920
1876 $exit->slaying ("?random/$md5"); 1921 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1922 $exit->msg (undef);
1878 } 1923 }
1879} 1924}
1880 1925
1881sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1883 1928
1884 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1930
1931 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job
1933 cf::sync_job { prepare_random_map $exit };
1934 }
1935
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp;
1885 1939
1886 $self->enter_link; 1940 $self->enter_link;
1887 1941
1888 (async { 1942 (async {
1889 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1944 unless (eval {
1891 prepare_random_map $exit 1945 $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 1946
1897 1; 1947 1;
1898 }) { 1948 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "I'll try to bring you back to the map you were before. " 1950 . "I'll try to bring you back to the map you were before. "
… …
1961 # get handled first 2011 # get handled first
1962 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1963 or return; # be conservative, not sure how that can happen, but we saw a crash here 2013 or return; # be conservative, not sure how that can happen, but we saw a crash here
1964 2014
1965 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2017
1967 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1968 2019
1969 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2021 if (@$queue) {
… …
2189 sub db_sync() { 2240 sub db_sync() {
2190 db_save if $dirty; 2241 db_save if $dirty;
2191 undef $dirty; 2242 undef $dirty;
2192 } 2243 }
2193 2244
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2245 my $idle = Event->idle (
2195 db_sync; 2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2196 }); 2252 );
2197 2253
2198 sub db_dirty() { 2254 sub db_dirty() {
2199 $dirty = 1; 2255 $dirty = 1;
2200 $idle->start; 2256 $idle->start;
2201 } 2257 }
… …
2222 }, 2278 },
2223 ); 2279 );
2224} 2280}
2225 2281
2226############################################################################# 2282#############################################################################
2227# the server's main() 2283# the server's init and main functions
2284
2285sub load_resources {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2287 or die "unable to load regions file\n";#d#
2288}
2228 2289
2229sub cfg_load { 2290sub cfg_load {
2230 open my $fh, "<:utf8", cf::confdir . "/config" 2291 open my $fh, "<:utf8", cf::confdir . "/config"
2231 or return; 2292 or return;
2232 2293
… …
2245 }; 2306 };
2246 warn $@ if $@; 2307 warn $@ if $@;
2247 } 2308 }
2248} 2309}
2249 2310
2311sub init {
2312 load_resources;
2313}
2314
2250sub main { 2315sub main {
2251 # we must not ever block the main coroutine 2316 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2317 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2318 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2319 (async {
2254 async { Event::one_event }; 2320 Event::one_event;
2321 })->prio (Coro::PRIO_MAX);
2255 }; 2322 };
2256 2323
2257 cfg_load; 2324 cfg_load;
2258 db_load; 2325 db_load;
2259 load_extensions; 2326 load_extensions;
2327
2328 $TICK_WATCHER->start;
2260 Event::loop; 2329 Event::loop;
2261} 2330}
2262 2331
2263############################################################################# 2332#############################################################################
2264# initialisation and cleanup 2333# initialisation and cleanup
2265 2334
2266# install some emergency cleanup handlers 2335# install some emergency cleanup handlers
2267BEGIN { 2336BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2337 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2338 Event->signal (
2339 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2340 data => WF_AUTOCANCEL,
2271 signal => $signal, 2341 signal => $signal,
2342 prio => 0,
2272 cb => sub { 2343 cb => sub {
2273 cf::cleanup "SIG$signal"; 2344 cf::cleanup "SIG$signal";
2274 }, 2345 },
2275 ); 2346 );
2276 } 2347 }
2277} 2348}
… …
2282 warn "enter emergency perl save\n"; 2353 warn "enter emergency perl save\n";
2283 2354
2284 cf::sync_job { 2355 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2356 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2357 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2358 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2359 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2360 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2361 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2362 $pl->valid or next;
2292 $pl->save; 2363 $pl->save;
… …
2306} 2377}
2307 2378
2308sub reload() { 2379sub reload() {
2309 # can/must only be called in main 2380 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2381 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2382 warn "can only reload from main coroutine";
2312 return; 2383 return;
2313 } 2384 }
2314 2385
2315 warn "reloading..."; 2386 warn "reloading...";
2316 2387
2317 warn "freezing server"; 2388 warn "cancelling server ticker";
2318 my $guard = freeze_mainloop; 2389 $TICK_WATCHER->cancel;
2390
2319 cf::emergency_save; 2391 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324 2392
2325 eval { 2393 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 2394 # if anything goes wrong in here, we should simply crash as we already saved
2327 2395
2396 warn "syncing database to disk";
2397 cf::db_sync;
2398
2328 warn "cancel all watchers"; 2399 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2400 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2401 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2402 }
2332 2403
2404 warn "flushing outstanding aio requests";
2405 for (;;) {
2406 IO::AIO::flush;
2407 Coro::cede;
2408 last unless IO::AIO::nreqs;
2409 warn "iterate...";
2410 }
2411
2333 warn "cancel all extension coros"; 2412 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2413 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2414 %EXT_CORO = ();
2336 2415
2337 warn "remove commands"; 2416 warn "removing commands";
2338 %COMMAND = (); 2417 %COMMAND = ();
2339 2418
2340 warn "remove ext commands"; 2419 warn "removing ext commands";
2341 %EXTCMD = (); 2420 %EXTCMD = ();
2342 2421
2343 warn "unload/nuke all extensions"; 2422 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2423 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2424 warn "... unloading $pkg";
2346 2425
2347 if (my $cb = $pkg->can ("unload")) { 2426 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2427 eval {
… …
2353 2432
2354 warn "... nuking $pkg"; 2433 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2434 Symbol::delete_package $pkg;
2356 } 2435 }
2357 2436
2358 warn "unload all perl modules loaded from $LIBDIR"; 2437 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2438 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2439 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2440
2362 warn "removing <$k>"; 2441 warn "... unloading $k";
2363 delete $INC{$k}; 2442 delete $INC{$k};
2364 2443
2365 $k =~ s/\.pm$//; 2444 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2445 $k =~ s/\//::/g;
2367 2446
… …
2370 } 2449 }
2371 2450
2372 Symbol::delete_package $k; 2451 Symbol::delete_package $k;
2373 } 2452 }
2374 2453
2375 warn "get rid of safe::, as good as possible"; 2454 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2455 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2456 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 2457
2379 warn "unload cf.pm \"a bit\""; 2458 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2459 delete $INC{"cf.pm"};
2381 2460
2382 # don't, removes xs symbols, too, 2461 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2462 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2463 #Symbol::delete_package __PACKAGE__;
2385 2464
2465 warn "unload completed, starting to reload now";
2466
2386 warn "reloading cf.pm"; 2467 warn "reloading cf.pm";
2387 require cf; 2468 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2470
2390 warn "load config and database again"; 2471 warn "loading config and database again";
2391 cf::cfg_load; 2472 cf::cfg_load;
2392 cf::db_load; 2473 cf::db_load;
2393 2474
2394 warn "load extensions"; 2475 warn "loading extensions";
2395 cf::load_extensions; 2476 cf::load_extensions;
2396 2477
2397 warn "reattach attachments to objects/players"; 2478 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2479 _global_reattach;
2399 warn "reattach attachments to maps"; 2480 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2481 reattach $_ for values %MAP;
2482
2483 warn "loading reloadable resources";
2484 load_resources;
2485
2486 warn "restarting server ticker";
2487
2488 $TICK_WATCHER->start;
2401 }; 2489 };
2402 2490
2403 if ($@) { 2491 if ($@) {
2404 warn $@; 2492 warn $@;
2405 warn "error while reloading, exiting."; 2493 warn "error while reloading, exiting.";
… …
2407 } 2495 }
2408 2496
2409 warn "reloaded"; 2497 warn "reloaded";
2410}; 2498};
2411 2499
2412############################################################################# 2500our $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 2501
2455register_command "reload" => sub { 2502register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2503 my ($who, $arg) = @_;
2457 2504
2458 if ($who->flag (FLAG_WIZ)) { 2505 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2506 $who->message ("reloading server.");
2507
2508 # doing reload synchronously and two reloads happen back-to-back,
2509 # coro crashes during coro_state_free->destroy here.
2510
2511 $RELOAD_WATCHER ||= Event->timer (
2512 reentrant => 0,
2513 after => 0,
2514 data => WF_AUTOCANCEL,
2515 cb => sub {
2460 reload; 2516 reload;
2461 $who->message ("end of reload."); 2517 undef $RELOAD_WATCHER;
2518 },
2519 );
2462 } 2520 }
2463}; 2521};
2464 2522
2465unshift @INC, $LIBDIR; 2523unshift @INC, $LIBDIR;
2524
2525my $bug_warning = 0;
2466 2526
2467$TICK_WATCHER = Event->timer ( 2527$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2528 reentrant => 0,
2529 parked => 1,
2469 prio => 0, 2530 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2531 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2472 cb => sub { 2533 cb => sub {
2534 if ($Coro::current != $Coro::main) {
2535 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2536 unless ++$bug_warning > 10;
2537 return;
2538 }
2539
2540 $NOW = Event::time;
2541
2473 cf::server_tick; # one server iteration 2542 cf::server_tick; # one server iteration
2474 $RUNTIME += $TICK; 2543 $RUNTIME += $TICK;
2475 $NEXT_TICK += $TICK; 2544 $NEXT_TICK += $TICK;
2476 2545
2477 $WAIT_FOR_TICK->broadcast; 2546 $WAIT_FOR_TICK->broadcast;
2478 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2548
2549 Event::sweep;
2550 Coro::cede_notself;
2551
2552# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d#
2479 2554
2480 # if we are delayed by four ticks or more, skip them all 2555 # if we are delayed by four ticks or more, skip them all
2481 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2482 2557
2483 $TICK_WATCHER->at ($NEXT_TICK); 2558 $TICK_WATCHER->at ($NEXT_TICK);
2484 $TICK_WATCHER->start; 2559 $TICK_WATCHER->start;
2485 }, 2560 },
2486); 2561);
2487 2562
2563{
2564 BDB::max_poll_time $TICK * 0.1;
2565 $BDB_POLL_WATCHER = Event->io (
2566 reentrant => 0,
2567 fd => BDB::poll_fileno,
2568 poll => 'r',
2569 prio => 0,
2570 data => WF_AUTOCANCEL,
2571 cb => \&BDB::poll_cb,
2572 );
2573 BDB::min_parallel 8;
2574
2575 BDB::set_sync_prepare {
2576 my $status;
2577 my $current = $Coro::current;
2578 (
2579 sub {
2580 $status = $!;
2581 $current->ready; undef $current;
2582 },
2583 sub {
2584 Coro::schedule while defined $current;
2585 $! = $status;
2586 },
2587 )
2588 };
2589
2590 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create;
2592
2593 cf::sync_job {
2594 BDB::db_env_open
2595 $DB_ENV,
2596 $BDB_ENV_DIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666;
2600
2601 cf::cleanup "$!" if $!;
2602
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2604 $DB_ENV->set_lk_detect;
2605 };
2606 }
2607}
2608
2609{
2610 IO::AIO::min_parallel 8;
2611
2612 undef $Coro::AIO::WATCHER;
2488IO::AIO::max_poll_time $TICK * 0.2; 2613 IO::AIO::max_poll_time $TICK * 0.1;
2489 2614 $AIO_POLL_WATCHER = Event->io (
2490Event->io ( 2615 reentrant => 0,
2491 fd => IO::AIO::poll_fileno, 2616 fd => IO::AIO::poll_fileno,
2492 poll => 'r', 2617 poll => 'r',
2493 prio => 5, 2618 prio => 6,
2494 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2495 cb => \&IO::AIO::poll_cb, 2620 cb => \&IO::AIO::poll_cb,
2496); 2621 );
2622}
2497 2623
2498Event->timer ( 2624$WRITE_RUNTIME_WATCHER = Event->timer (
2625 reentrant => 0,
2499 data => WF_AUTOCANCEL, 2626 data => WF_AUTOCANCEL,
2500 after => 0, 2627 after => 1,
2501 interval => 10, 2628 interval => 10,
2502 cb => sub { 2629 prio => 6, # keep it lowest so it acts like a watchdog
2503 (Coro::unblock_sub { 2630 cb => Coro::unblock_sub {
2504 write_runtime 2631 write_runtime
2505 or warn "ERROR: unable to write runtime file: $!"; 2632 or warn "ERROR: unable to write runtime file: $!";
2506 })->();
2507 }, 2633 },
2508); 2634);
2509 2635
2510END { cf::emergency_save } 2636END { cf::emergency_save }
2511 2637

Diff Legend

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