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.203 by root, Thu Feb 1 19:40:42 2007 UTC

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

Diff Legend

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