ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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