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

Diff Legend

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