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.164 by root, Thu Jan 11 01:24:25 2007 UTC vs.
Revision 1.202 by root, Mon Jan 29 20:16:28 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
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
527}
528
529package cf;
530 378
531############################################################################# 379#############################################################################
532 380
533=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
534 382
… …
660our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
661our @CB_MAP = (); 509our @CB_MAP = ();
662 510
663my %attachment; 511my %attachment;
664 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
665sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
666 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
667 521
668 use sort 'stable'; 522 use sort 'stable';
669 523
… …
840# object support 694# object support
841 695
842sub reattach { 696sub reattach {
843 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 701
846 my $registry = $obj->registry; 702 my $registry = $obj->registry;
847 703
848 @$registry = (); 704 @$registry = ();
849 705
… …
920 } 776 }
921 } else { 777 } else {
922 aio_unlink $filename; 778 aio_unlink $filename;
923 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
924 } 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 }
925 } 787 }
926} 788}
927 789
928sub object_freezer_as_string { 790sub object_freezer_as_string {
929 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
935 797
936sub object_thawer_load { 798sub object_thawer_load {
937 my ($filename) = @_; 799 my ($filename) = @_;
938 800
939 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$//;
940 805
941 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
942 or return; 807 or return;
943 808
944 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1036 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
1037 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
1038 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
1039 . "\n};\n1"; 904 . "\n};\n1";
1040 905
1041 eval $source 906 unless (eval $source) {
1042 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1043 : "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 }
1044 916
1045 push @EXTS, $pkg; 917 push @EXTS, $pkg;
1046} 918}
1047 919
1048sub load_extensions { 920sub load_extensions {
… …
1054 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1055 } 927 }
1056} 928}
1057 929
1058############################################################################# 930#############################################################################
1059# load/save/clean perl data associated with a map
1060
1061*cf::mapsupport::on_clean = sub {
1062 my ($map) = @_;
1063
1064 my $path = $map->tmpname;
1065 defined $path or return;
1066
1067 unlink "$path.pst";
1068};
1069
1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1071
1072#############################################################################
1073 931
1074=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1075 933
1076Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1077 935
… …
1113 971
1114sub exists($) { 972sub exists($) {
1115 my ($login) = @_; 973 my ($login) = @_;
1116 974
1117 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1119} 977}
1120 978
1121sub find($) { 979sub find($) {
1122 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0]; 981 my $login = $_[0];
… …
1213 \@logins 1071 \@logins
1214} 1072}
1215 1073
1216=item $player->maps 1074=item $player->maps
1217 1075
1218Returns 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
1219player. May block. 1077player. May block.
1220 1078
1221=cut 1079=cut
1222 1080
1223sub maps($) { 1081sub maps($) {
1224 my ($pl) = @_; 1082 my ($pl) = @_;
1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1225 1085
1226 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1227 or return; 1087 or return;
1228 1088
1229 my @paths; 1089 my @paths;
… …
1231 for (@$files) { 1091 for (@$files) {
1232 utf8::decode $_; 1092 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1235 1095
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1096 push @paths, cf::map::normalise "~$pl/$_";
1237 } 1097 }
1238 1098
1239 \@paths 1099 \@paths
1240} 1100}
1241 1101
… …
1267package cf::map; 1127package cf::map;
1268 1128
1269use Fcntl; 1129use Fcntl;
1270use Coro::AIO; 1130use Coro::AIO;
1271 1131
1132use overload
1133 '""' => \&as_string,
1134 fallback => 1;
1135
1272our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1273our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1274 1138
1275sub generate_random_map { 1139sub generate_random_map {
1276 my ($path, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1277
1278 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1142 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1146 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1147 $rmp->{xsize}, $rmp->{ysize},
… …
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1154 )
1293} 1155}
1294 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
1284}
1285
1295# and all this just because we cannot iterate over 1286# and all this just because we cannot iterate over
1296# all maps in C++... 1287# all maps in C++...
1297sub change_all_map_light { 1288sub change_all_map_light {
1298 my ($change) = @_; 1289 my ($change) = @_;
1299 1290
1300 $_->change_map_light ($change) 1291 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1292 for grep $_->outdoor, values %cf::MAP;
1302} 1293}
1303 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
1304sub load_map_header($) { 1308sub load_header_from($) {
1305 my ($path) = @_; 1309 my ($self, $path) = @_;
1306 1310
1307 utf8::encode $path; 1311 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1313 # or return;
1314
1315 $self->_load_header ($path)
1309 or return; 1316 or return;
1310 1317
1311 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
1312 or return; 1361 or return;
1362 $self->prepare_orig;
1363 }
1313 1364
1314 # for better error messages only, will be overwritten later 1365 1
1315 $map->path ($path);
1316
1317 $map->load_header ($path)
1318 or return;
1319
1320 $map->{load_path} = $path;
1321
1322 $map
1323} 1366}
1324 1367
1325sub find; 1368sub find;
1326sub find { 1369sub find {
1327 my ($path, $origin) = @_; 1370 my ($path, $origin) = @_;
1328 1371
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1372 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1373
1334 cf::lock_wait "map_find:$key"; 1374 cf::lock_wait "map_find:$path";
1335 1375
1336 $cf::MAP{$key} || do { 1376 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1377 my $guard = cf::lock_acquire "map_find:$path";
1338 1378 my $map = new_from_path cf::map $path
1339 # do it the slow way
1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1343
1344 if ($map) {
1345 $map->last_access ((delete $map->{last_access})
1346 || $cf::RUNTIME); #d#
1347 # safety
1348 $map->{instantiate_time} = $cf::RUNTIME
1349 if $map->{instantiate_time} > $cf::RUNTIME;
1350 } else {
1351 $map = $path->load_orig
1352 or return; 1379 or return;
1353 1380
1354 $map->{load_original} = 1;
1355 $map->{instantiate_time} = $cf::RUNTIME;
1356 $map->last_access ($cf::RUNTIME);
1357 $map->instantiate;
1358
1359 # per-player maps become, after loading, normal maps
1360 $map->per_player (0) if $path->{user_rel};
1361 }
1362
1363 $map->path ($key);
1364 $map->{path} = $path;
1365 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1366 1382
1367 Coro::cede; 1383 $map->load_header
1384 or return;
1368 1385
1369 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;
1370 $map->reset; 1389 $map->reset;
1371 undef $guard; 1390 undef $guard;
1372 $map = find $path 1391 return find $path;
1373 or return;
1374 } 1392 }
1375 1393
1376 $cf::MAP{$key} = $map 1394 $cf::MAP{$path} = $map
1377 } 1395 }
1378} 1396}
1397
1398sub pre_load { }
1399sub post_load { }
1379 1400
1380sub load { 1401sub load {
1381 my ($self) = @_; 1402 my ($self) = @_;
1382 1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1405
1383 my $path = $self->{path}; 1406 my $path = $self->{path};
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1407 my $guard = cf::lock_acquire "map_load:$path";
1385 1408
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1387 1410
1388 $self->in_memory (cf::MAP_LOADING); 1411 $self->in_memory (cf::MAP_LOADING);
1389 1412
1390 $self->alloc; 1413 $self->alloc;
1414
1415 $self->pre_load;
1416
1391 $self->load_objects ($self->{load_path}, 1) 1417 $self->_load_objects ($self->{load_path}, 1)
1392 or return; 1418 or return;
1393 1419
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1421 if delete $self->{load_original};
1396 1422
1397 if (my $uniq = $path->uniq_path) { 1423 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1424 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1425 if (aio_open $uniq, O_RDONLY, 0) {
1400 $self->clear_unique_items; 1426 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1427 $self->_load_objects ($uniq, 0);
1402 } 1428 }
1403 } 1429 }
1404 1430
1405 Coro::cede; 1431 Coro::cede;
1406 1432
1407 # now do the right thing for maps 1433 # now do the right thing for maps
1408 $self->link_multipart_objects; 1434 $self->link_multipart_objects;
1409 1435
1410 if ($self->{path}->is_style_map) { 1436 unless ($self->{deny_activate}) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects; 1437 $self->decay_objects;
1415 $self->fix_auto_apply; 1438 $self->fix_auto_apply;
1416 $self->update_buttons; 1439 $self->update_buttons;
1440 Coro::cede;
1417 $self->set_darkness_map; 1441 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1442 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1443 unless $self->difficulty;
1444 Coro::cede;
1420 $self->activate; 1445 $self->activate;
1421 } 1446 }
1422 1447
1423 Coro::cede; 1448 $self->post_load;
1424 1449
1425 $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
1426} 1460}
1427 1461
1428# 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
1429sub load_diag { 1463sub load_diag {
1430 my ($map) = @_; 1464 my ($map) = @_;
… …
1460 1494
1461 cf::sync_job { $map->load }; 1495 cf::sync_job { $map->load };
1462} 1496}
1463 1497
1464our %MAP_PREFETCH; 1498our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async { 1499our $MAP_PREFETCHER = undef;
1466 while () {
1467 while (%MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path
1473 or next;
1474 $map->load;
1475 }
1476 Coro::schedule;
1477 }
1478};
1479 1500
1480sub find_async { 1501sub find_async {
1481 my ($path, $origin) = @_; 1502 my ($path, $origin) = @_;
1482 1503
1483 $path = new cf::path $path, $origin && $origin->path; 1504 $path = normalise $path, $origin && $origin->{path};
1484 my $key = $path->as_string;
1485 1505
1486 if (my $map = $cf::MAP{$key}) { 1506 if (my $map = $cf::MAP{$path}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 } 1508 }
1489 1509
1490 $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 };
1491 $MAP_PREFETCHER->ready; 1523 $MAP_PREFETCHER->prio (6);
1492 1524
1493 () 1525 ()
1494} 1526}
1495 1527
1496sub save { 1528sub save {
… …
1500 1532
1501 $self->{last_save} = $cf::RUNTIME; 1533 $self->{last_save} = $cf::RUNTIME;
1502 1534
1503 return unless $self->dirty; 1535 return unless $self->dirty;
1504 1536
1505 my $save = $self->{path}->save_path; utf8::encode $save; 1537 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1538 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 1539
1508 $self->{load_path} = $save; 1540 $self->{load_path} = $save;
1509 1541
1510 return if $self->{deny_save}; 1542 return if $self->{deny_save};
1511 1543
… …
1514 cf::async { 1546 cf::async {
1515 $_->contr->save for $self->players; 1547 $_->contr->save for $self->players;
1516 }; 1548 };
1517 1549
1518 if ($uniq) { 1550 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1551 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 1552 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 1553 } else {
1522 $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);
1523 } 1555 }
1524} 1556}
1525 1557
1526sub swap_out { 1558sub swap_out {
1527 my ($self) = @_; 1559 my ($self) = @_;
… …
1541 1573
1542sub reset_at { 1574sub reset_at {
1543 my ($self) = @_; 1575 my ($self) = @_;
1544 1576
1545 # TODO: safety, remove and allow resettable per-player maps 1577 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel}; 1578 return 1e99 if $self->isa ("ext::map_per_player");#d#
1547 return 1e99 if $self->{deny_reset}; 1579 return 1e99 if $self->{deny_reset};
1548 1580
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1581 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 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;
1551 1583
… …
1556 my ($self) = @_; 1588 my ($self) = @_;
1557 1589
1558 $self->reset_at <= $cf::RUNTIME 1590 $self->reset_at <= $cf::RUNTIME
1559} 1591}
1560 1592
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->{path}->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 1593sub reset {
1575 my ($self) = @_; 1594 my ($self) = @_;
1576 1595
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1596 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1597
1579 return if $self->players; 1598 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1599 return if $self->isa ("ext::map_per_player");#d#
1581 1600
1582 warn "resetting map ", $self->path;#d# 1601 warn "resetting map ", $self->path;#d#
1583 1602
1584 delete $cf::MAP{$self->path}; 1603 delete $cf::MAP{$self->path};
1585 1604
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear;
1607
1586 $_->clear_links_to ($self) for values %cf::MAP; 1608 $_->clear_links_to ($self) for values %cf::MAP;
1587 1609
1588 $self->{path}->unlink_save; 1610 $self->unlink_save;
1589 $self->destroy; 1611 $self->destroy;
1590} 1612}
1591 1613
1592my $nuke_counter = "aaaa"; 1614my $nuke_counter = "aaaa";
1593 1615
1594sub nuke { 1616sub nuke {
1595 my ($self) = @_; 1617 my ($self) = @_;
1596 1618
1619 delete $cf::MAP{$self->path};
1620
1621 $self->unlink_save;
1622
1623 bless $self, "cf::map";
1624 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1625 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1626 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1627 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1628
1629 $cf::MAP{$self->path} = $self;
1630
1600 $self->reset; # polite request, might not happen 1631 $self->reset; # polite request, might not happen
1601} 1632}
1602 1633
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1634=item cf::map::unique_maps
1614 1635
1615Returns an arrayref of cf::path's of all shared maps that have 1636Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1637instantiated unique items. May block.
1617 1638
1618=cut 1639=cut
1619 1640
1620sub unique_maps() { 1641sub unique_maps() {
… …
1626 for (@$files) { 1647 for (@$files) {
1627 utf8::decode $_; 1648 utf8::decode $_;
1628 next if /\.pst$/; 1649 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1630 1651
1631 push @paths, new cf::path $_; 1652 push @paths, cf::map::normalise $_;
1632 } 1653 }
1633 1654
1634 \@paths 1655 \@paths
1635} 1656}
1636 1657
… …
1711 1732
1712=item $player_object->enter_link 1733=item $player_object->enter_link
1713 1734
1714Freezes 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}>).
1715 1736
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1738I<MUST> call C<leave_link> as soon as possible, though.
1718 1739
1740Will never block.
1741
1719=item $player_object->leave_link ($map, $x, $y) 1742=item $player_object->leave_link ($map, $x, $y)
1720 1743
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1747fails, to the emergency map position.
1725 1748
1726Might block. 1749Might block.
1727 1750
1728=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}
1729 1762
1730sub cf::object::player::enter_link { 1763sub cf::object::player::enter_link {
1731 my ($self) = @_; 1764 my ($self) = @_;
1732 1765
1733 $self->deactivate_recursive; 1766 $self->deactivate_recursive;
1734 1767
1735 return if $self->map == $LINK_MAP; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1769
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1771 if $self->map;
1739 1772
1740 $self->enter_map ($LINK_MAP, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1774}
1742 1775
1743sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1745 1778
… …
1809=cut 1842=cut
1810 1843
1811sub cf::object::player::goto { 1844sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1813 1846
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1847 $self->enter_link;
1817 1848
1818 (async { 1849 (async {
1850 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 1851 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1821 1853 $map
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1823# if $map;
1824
1825 $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);
1826 1856
1827 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1828 })->prio (1); 1858 })->prio (1);
1829} 1859}
1830 1860
… …
1834 1864
1835sub parse_random_map_params { 1865sub parse_random_map_params {
1836 my ($spec) = @_; 1866 my ($spec) = @_;
1837 1867
1838 my $rmp = { # defaults 1868 my $rmp = { # defaults
1839 xsize => 10, 1869 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1870 ysize => (cf::rndm 15, 40),
1871 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1872 #layout => string,
1841 }; 1873 };
1842 1874
1843 for (split /\n/, $spec) { 1875 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1876 my ($k, $v) = split /\s+/, $_, 2;
1845 1877
… …
1849 $rmp 1881 $rmp
1850} 1882}
1851 1883
1852sub prepare_random_map { 1884sub prepare_random_map {
1853 my ($exit) = @_; 1885 my ($exit) = @_;
1886
1887 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1888
1855 # all this does is basically replace the /! path by 1889 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1890 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1891 # that depends on the exit object
1858 1892
1859 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1860 1894
1861 if ($exit->map) { 1895 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1866 } 1900 }
1867 1901
1868 $rmp->{random_seed} ||= $exit->random_seed; 1902 $rmp->{random_seed} ||= $exit->random_seed;
1869 1903
1870 my $data = cf::to_json $rmp; 1904 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1905 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1907
1873 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) {
1874 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;
1875 1912
1876 $exit->slaying ("?random/$md5"); 1913 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1914 $exit->msg (undef);
1878 } 1915 }
1879} 1916}
1880 1917
1881sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1883 1920
1884 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;
1885 1931
1886 $self->enter_link; 1932 $self->enter_link;
1887 1933
1888 (async { 1934 (async {
1889 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1936 unless (eval {
1891 prepare_random_map $exit 1937 $self->goto ($slaying, $hp, $sp);
1892 if $exit->slaying eq "/!";
1893
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1938
1897 1; 1939 1;
1898 }) { 1940 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "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. "
… …
1961 # get handled first 2003 # get handled first
1962 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1963 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
1964 2006
1965 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2009
1967 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1968 2011
1969 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2013 if (@$queue) {
… …
2189 sub db_sync() { 2232 sub db_sync() {
2190 db_save if $dirty; 2233 db_save if $dirty;
2191 undef $dirty; 2234 undef $dirty;
2192 } 2235 }
2193 2236
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2195 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2196 }); 2244 );
2197 2245
2198 sub db_dirty() { 2246 sub db_dirty() {
2199 $dirty = 1; 2247 $dirty = 1;
2200 $idle->start; 2248 $idle->start;
2201 } 2249 }
… …
2249 2297
2250sub main { 2298sub main {
2251 # we must not ever block the main coroutine 2299 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2300 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2301 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2302 (async {
2254 async { Event::one_event }; 2303 Event::one_event;
2304 })->prio (Coro::PRIO_MAX);
2255 }; 2305 };
2256 2306
2257 cfg_load; 2307 cfg_load;
2258 db_load; 2308 db_load;
2259 load_extensions; 2309 load_extensions;
2310
2311 $TICK_WATCHER->start;
2260 Event::loop; 2312 Event::loop;
2261} 2313}
2262 2314
2263############################################################################# 2315#############################################################################
2264# initialisation and cleanup 2316# initialisation and cleanup
2265 2317
2266# install some emergency cleanup handlers 2318# install some emergency cleanup handlers
2267BEGIN { 2319BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2320 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2321 Event->signal (
2322 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2323 data => WF_AUTOCANCEL,
2271 signal => $signal, 2324 signal => $signal,
2325 prio => 0,
2272 cb => sub { 2326 cb => sub {
2273 cf::cleanup "SIG$signal"; 2327 cf::cleanup "SIG$signal";
2274 }, 2328 },
2275 ); 2329 );
2276 } 2330 }
2277} 2331}
… …
2282 warn "enter emergency perl save\n"; 2336 warn "enter emergency perl save\n";
2283 2337
2284 cf::sync_job { 2338 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2339 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2340 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2341 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2342 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2343 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2344 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2345 $pl->valid or next;
2292 $pl->save; 2346 $pl->save;
… …
2306} 2360}
2307 2361
2308sub reload() { 2362sub reload() {
2309 # can/must only be called in main 2363 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2365 warn "can only reload from main coroutine";
2312 return; 2366 return;
2313 } 2367 }
2314 2368
2315 warn "reloading..."; 2369 warn "reloading...";
2316 2370
2317 warn "freezing server"; 2371 warn "cancelling server ticker";
2318 my $guard = freeze_mainloop; 2372 $TICK_WATCHER->cancel;
2373
2319 cf::emergency_save; 2374 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324 2375
2325 eval { 2376 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 2377 # if anything goes wrong in here, we should simply crash as we already saved
2327 2378
2379 warn "syncing database to disk";
2380 cf::db_sync;
2381
2328 warn "cancel all watchers"; 2382 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2383 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2384 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2385 }
2332 2386
2387 warn "flushing outstanding aio requests";
2388 for (;;) {
2389 IO::AIO::flush;
2390 Coro::cede;
2391 last unless IO::AIO::nreqs;
2392 warn "iterate...";
2393 }
2394
2333 warn "cancel all extension coros"; 2395 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2396 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2397 %EXT_CORO = ();
2336 2398
2337 warn "remove commands"; 2399 warn "removing commands";
2338 %COMMAND = (); 2400 %COMMAND = ();
2339 2401
2340 warn "remove ext commands"; 2402 warn "removing ext commands";
2341 %EXTCMD = (); 2403 %EXTCMD = ();
2342 2404
2343 warn "unload/nuke all extensions"; 2405 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2406 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2407 warn "... unloading $pkg";
2346 2408
2347 if (my $cb = $pkg->can ("unload")) { 2409 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2410 eval {
… …
2353 2415
2354 warn "... nuking $pkg"; 2416 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2417 Symbol::delete_package $pkg;
2356 } 2418 }
2357 2419
2358 warn "unload all perl modules loaded from $LIBDIR"; 2420 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2421 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2422 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2423
2362 warn "removing <$k>"; 2424 warn "... unloading $k";
2363 delete $INC{$k}; 2425 delete $INC{$k};
2364 2426
2365 $k =~ s/\.pm$//; 2427 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2428 $k =~ s/\//::/g;
2367 2429
… …
2370 } 2432 }
2371 2433
2372 Symbol::delete_package $k; 2434 Symbol::delete_package $k;
2373 } 2435 }
2374 2436
2375 warn "get rid of safe::, as good as possible"; 2437 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2438 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2439 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 2440
2379 warn "unload cf.pm \"a bit\""; 2441 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2442 delete $INC{"cf.pm"};
2381 2443
2382 # don't, removes xs symbols, too, 2444 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2445 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2446 #Symbol::delete_package __PACKAGE__;
2385 2447
2448 warn "unload completed, starting to reload now";
2449
2386 warn "reloading cf.pm"; 2450 warn "reloading cf.pm";
2387 require cf; 2451 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2452 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2453
2390 warn "load config and database again"; 2454 warn "loading config and database again";
2391 cf::cfg_load; 2455 cf::cfg_load;
2392 cf::db_load; 2456 cf::db_load;
2393 2457
2394 warn "load extensions"; 2458 warn "loading extensions";
2395 cf::load_extensions; 2459 cf::load_extensions;
2396 2460
2397 warn "reattach attachments to objects/players"; 2461 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2462 _global_reattach;
2399 warn "reattach attachments to maps"; 2463 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2464 reattach $_ for values %MAP;
2465
2466 warn "restarting server ticker";
2467
2468 $TICK_WATCHER->start;
2401 }; 2469 };
2402 2470
2403 if ($@) { 2471 if ($@) {
2404 warn $@; 2472 warn $@;
2405 warn "error while reloading, exiting."; 2473 warn "error while reloading, exiting.";
… …
2407 } 2475 }
2408 2476
2409 warn "reloaded"; 2477 warn "reloaded";
2410}; 2478};
2411 2479
2412############################################################################# 2480our $RELOAD_WATCHER; # used only during reload
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454 2481
2455register_command "reload" => sub { 2482register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2483 my ($who, $arg) = @_;
2457 2484
2458 if ($who->flag (FLAG_WIZ)) { 2485 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2486 $who->message ("reloading server.");
2487
2488 # doing reload synchronously and two reloads happen back-to-back,
2489 # coro crashes during coro_state_free->destroy here.
2490
2491 $RELOAD_WATCHER ||= Event->timer (
2492 reentrant => 0,
2493 after => 0,
2494 data => WF_AUTOCANCEL,
2495 cb => sub {
2460 reload; 2496 reload;
2461 $who->message ("end of reload."); 2497 undef $RELOAD_WATCHER;
2498 },
2499 );
2462 } 2500 }
2463}; 2501};
2464 2502
2465unshift @INC, $LIBDIR; 2503unshift @INC, $LIBDIR;
2504
2505my $bug_warning = 0;
2466 2506
2467$TICK_WATCHER = Event->timer ( 2507$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2508 reentrant => 0,
2509 parked => 1,
2469 prio => 0, 2510 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2511 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2512 data => WF_AUTOCANCEL,
2472 cb => sub { 2513 cb => sub {
2514 if ($Coro::current != $Coro::main) {
2515 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2516 unless ++$bug_warning > 10;
2517 return;
2518 }
2519
2473 $NOW = Event::time; 2520 $NOW = Event::time;
2474 2521
2475 cf::server_tick; # one server iteration 2522 cf::server_tick; # one server iteration
2476 $RUNTIME += $TICK; 2523 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 2524 $NEXT_TICK += $TICK;
2478 2525
2479 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528
2529 Event::sweep;
2530 Coro::cede_notself;
2531
2532# my $AFTER = Event::time;
2533# warn $AFTER - $NOW;#d#
2481 2534
2482 # if we are delayed by four ticks or more, skip them all 2535 # if we are delayed by four ticks or more, skip them all
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2484 2537
2485 $TICK_WATCHER->at ($NEXT_TICK); 2538 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 2539 $TICK_WATCHER->start;
2487 }, 2540 },
2488); 2541);
2489 2542
2490IO::AIO::max_poll_time $TICK * 0.2; 2543IO::AIO::max_poll_time $TICK * 0.1;
2491 2544
2492Event->io ( 2545undef $Coro::AIO::WATCHER;
2546$AIO_POLL_WATCHER = Event->io (
2547 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 2548 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2549 poll => 'r',
2495 prio => 5, 2550 prio => 6,
2496 data => WF_AUTOCANCEL, 2551 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2552 cb => \&IO::AIO::poll_cb,
2498); 2553);
2499 2554
2500Event->timer ( 2555$WRITE_RUNTIME_WATCHER = Event->timer (
2556 reentrant => 0,
2501 data => WF_AUTOCANCEL, 2557 data => WF_AUTOCANCEL,
2502 after => 0, 2558 after => 1,
2503 interval => 10, 2559 interval => 10,
2504 cb => sub { 2560 prio => 6, # keep it lowest so it acts like a watchdog
2505 (Coro::unblock_sub { 2561 cb => Coro::unblock_sub {
2506 write_runtime 2562 write_runtime
2507 or warn "ERROR: unable to write runtime file: $!"; 2563 or warn "ERROR: unable to write runtime file: $!";
2508 })->();
2509 }, 2564 },
2510); 2565);
2511 2566
2512END { cf::emergency_save } 2567END { cf::emergency_save }
2513 2568

Diff Legend

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