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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 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
521package cf;
522 378
523############################################################################# 379#############################################################################
524 380
525=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
526 382
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 509our @CB_MAP = ();
654 510
655my %attachment; 511my %attachment;
656 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
657sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
659 521
660 use sort 'stable'; 522 use sort 'stable';
661 523
… …
832# object support 694# object support
833 695
834sub reattach { 696sub reattach {
835 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 701
838 my $registry = $obj->registry; 702 my $registry = $obj->registry;
839 703
840 @$registry = (); 704 @$registry = ();
841 705
… …
912 } 776 }
913 } else { 777 } else {
914 aio_unlink $filename; 778 aio_unlink $filename;
915 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
916 } 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 }
917 } 787 }
918} 788}
919 789
920sub object_freezer_as_string { 790sub object_freezer_as_string {
921 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
927 797
928sub object_thawer_load { 798sub object_thawer_load {
929 my ($filename) = @_; 799 my ($filename) = @_;
930 800
931 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$//;
932 805
933 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
934 or return; 807 or return;
935 808
936 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1028 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 904 . "\n};\n1";
1032 905
1033 eval $source 906 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1035 : "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 }
1036 916
1037 push @EXTS, $pkg; 917 push @EXTS, $pkg;
1038} 918}
1039 919
1040sub load_extensions { 920sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1047 } 927 }
1048} 928}
1049 929
1050############################################################################# 930#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 931
1066=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1067 933
1068Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1069 935
… …
1105 971
1106sub exists($) { 972sub exists($) {
1107 my ($login) = @_; 973 my ($login) = @_;
1108 974
1109 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1110 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1111} 977}
1112 978
1113sub find($) { 979sub find($) {
1114 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1115 my $login = $_[0]; 981 my $login = $_[0];
… …
1205 \@logins 1071 \@logins
1206} 1072}
1207 1073
1208=item $player->maps 1074=item $player->maps
1209 1075
1210Returns 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
1211player. May block. 1077player. May block.
1212 1078
1213=cut 1079=cut
1214 1080
1215sub maps($) { 1081sub maps($) {
… …
1223 for (@$files) { 1089 for (@$files) {
1224 utf8::decode $_; 1090 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1227 1093
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1229 } 1095 }
1230 1096
1231 \@paths 1097 \@paths
1232} 1098}
1233 1099
… …
1259package cf::map; 1125package cf::map;
1260 1126
1261use Fcntl; 1127use Fcntl;
1262use Coro::AIO; 1128use Coro::AIO;
1263 1129
1130use overload
1131 '""' => \&as_string,
1132 fallback => 1;
1133
1264our $MAX_RESET = 3600; 1134our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1135our $DEFAULT_RESET = 3000;
1266 1136
1267sub generate_random_map { 1137sub generate_random_map {
1268 my ($path, $rmp) = @_; 1138 my ($self, $rmp) = @_;
1269
1270 # mit "rum" bekleckern, nicht 1139 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1140 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1141 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1142 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1143 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1144 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1145 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1152 )
1285} 1153}
1286 1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1163sub register {
1164 my (undef, $regex, $prio) = @_;
1165 my $pkg = caller;
1166
1167 no strict;
1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1169
1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1171}
1172
1173# also paths starting with '/'
1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1175
1176sub thawer_merge {
1177 my ($self, $merge) = @_;
1178
1179 # we have to keep some variables in memory intact
1180 local $self->{path};
1181 local $self->{load_path};
1182 local $self->{deny_save};
1183 local $self->{deny_reset};
1184
1185 $self->SUPER::thawer_merge ($merge);
1186}
1187
1188sub normalise {
1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1194
1195 # map plan:
1196 #
1197 # /! non-realised random map exit (special hack!)
1198 # {... are special paths that are not being touched
1199 # ?xxx/... are special absolute paths
1200 # ?random/... random maps
1201 # /... normal maps
1202 # ~user/... per-player map of a specific user
1203
1204 $path =~ s/$PATH_SEP/\//go;
1205
1206 # treat it as relative path if it starts with
1207 # something that looks reasonable
1208 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1209 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1210
1211 $base =~ s{[^/]+/?$}{};
1212 $path = "$base/$path";
1213 }
1214
1215 for ($path) {
1216 redo if s{//}{/};
1217 redo if s{/\.?/}{/};
1218 redo if s{/[^/]+/\.\./}{/};
1219 }
1220
1221 $path
1222}
1223
1224sub new_from_path {
1225 my (undef, $path, $base) = @_;
1226
1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1228
1229 $path = normalise $path, $base;
1230
1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1233 my $self = bless cf::map::new, $pkg;
1234 $self->{path} = $path; $self->path ($path);
1235 $self->init; # pass $1 etc.
1236 return $self;
1237 }
1238 }
1239
1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1241 ()
1242}
1243
1244sub init {
1245 my ($self) = @_;
1246
1247 $self
1248}
1249
1250sub as_string {
1251 my ($self) = @_;
1252
1253 "$self->{path}"
1254}
1255
1256# the displayed name, this is a one way mapping
1257sub visible_name {
1258 &as_string
1259}
1260
1261# the original (read-only) location
1262sub load_path {
1263 my ($self) = @_;
1264
1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1266}
1267
1268# the temporary/swap location
1269sub save_path {
1270 my ($self) = @_;
1271
1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1274}
1275
1276# the unique path, undef == no special unique path
1277sub uniq_path {
1278 my ($self) = @_;
1279
1280 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1281 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1282}
1283
1287# and all this just because we cannot iterate over 1284# and all this just because we cannot iterate over
1288# all maps in C++... 1285# all maps in C++...
1289sub change_all_map_light { 1286sub change_all_map_light {
1290 my ($change) = @_; 1287 my ($change) = @_;
1291 1288
1292 $_->change_map_light ($change) 1289 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1290 for grep $_->outdoor, values %cf::MAP;
1294} 1291}
1295 1292
1293sub unlink_save {
1294 my ($self) = @_;
1295
1296 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304}
1305
1296sub load_map_header($) { 1306sub load_header_from($) {
1297 my ($path) = @_; 1307 my ($self, $path) = @_;
1298 1308
1299 utf8::encode $path; 1309 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1311 # or return;
1312
1313 $self->_load_header ($path)
1301 or return; 1314 or return;
1302 1315
1303 my $map = cf::map::new 1316 $self->{load_path} = $path;
1317
1318 1
1319}
1320
1321sub load_header_orig {
1322 my ($self) = @_;
1323
1324 $self->load_header_from ($self->load_path)
1325}
1326
1327sub load_header_temp {
1328 my ($self) = @_;
1329
1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1350}
1351
1352sub load_header {
1353 my ($self) = @_;
1354
1355 if ($self->load_header_temp) {
1356 $self->prepare_temp;
1357 } else {
1358 $self->load_header_orig
1304 or return; 1359 or return;
1360 $self->prepare_orig;
1361 }
1305 1362
1306 # for better error messages only, will be overwritten later 1363 1
1307 $map->path ($path);
1308
1309 $map->load_header ($path)
1310 or return;
1311
1312 $map->{load_path} = $path;
1313
1314 $map
1315} 1364}
1316 1365
1317sub find; 1366sub find;
1318sub find { 1367sub find {
1319 my ($path, $origin) = @_; 1368 my ($path, $origin) = @_;
1320 1369
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1370 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1371
1326 cf::lock_wait "map_find:$key"; 1372 cf::lock_wait "map_find:$path";
1327 1373
1328 $cf::MAP{$key} || do { 1374 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1375 my $guard = cf::lock_acquire "map_find:$path";
1330 1376 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1377 or return;
1345 1378
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1379 $map->{last_save} = $cf::RUNTIME;
1358 1380
1359 Coro::cede; 1381 $map->load_header
1382 or return;
1360 1383
1361 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1386 #$cf::WAIT_FOR_TICK->wait;
1362 $map->reset; 1387 $map->reset;
1363 undef $guard; 1388 undef $guard;
1364 $map = find $path 1389 return find $path;
1365 or return;
1366 } 1390 }
1367 1391
1368 $cf::MAP{$key} = $map 1392 $cf::MAP{$path} = $map
1369 } 1393 }
1370} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1371 1398
1372sub load { 1399sub load {
1373 my ($self) = @_; 1400 my ($self) = @_;
1374 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1375 my $path = $self->{path}; 1404 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1405 my $guard = cf::lock_acquire "map_load:$path";
1377 1406
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1408
1380 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1381 1410
1382 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1383 $self->load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1416 or return;
1385 1417
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1419 if delete $self->{load_original};
1388 1420
1389 if (my $uniq = $path->uniq_path) { 1421 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1422 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1423 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1424 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1425 $self->_load_objects ($uniq, 0);
1394 } 1426 }
1395 } 1427 }
1396 1428
1397 Coro::cede; 1429 Coro::cede;
1398 1430
1399 # now do the right thing for maps 1431 # now do the right thing for maps
1400 $self->link_multipart_objects; 1432 $self->link_multipart_objects;
1401 1433
1402 if ($self->{path}->is_style_map) { 1434 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1435 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1436 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1437 $self->update_buttons;
1438 Coro::cede;
1409 $self->set_darkness_map; 1439 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1440 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1441 unless $self->difficulty;
1442 Coro::cede;
1412 $self->activate; 1443 $self->activate;
1413 } 1444 }
1414 1445
1415 Coro::cede; 1446 $self->post_load;
1416 1447
1417 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1449}
1450
1451sub customise_for {
1452 my ($self, $ob) = @_;
1453
1454 return find "~" . $ob->name . "/" . $self->{path}
1455 if $self->per_player;
1456
1457 $self
1418} 1458}
1419 1459
1420# find and load all maps in the 3x3 area around a map 1460# find and load all maps in the 3x3 area around a map
1421sub load_diag { 1461sub load_diag {
1422 my ($map) = @_; 1462 my ($map) = @_;
… …
1452 1492
1453 cf::sync_job { $map->load }; 1493 cf::sync_job { $map->load };
1454} 1494}
1455 1495
1456our %MAP_PREFETCH; 1496our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1497our $MAP_PREFETCHER = undef;
1458 while () {
1459 while (%MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path
1465 or next;
1466 $map->load;
1467 }
1468 Coro::schedule;
1469 }
1470};
1471 1498
1472sub find_async { 1499sub find_async {
1473 my ($path, $origin) = @_; 1500 my ($path, $origin) = @_;
1474 1501
1475 $path = new cf::path $path, $origin && $origin->path; 1502 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1503
1478 if (my $map = $cf::MAP{$key}) { 1504 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1505 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1506 }
1481 1507
1482 $MAP_PREFETCH{$key} = $path; 1508 undef $MAP_PREFETCH{$path};
1509 $MAP_PREFETCHER ||= cf::async {
1510 while (%MAP_PREFETCH) {
1511 for my $path (keys %MAP_PREFETCH) {
1512 my $map = find $path
1513 or next;
1514 $map->load;
1515
1516 delete $MAP_PREFETCH{$path};
1517 }
1518 }
1519 undef $MAP_PREFETCHER;
1520 };
1483 $MAP_PREFETCHER->ready; 1521 $MAP_PREFETCHER->prio (6);
1484 1522
1485 () 1523 ()
1486} 1524}
1487 1525
1488sub save { 1526sub save {
… …
1492 1530
1493 $self->{last_save} = $cf::RUNTIME; 1531 $self->{last_save} = $cf::RUNTIME;
1494 1532
1495 return unless $self->dirty; 1533 return unless $self->dirty;
1496 1534
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1535 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1536 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1537
1500 $self->{load_path} = $save; 1538 $self->{load_path} = $save;
1501 1539
1502 return if $self->{deny_save}; 1540 return if $self->{deny_save};
1503 1541
… …
1506 cf::async { 1544 cf::async {
1507 $_->contr->save for $self->players; 1545 $_->contr->save for $self->players;
1508 }; 1546 };
1509 1547
1510 if ($uniq) { 1548 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1549 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1550 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1551 } else {
1514 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1552 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1515 } 1553 }
1516} 1554}
1517 1555
1518sub swap_out { 1556sub swap_out {
1519 my ($self) = @_; 1557 my ($self) = @_;
… …
1533 1571
1534sub reset_at { 1572sub reset_at {
1535 my ($self) = @_; 1573 my ($self) = @_;
1536 1574
1537 # TODO: safety, remove and allow resettable per-player maps 1575 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1576 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1577 return 1e99 if $self->{deny_reset};
1540 1578
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1579 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1580 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1543 1581
… …
1548 my ($self) = @_; 1586 my ($self) = @_;
1549 1587
1550 $self->reset_at <= $cf::RUNTIME 1588 $self->reset_at <= $cf::RUNTIME
1551} 1589}
1552 1590
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 1591sub reset {
1575 my ($self) = @_; 1592 my ($self) = @_;
1576 1593
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1594 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1595
1579 return if $self->players; 1596 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1597 return if $self->isa ("ext::map_per_player");#d#
1581 1598
1582 warn "resetting map ", $self->path;#d# 1599 warn "resetting map ", $self->path;#d#
1583 1600
1584 delete $cf::MAP{$self->path}; 1601 delete $cf::MAP{$self->path};
1602
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear;
1585 1605
1586 $_->clear_links_to ($self) for values %cf::MAP; 1606 $_->clear_links_to ($self) for values %cf::MAP;
1587 1607
1588 $self->unlink_save; 1608 $self->unlink_save;
1589 $self->destroy; 1609 $self->destroy;
… …
1592my $nuke_counter = "aaaa"; 1612my $nuke_counter = "aaaa";
1593 1613
1594sub nuke { 1614sub nuke {
1595 my ($self) = @_; 1615 my ($self) = @_;
1596 1616
1617 delete $cf::MAP{$self->path};
1618
1619 $self->unlink_save;
1620
1621 bless $self, "cf::map";
1622 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1623 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1624 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1625 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1626
1627 $cf::MAP{$self->path} = $self;
1628
1600 $self->reset; # polite request, might not happen 1629 $self->reset; # polite request, might not happen
1601} 1630}
1602 1631
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 1632=item cf::map::unique_maps
1614 1633
1615Returns an arrayref of cf::path's of all shared maps that have 1634Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1635instantiated unique items. May block.
1617 1636
1618=cut 1637=cut
1619 1638
1620sub unique_maps() { 1639sub unique_maps() {
… …
1626 for (@$files) { 1645 for (@$files) {
1627 utf8::decode $_; 1646 utf8::decode $_;
1628 next if /\.pst$/; 1647 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1630 1649
1631 push @paths, new cf::path $_; 1650 push @paths, cf::map::normalise $_;
1632 } 1651 }
1633 1652
1634 \@paths 1653 \@paths
1635} 1654}
1636 1655
… …
1711 1730
1712=item $player_object->enter_link 1731=item $player_object->enter_link
1713 1732
1714Freezes the player and moves him/her to a special map (C<{link}>). 1733Freezes the player and moves him/her to a special map (C<{link}>).
1715 1734
1716The player should be reaosnably safe there for short amounts of time. You 1735The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1736I<MUST> call C<leave_link> as soon as possible, though.
1718 1737
1738Will never block.
1739
1719=item $player_object->leave_link ($map, $x, $y) 1740=item $player_object->leave_link ($map, $x, $y)
1720 1741
1721Moves the player out of the specila link map onto the given map. If the 1742Moves 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 1743map. 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, 1744to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1745fails, to the emergency map position.
1725 1746
1726Might block. 1747Might block.
1727 1748
1728=cut 1749=cut
1750
1751sub link_map {
1752 unless ($LINK_MAP) {
1753 $LINK_MAP = cf::map::find "{link}"
1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1755 $LINK_MAP->load;
1756 }
1757
1758 $LINK_MAP
1759}
1729 1760
1730sub cf::object::player::enter_link { 1761sub cf::object::player::enter_link {
1731 my ($self) = @_; 1762 my ($self) = @_;
1732 1763
1733 $self->deactivate_recursive; 1764 $self->deactivate_recursive;
1734 1765
1735 return if $self->map == $LINK_MAP; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1767
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1769 if $self->map;
1739 1770
1740 $self->enter_map ($LINK_MAP, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1772}
1742 1773
1743sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1745 1776
… …
1809=cut 1840=cut
1810 1841
1811sub cf::object::player::goto { 1842sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1813 1844
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1845 $self->enter_link;
1817 1846
1818 (async { 1847 (async {
1848 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 1849 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1821 1851 $map
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1823# if $map;
1824
1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1826 1854
1827 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1828 })->prio (1); 1856 })->prio (1);
1829} 1857}
1830 1858
… …
1834 1862
1835sub parse_random_map_params { 1863sub parse_random_map_params {
1836 my ($spec) = @_; 1864 my ($spec) = @_;
1837 1865
1838 my $rmp = { # defaults 1866 my $rmp = { # defaults
1839 xsize => 10, 1867 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1868 ysize => (cf::rndm 15, 40),
1869 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1870 #layout => string,
1841 }; 1871 };
1842 1872
1843 for (split /\n/, $spec) { 1873 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1874 my ($k, $v) = split /\s+/, $_, 2;
1845 1875
… …
1849 $rmp 1879 $rmp
1850} 1880}
1851 1881
1852sub prepare_random_map { 1882sub prepare_random_map {
1853 my ($exit) = @_; 1883 my ($exit) = @_;
1884
1885 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1886
1855 # all this does is basically replace the /! path by 1887 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1888 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1889 # that depends on the exit object
1858 1890
1859 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1860 1892
1861 if ($exit->map) { 1893 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1866 } 1898 }
1867 1899
1868 $rmp->{random_seed} ||= $exit->random_seed; 1900 $rmp->{random_seed} ||= $exit->random_seed;
1869 1901
1870 my $data = cf::to_json $rmp; 1902 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1903 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1905
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1907 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh;
1909 aio_rename "$meta~", $meta;
1875 1910
1876 $exit->slaying ("?random/$md5"); 1911 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1912 $exit->msg (undef);
1878 } 1913 }
1879} 1914}
1880 1915
1881sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1883 1918
1884 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1885 1929
1886 $self->enter_link; 1930 $self->enter_link;
1887 1931
1888 (async { 1932 (async {
1889 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1934 unless (eval {
1891 prepare_random_map $exit 1935 $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 1936
1897 1; 1937 1;
1898 }) { 1938 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
… …
2189 sub db_sync() { 2229 sub db_sync() {
2190 db_save if $dirty; 2230 db_save if $dirty;
2191 undef $dirty; 2231 undef $dirty;
2192 } 2232 }
2193 2233
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2195 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2196 }); 2241 );
2197 2242
2198 sub db_dirty() { 2243 sub db_dirty() {
2199 $dirty = 1; 2244 $dirty = 1;
2200 $idle->start; 2245 $idle->start;
2201 } 2246 }
… …
2249 2294
2250sub main { 2295sub main {
2251 # we must not ever block the main coroutine 2296 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2297 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2298 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2299 (async {
2254 async { Event::one_event }; 2300 Event::one_event;
2301 })->prio (Coro::PRIO_MAX);
2255 }; 2302 };
2256 2303
2257 cfg_load; 2304 cfg_load;
2258 db_load; 2305 db_load;
2259 load_extensions; 2306 load_extensions;
2307
2308 $TICK_WATCHER->start;
2260 Event::loop; 2309 Event::loop;
2261} 2310}
2262 2311
2263############################################################################# 2312#############################################################################
2264# initialisation and cleanup 2313# initialisation and cleanup
2265 2314
2266# install some emergency cleanup handlers 2315# install some emergency cleanup handlers
2267BEGIN { 2316BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2318 Event->signal (
2319 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2271 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2272 cb => sub { 2323 cb => sub {
2273 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2274 }, 2325 },
2275 ); 2326 );
2276 } 2327 }
2277} 2328}
… …
2282 warn "enter emergency perl save\n"; 2333 warn "enter emergency perl save\n";
2283 2334
2284 cf::sync_job { 2335 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2336 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2337 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2338 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2339 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2340 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2341 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2342 $pl->valid or next;
2292 $pl->save; 2343 $pl->save;
… …
2306} 2357}
2307 2358
2308sub reload() { 2359sub reload() {
2309 # can/must only be called in main 2360 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2312 return; 2363 return;
2313 } 2364 }
2314 2365
2315 warn "reloading..."; 2366 warn "reloading...";
2316 2367
2317 warn "freezing server"; 2368 warn "cancelling server ticker";
2318 my $guard = freeze_mainloop; 2369 $TICK_WATCHER->cancel;
2370
2319 cf::emergency_save; 2371 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324 2372
2325 eval { 2373 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2327 2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378
2328 warn "cancel all watchers"; 2379 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2380 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2381 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2382 }
2332 2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 IO::AIO::flush;
2387 Coro::cede;
2388 last unless IO::AIO::nreqs;
2389 warn "iterate...";
2390 }
2391
2333 warn "cancel all extension coros"; 2392 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2393 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2394 %EXT_CORO = ();
2336 2395
2337 warn "remove commands"; 2396 warn "removing commands";
2338 %COMMAND = (); 2397 %COMMAND = ();
2339 2398
2340 warn "remove ext commands"; 2399 warn "removing ext commands";
2341 %EXTCMD = (); 2400 %EXTCMD = ();
2342 2401
2343 warn "unload/nuke all extensions"; 2402 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2403 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2404 warn "... unloading $pkg";
2346 2405
2347 if (my $cb = $pkg->can ("unload")) { 2406 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2407 eval {
… …
2353 2412
2354 warn "... nuking $pkg"; 2413 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2414 Symbol::delete_package $pkg;
2356 } 2415 }
2357 2416
2358 warn "unload all perl modules loaded from $LIBDIR"; 2417 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2418 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2419 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2420
2362 warn "removing <$k>"; 2421 warn "... unloading $k";
2363 delete $INC{$k}; 2422 delete $INC{$k};
2364 2423
2365 $k =~ s/\.pm$//; 2424 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2425 $k =~ s/\//::/g;
2367 2426
… …
2370 } 2429 }
2371 2430
2372 Symbol::delete_package $k; 2431 Symbol::delete_package $k;
2373 } 2432 }
2374 2433
2375 warn "get rid of safe::, as good as possible"; 2434 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2435 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 2437
2379 warn "unload cf.pm \"a bit\""; 2438 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2439 delete $INC{"cf.pm"};
2381 2440
2382 # don't, removes xs symbols, too, 2441 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2442 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2443 #Symbol::delete_package __PACKAGE__;
2385 2444
2445 warn "unload completed, starting to reload now";
2446
2386 warn "reloading cf.pm"; 2447 warn "reloading cf.pm";
2387 require cf; 2448 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2450
2390 warn "load config and database again"; 2451 warn "loading config and database again";
2391 cf::cfg_load; 2452 cf::cfg_load;
2392 cf::db_load; 2453 cf::db_load;
2393 2454
2394 warn "load extensions"; 2455 warn "loading extensions";
2395 cf::load_extensions; 2456 cf::load_extensions;
2396 2457
2397 warn "reattach attachments to objects/players"; 2458 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2459 _global_reattach;
2399 warn "reattach attachments to maps"; 2460 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "restarting server ticker";
2464
2465 $TICK_WATCHER->start;
2401 }; 2466 };
2402 2467
2403 if ($@) { 2468 if ($@) {
2404 warn $@; 2469 warn $@;
2405 warn "error while reloading, exiting."; 2470 warn "error while reloading, exiting.";
… …
2407 } 2472 }
2408 2473
2409 warn "reloaded"; 2474 warn "reloaded";
2410}; 2475};
2411 2476
2412############################################################################# 2477our $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 2478
2455register_command "reload" => sub { 2479register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2480 my ($who, $arg) = @_;
2457 2481
2458 if ($who->flag (FLAG_WIZ)) { 2482 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2483 $who->message ("reloading server.");
2484
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2460 reload; 2493 reload;
2461 $who->message ("end of reload."); 2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2462 } 2497 }
2463}; 2498};
2464 2499
2465unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2501
2502my $bug_warning = 0;
2466 2503
2467$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2505 reentrant => 0,
2506 parked => 1,
2469 prio => 0, 2507 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2472 cb => sub { 2510 cb => sub {
2511 if ($Coro::current != $Coro::main) {
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10;
2514 return;
2515 }
2516
2473 $NOW = Event::time; 2517 $NOW = Event::time;
2474 2518
2475 cf::server_tick; # one server iteration 2519 cf::server_tick; # one server iteration
2476 $RUNTIME += $TICK; 2520 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2478 2522
2479 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2481 2531
2482 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2484 2534
2485 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2487 }, 2537 },
2488); 2538);
2489 2539
2490IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2491 2541
2492Event->io ( 2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2546 poll => 'r',
2495 prio => 5, 2547 prio => 6,
2496 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2498); 2550);
2499 2551
2500Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2501 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2502 after => 0, 2555 after => 1,
2503 interval => 10, 2556 interval => 10,
2504 cb => sub { 2557 prio => 6, # keep it lowest so it acts like a watchdog
2505 (Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2506 write_runtime 2559 write_runtime
2507 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2508 })->();
2509 }, 2561 },
2510); 2562);
2511 2563
2512END { cf::emergency_save } 2564END { cf::emergency_save }
2513 2565

Diff Legend

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