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.196 by root, Sat Jan 27 23:59:29 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;
84 87
85############################################################################# 88#############################################################################
86 89
87=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
256} 259}
257 260
258sub freeze_mainloop { 261sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
260 263
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
262 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
263 $guard 270 $guard
264} 271}
265 272
266=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
342 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
343 350
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 352 or return;
346 353
354 my $value = $cf::RUNTIME + 90 + 10;
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 359 and return;
350 360
351 aio_fsync $fh 361 aio_fsync $fh
352 and return; 362 and return;
… …
361} 371}
362 372
363=back 373=back
364 374
365=cut 375=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 376
531############################################################################# 377#############################################################################
532 378
533=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
534 380
… …
660our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
661our @CB_MAP = (); 507our @CB_MAP = ();
662 508
663my %attachment; 509my %attachment;
664 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
665sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
666 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
667 519
668 use sort 'stable'; 520 use sort 'stable';
669 521
… …
840# object support 692# object support
841 693
842sub reattach { 694sub reattach {
843 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 699
846 my $registry = $obj->registry; 700 my $registry = $obj->registry;
847 701
848 @$registry = (); 702 @$registry = ();
849 703
… …
1036 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
1037 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1038 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1039 . "\n};\n1"; 893 . "\n};\n1";
1040 894
1041 eval $source 895 unless (eval $source) {
1042 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1043 : "extension disabled.\n"; 897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
1044 905
1045 push @EXTS, $pkg; 906 push @EXTS, $pkg;
1046} 907}
1047 908
1048sub load_extensions { 909sub load_extensions {
… …
1054 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1055 } 916 }
1056} 917}
1057 918
1058############################################################################# 919#############################################################################
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 920
1074=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1075 922
1076Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1077 924
… …
1113 960
1114sub exists($) { 961sub exists($) {
1115 my ($login) = @_; 962 my ($login) = @_;
1116 963
1117 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1119} 966}
1120 967
1121sub find($) { 968sub find($) {
1122 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0]; 970 my $login = $_[0];
… …
1213 \@logins 1060 \@logins
1214} 1061}
1215 1062
1216=item $player->maps 1063=item $player->maps
1217 1064
1218Returns an arrayref of cf::path's of all maps that are private for this 1065Returns an arrayref of map paths that are private for this
1219player. May block. 1066player. May block.
1220 1067
1221=cut 1068=cut
1222 1069
1223sub maps($) { 1070sub maps($) {
… …
1231 for (@$files) { 1078 for (@$files) {
1232 utf8::decode $_; 1079 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1235 1082
1083 s/\.map$//;
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1237 } 1085 }
1238 1086
1239 \@paths 1087 \@paths
1240} 1088}
1241 1089
… …
1267package cf::map; 1115package cf::map;
1268 1116
1269use Fcntl; 1117use Fcntl;
1270use Coro::AIO; 1118use Coro::AIO;
1271 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1272our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1273our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1274 1126
1275sub generate_random_map { 1127sub generate_random_map {
1276 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1277
1278 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1130 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
… …
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1142 )
1293} 1143}
1294 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1153sub register {
1154 my (undef, $regex, $prio) = @_;
1155 my $pkg = caller;
1156
1157 no strict;
1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1159
1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1161}
1162
1163# also paths starting with '/'
1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1177
1178sub normalise {
1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1182
1183 # map plan:
1184 #
1185 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths
1188 # ?random/... random maps
1189 # /... normal maps
1190 # ~user/... per-player map of a specific user
1191
1192 $path =~ s/$PATH_SEP/\//go;
1193
1194 # treat it as relative path if it starts with
1195 # something that looks reasonable
1196 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1197 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1198
1199 $base =~ s{[^/]+/?$}{};
1200 $path = "$base/$path";
1201 }
1202
1203 for ($path) {
1204 redo if s{//}{/};
1205 redo if s{/\.?/}{/};
1206 redo if s{/[^/]+/\.\./}{/};
1207 }
1208
1209 $path
1210}
1211
1212sub new_from_path {
1213 my (undef, $path, $base) = @_;
1214
1215 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1216
1217 $path = normalise $path, $base;
1218
1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1221 my $self = bless cf::map::new, $pkg;
1222 $self->{path} = $path; $self->path ($path);
1223 $self->init; # pass $1 etc.
1224 return $self;
1225 }
1226 }
1227
1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1229 ()
1230}
1231
1232sub init {
1233 my ($self) = @_;
1234
1235 $self
1236}
1237
1238sub as_string {
1239 my ($self) = @_;
1240
1241 "$self->{path}"
1242}
1243
1244# the displayed name, this is a one way mapping
1245sub visible_name {
1246 &as_string
1247}
1248
1249# the original (read-only) location
1250sub load_path {
1251 my ($self) = @_;
1252
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1254}
1255
1256# the temporary/swap location
1257sub save_path {
1258 my ($self) = @_;
1259
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1262}
1263
1264# the unique path, undef == no special unique path
1265sub uniq_path {
1266 my ($self) = @_;
1267
1268 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1269 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1270}
1271
1295# and all this just because we cannot iterate over 1272# and all this just because we cannot iterate over
1296# all maps in C++... 1273# all maps in C++...
1297sub change_all_map_light { 1274sub change_all_map_light {
1298 my ($change) = @_; 1275 my ($change) = @_;
1299 1276
1300 $_->change_map_light ($change) 1277 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1278 for grep $_->outdoor, values %cf::MAP;
1302} 1279}
1303 1280
1281sub unlink_save {
1282 my ($self) = @_;
1283
1284 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1287}
1288
1304sub load_map_header($) { 1289sub load_header_from($) {
1305 my ($path) = @_; 1290 my ($self, $path) = @_;
1306 1291
1307 utf8::encode $path; 1292 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1293 aio_open $path, O_RDONLY, 0
1309 or return; 1294 or return;
1310 1295
1311 my $map = cf::map::new 1296 $self->_load_header ($path)
1312 or return; 1297 or return;
1313 1298
1314 # for better error messages only, will be overwritten later 1299 $self->{load_path} = $path;
1315 $map->path ($path);
1316 1300
1317 $map->load_header ($path) 1301 1
1302}
1303
1304sub load_header_orig {
1305 my ($self) = @_;
1306
1307 $self->load_header_from ($self->load_path)
1308}
1309
1310sub load_header_temp {
1311 my ($self) = @_;
1312
1313 $self->load_header_from ($self->save_path)
1314}
1315
1316sub prepare_temp {
1317 my ($self) = @_;
1318
1319 $self->last_access ((delete $self->{last_access})
1320 || $cf::RUNTIME); #d#
1321 # safety
1322 $self->{instantiate_time} = $cf::RUNTIME
1323 if $self->{instantiate_time} > $cf::RUNTIME;
1324}
1325
1326sub prepare_orig {
1327 my ($self) = @_;
1328
1329 $self->{load_original} = 1;
1330 $self->{instantiate_time} = $cf::RUNTIME;
1331 $self->last_access ($cf::RUNTIME);
1332 $self->instantiate;
1333}
1334
1335sub load_header {
1336 my ($self) = @_;
1337
1338 if ($self->load_header_temp) {
1339 $self->prepare_temp;
1340 } else {
1341 $self->load_header_orig
1318 or return; 1342 or return;
1343 $self->prepare_orig;
1344 }
1319 1345
1320 $map->{load_path} = $path; 1346 1
1321
1322 $map
1323} 1347}
1324 1348
1325sub find; 1349sub find;
1326sub find { 1350sub find {
1327 my ($path, $origin) = @_; 1351 my ($path, $origin) = @_;
1328 1352
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1353 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1354
1334 cf::lock_wait "map_find:$key"; 1355 cf::lock_wait "map_find:$path";
1335 1356
1336 $cf::MAP{$key} || do { 1357 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1358 my $guard = cf::lock_acquire "map_find:$path";
1338 1359 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; 1360 or return;
1353 1361
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; 1362 $map->{last_save} = $cf::RUNTIME;
1366 1363
1367 Coro::cede; 1364 $map->load_header
1365 or return;
1368 1366
1369 if ($map->should_reset) { 1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1370 $map->reset;
1371 undef $guard; 1371 undef $guard;
1372 $map = find $path 1372 return find $path;
1373 or return;
1374 } 1373 }
1375 1374
1376 $cf::MAP{$key} = $map 1375 $cf::MAP{$path} = $map
1377 } 1376 }
1378} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1379 1381
1380sub load { 1382sub load {
1381 my ($self) = @_; 1383 my ($self) = @_;
1382 1384
1385 local $self->{deny_reset} = 1; # loading can take a long time
1386
1383 my $path = $self->{path}; 1387 my $path = $self->{path};
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1388 my $guard = cf::lock_acquire "map_load:$path";
1385 1389
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1390 return if $self->in_memory != cf::MAP_SWAPPED;
1387 1391
1388 $self->in_memory (cf::MAP_LOADING); 1392 $self->in_memory (cf::MAP_LOADING);
1389 1393
1390 $self->alloc; 1394 $self->alloc;
1395
1396 $self->pre_load;
1397
1391 $self->load_objects ($self->{load_path}, 1) 1398 $self->_load_objects ($self->{load_path}, 1)
1392 or return; 1399 or return;
1393 1400
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1401 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1402 if delete $self->{load_original};
1396 1403
1397 if (my $uniq = $path->uniq_path) { 1404 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1405 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1406 if (aio_open $uniq, O_RDONLY, 0) {
1400 $self->clear_unique_items; 1407 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1408 $self->_load_objects ($uniq, 0);
1402 } 1409 }
1403 } 1410 }
1404 1411
1405 Coro::cede; 1412 Coro::cede;
1406 1413
1407 # now do the right thing for maps 1414 # now do the right thing for maps
1408 $self->link_multipart_objects; 1415 $self->link_multipart_objects;
1409 1416
1410 if ($self->{path}->is_style_map) { 1417 unless ($self->{deny_activate}) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects; 1418 $self->decay_objects;
1415 $self->fix_auto_apply; 1419 $self->fix_auto_apply;
1416 $self->update_buttons; 1420 $self->update_buttons;
1421 Coro::cede;
1417 $self->set_darkness_map; 1422 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1423 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1424 unless $self->difficulty;
1425 Coro::cede;
1420 $self->activate; 1426 $self->activate;
1421 } 1427 }
1422 1428
1423 Coro::cede; 1429 $self->post_load;
1424 1430
1425 $self->in_memory (cf::MAP_IN_MEMORY); 1431 $self->in_memory (cf::MAP_IN_MEMORY);
1432}
1433
1434sub customise_for {
1435 my ($self, $ob) = @_;
1436
1437 return find "~" . $ob->name . "/" . $self->{path}
1438 if $self->per_player;
1439
1440 $self
1426} 1441}
1427 1442
1428# find and load all maps in the 3x3 area around a map 1443# find and load all maps in the 3x3 area around a map
1429sub load_diag { 1444sub load_diag {
1430 my ($map) = @_; 1445 my ($map) = @_;
… …
1460 1475
1461 cf::sync_job { $map->load }; 1476 cf::sync_job { $map->load };
1462} 1477}
1463 1478
1464our %MAP_PREFETCH; 1479our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async { 1480our $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 1481
1480sub find_async { 1482sub find_async {
1481 my ($path, $origin) = @_; 1483 my ($path, $origin) = @_;
1482 1484
1483 $path = new cf::path $path, $origin && $origin->path; 1485 $path = normalise $path, $origin && $origin->{path};
1484 my $key = $path->as_string;
1485 1486
1486 if (my $map = $cf::MAP{$key}) { 1487 if (my $map = $cf::MAP{$path}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1488 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 } 1489 }
1489 1490
1490 $MAP_PREFETCH{$key} = $path; 1491 undef $MAP_PREFETCH{$path};
1492 $MAP_PREFETCHER ||= cf::async {
1493 while (%MAP_PREFETCH) {
1494 for my $path (keys %MAP_PREFETCH) {
1495 my $map = find $path
1496 or next;
1497 $map->load;
1498
1499 delete $MAP_PREFETCH{$path};
1500 }
1501 }
1502 undef $MAP_PREFETCHER;
1503 };
1491 $MAP_PREFETCHER->ready; 1504 $MAP_PREFETCHER->prio (6);
1492 1505
1493 () 1506 ()
1494} 1507}
1495 1508
1496sub save { 1509sub save {
… …
1500 1513
1501 $self->{last_save} = $cf::RUNTIME; 1514 $self->{last_save} = $cf::RUNTIME;
1502 1515
1503 return unless $self->dirty; 1516 return unless $self->dirty;
1504 1517
1505 my $save = $self->{path}->save_path; utf8::encode $save; 1518 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1519 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 1520
1508 $self->{load_path} = $save; 1521 $self->{load_path} = $save;
1509 1522
1510 return if $self->{deny_save}; 1523 return if $self->{deny_save};
1511 1524
… …
1514 cf::async { 1527 cf::async {
1515 $_->contr->save for $self->players; 1528 $_->contr->save for $self->players;
1516 }; 1529 };
1517 1530
1518 if ($uniq) { 1531 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1532 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 1533 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 1534 } else {
1522 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1535 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1523 } 1536 }
1524} 1537}
1525 1538
1526sub swap_out { 1539sub swap_out {
1527 my ($self) = @_; 1540 my ($self) = @_;
… …
1541 1554
1542sub reset_at { 1555sub reset_at {
1543 my ($self) = @_; 1556 my ($self) = @_;
1544 1557
1545 # TODO: safety, remove and allow resettable per-player maps 1558 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel}; 1559 return 1e99 if $self->isa ("ext::map_per_player");#d#
1547 return 1e99 if $self->{deny_reset}; 1560 return 1e99 if $self->{deny_reset};
1548 1561
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1562 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1563 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1551 1564
… …
1556 my ($self) = @_; 1569 my ($self) = @_;
1557 1570
1558 $self->reset_at <= $cf::RUNTIME 1571 $self->reset_at <= $cf::RUNTIME
1559} 1572}
1560 1573
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 { 1574sub reset {
1575 my ($self) = @_; 1575 my ($self) = @_;
1576 1576
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1577 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1578
1579 return if $self->players; 1579 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1580 return if $self->isa ("ext::map_per_player");#d#
1581 1581
1582 warn "resetting map ", $self->path;#d# 1582 warn "resetting map ", $self->path;#d#
1583 1583
1584 delete $cf::MAP{$self->path}; 1584 delete $cf::MAP{$self->path};
1585 1585
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear;
1588
1586 $_->clear_links_to ($self) for values %cf::MAP; 1589 $_->clear_links_to ($self) for values %cf::MAP;
1587 1590
1588 $self->{path}->unlink_save; 1591 $self->unlink_save;
1589 $self->destroy; 1592 $self->destroy;
1590} 1593}
1591 1594
1592my $nuke_counter = "aaaa"; 1595my $nuke_counter = "aaaa";
1593 1596
1594sub nuke { 1597sub nuke {
1595 my ($self) = @_; 1598 my ($self) = @_;
1596 1599
1600 delete $cf::MAP{$self->path};
1601
1602 $self->unlink_save;
1603
1604 bless $self, "cf::map";
1605 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1606 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1607 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1608 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1609
1610 $cf::MAP{$self->path} = $self;
1611
1600 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1601} 1613}
1602 1614
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 1615=item cf::map::unique_maps
1614 1616
1615Returns an arrayref of cf::path's of all shared maps that have 1617Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1618instantiated unique items. May block.
1617 1619
1618=cut 1620=cut
1619 1621
1620sub unique_maps() { 1622sub unique_maps() {
… …
1626 for (@$files) { 1628 for (@$files) {
1627 utf8::decode $_; 1629 utf8::decode $_;
1628 next if /\.pst$/; 1630 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1631 next unless /^$PATH_SEP/o;
1630 1632
1633 s/\.map$//;
1631 push @paths, new cf::path $_; 1634 push @paths, $_;
1632 } 1635 }
1633 1636
1634 \@paths 1637 \@paths
1635} 1638}
1636 1639
… …
1711 1714
1712=item $player_object->enter_link 1715=item $player_object->enter_link
1713 1716
1714Freezes the player and moves him/her to a special map (C<{link}>). 1717Freezes the player and moves him/her to a special map (C<{link}>).
1715 1718
1716The player should be reaosnably safe there for short amounts of time. You 1719The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1720I<MUST> call C<leave_link> as soon as possible, though.
1718 1721
1722Will never block.
1723
1719=item $player_object->leave_link ($map, $x, $y) 1724=item $player_object->leave_link ($map, $x, $y)
1720 1725
1721Moves the player out of the specila link map onto the given map. If the 1726Moves 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 1727map. 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, 1728to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1729fails, to the emergency map position.
1725 1730
1726Might block. 1731Might block.
1727 1732
1728=cut 1733=cut
1734
1735sub link_map {
1736 unless ($LINK_MAP) {
1737 $LINK_MAP = cf::map::find "{link}"
1738 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1739 $LINK_MAP->load;
1740 }
1741
1742 $LINK_MAP
1743}
1729 1744
1730sub cf::object::player::enter_link { 1745sub cf::object::player::enter_link {
1731 my ($self) = @_; 1746 my ($self) = @_;
1732 1747
1733 $self->deactivate_recursive; 1748 $self->deactivate_recursive;
1734 1749
1735 return if $self->map == $LINK_MAP; 1750 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1751
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1753 if $self->map;
1739 1754
1740 $self->enter_map ($LINK_MAP, 20, 20); 1755 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1756}
1742 1757
1743sub cf::object::player::leave_link { 1758sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1759 my ($self, $map, $x, $y) = @_;
1745 1760
… …
1809=cut 1824=cut
1810 1825
1811sub cf::object::player::goto { 1826sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1827 my ($self, $path, $x, $y) = @_;
1813 1828
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1829 $self->enter_link;
1817 1830
1818 (async { 1831 (async {
1819 my $map = cf::map::find $path->as_string; 1832 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1833 $map = $map->customise_for ($self) if $map;
1821 1834
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1835# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1836# if $map;
1824 1837
… …
1834 1847
1835sub parse_random_map_params { 1848sub parse_random_map_params {
1836 my ($spec) = @_; 1849 my ($spec) = @_;
1837 1850
1838 my $rmp = { # defaults 1851 my $rmp = { # defaults
1839 xsize => 10, 1852 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1853 ysize => (cf::rndm 15, 40),
1854 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1855 #layout => string,
1841 }; 1856 };
1842 1857
1843 for (split /\n/, $spec) { 1858 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1859 my ($k, $v) = split /\s+/, $_, 2;
1845 1860
… …
1849 $rmp 1864 $rmp
1850} 1865}
1851 1866
1852sub prepare_random_map { 1867sub prepare_random_map {
1853 my ($exit) = @_; 1868 my ($exit) = @_;
1869
1870 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1871
1855 # all this does is basically replace the /! path by 1872 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1873 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1874 # that depends on the exit object
1858 1875
… …
1867 1884
1868 $rmp->{random_seed} ||= $exit->random_seed; 1885 $rmp->{random_seed} ||= $exit->random_seed;
1869 1886
1870 my $data = cf::to_json $rmp; 1887 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1888 my $md5 = Digest::MD5::md5_hex $data;
1889 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1890
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1891 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1892 aio_write $fh, 0, (length $data), $data, 0;
1893 undef $fh;
1894 aio_rename "$meta~", $meta;
1875 1895
1876 $exit->slaying ("?random/$md5"); 1896 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1897 $exit->msg (undef);
1878 } 1898 }
1879} 1899}
1880 1900
1881sub cf::object::player::enter_exit { 1901sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1902 my ($self, $exit) = @_;
1883 1903
1884 return unless $self->type == cf::PLAYER; 1904 return unless $self->type == cf::PLAYER;
1905
1906 if ($exit->slaying eq "/!") {
1907 #TODO: this should de-fi-ni-te-ly not be a sync-job
1908 cf::sync_job { prepare_random_map $exit };
1909 }
1910
1911 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1912 my $hp = $exit->stats->hp;
1913 my $sp = $exit->stats->sp;
1885 1914
1886 $self->enter_link; 1915 $self->enter_link;
1887 1916
1888 (async { 1917 (async {
1889 $self->deactivate_recursive; # just to be sure 1918 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1919 unless (eval {
1891 prepare_random_map $exit 1920 $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 1921
1897 1; 1922 1;
1898 }) { 1923 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1924 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "I'll try to bring you back to the map you were before. " 1925 . "I'll try to bring you back to the map you were before. "
… …
2189 sub db_sync() { 2214 sub db_sync() {
2190 db_save if $dirty; 2215 db_save if $dirty;
2191 undef $dirty; 2216 undef $dirty;
2192 } 2217 }
2193 2218
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2219 my $idle = Event->idle (
2195 db_sync; 2220 reentrant => 0,
2221 min => 10,
2222 max => 20,
2223 repeat => 0,
2224 data => WF_AUTOCANCEL,
2225 cb => \&db_sync,
2196 }); 2226 );
2197 2227
2198 sub db_dirty() { 2228 sub db_dirty() {
2199 $dirty = 1; 2229 $dirty = 1;
2200 $idle->start; 2230 $idle->start;
2201 } 2231 }
… …
2249 2279
2250sub main { 2280sub main {
2251 # we must not ever block the main coroutine 2281 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2282 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2283 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2284 (async {
2254 async { Event::one_event }; 2285 Event::one_event;
2286 })->prio (Coro::PRIO_MAX);
2255 }; 2287 };
2256 2288
2257 cfg_load; 2289 cfg_load;
2258 db_load; 2290 db_load;
2259 load_extensions; 2291 load_extensions;
2292
2293 $TICK_WATCHER->start;
2260 Event::loop; 2294 Event::loop;
2261} 2295}
2262 2296
2263############################################################################# 2297#############################################################################
2264# initialisation and cleanup 2298# initialisation and cleanup
2265 2299
2266# install some emergency cleanup handlers 2300# install some emergency cleanup handlers
2267BEGIN { 2301BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2302 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2303 Event->signal (
2304 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2305 data => WF_AUTOCANCEL,
2271 signal => $signal, 2306 signal => $signal,
2307 prio => 0,
2272 cb => sub { 2308 cb => sub {
2273 cf::cleanup "SIG$signal"; 2309 cf::cleanup "SIG$signal";
2274 }, 2310 },
2275 ); 2311 );
2276 } 2312 }
2277} 2313}
… …
2282 warn "enter emergency perl save\n"; 2318 warn "enter emergency perl save\n";
2283 2319
2284 cf::sync_job { 2320 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2321 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2322 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2323 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2324 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2325 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2326 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2327 $pl->valid or next;
2292 $pl->save; 2328 $pl->save;
… …
2306} 2342}
2307 2343
2308sub reload() { 2344sub reload() {
2309 # can/must only be called in main 2345 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2346 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2347 warn "can only reload from main coroutine";
2312 return; 2348 return;
2313 } 2349 }
2314 2350
2315 warn "reloading..."; 2351 warn "reloading...";
2316 2352
2317 warn "freezing server"; 2353 warn "cancelling server ticker";
2318 my $guard = freeze_mainloop; 2354 $TICK_WATCHER->cancel;
2355
2319 cf::emergency_save; 2356 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324 2357
2325 eval { 2358 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 2359 # if anything goes wrong in here, we should simply crash as we already saved
2327 2360
2361 warn "syncing database to disk";
2362 cf::db_sync;
2363
2328 warn "cancel all watchers"; 2364 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2367 }
2332 2368
2369 warn "flushing outstanding aio requests";
2370 for (;;) {
2371 IO::AIO::flush;
2372 Coro::cede;
2373 last unless IO::AIO::nreqs;
2374 warn "iterate...";
2375 }
2376
2333 warn "cancel all extension coros"; 2377 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2378 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2379 %EXT_CORO = ();
2336 2380
2337 warn "remove commands"; 2381 warn "removing commands";
2338 %COMMAND = (); 2382 %COMMAND = ();
2339 2383
2340 warn "remove ext commands"; 2384 warn "removing ext commands";
2341 %EXTCMD = (); 2385 %EXTCMD = ();
2342 2386
2343 warn "unload/nuke all extensions"; 2387 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2388 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2389 warn "... unloading $pkg";
2346 2390
2347 if (my $cb = $pkg->can ("unload")) { 2391 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2392 eval {
… …
2353 2397
2354 warn "... nuking $pkg"; 2398 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2399 Symbol::delete_package $pkg;
2356 } 2400 }
2357 2401
2358 warn "unload all perl modules loaded from $LIBDIR"; 2402 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2403 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2404 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2405
2362 warn "removing <$k>"; 2406 warn "... unloading $k";
2363 delete $INC{$k}; 2407 delete $INC{$k};
2364 2408
2365 $k =~ s/\.pm$//; 2409 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2410 $k =~ s/\//::/g;
2367 2411
… …
2370 } 2414 }
2371 2415
2372 Symbol::delete_package $k; 2416 Symbol::delete_package $k;
2373 } 2417 }
2374 2418
2375 warn "get rid of safe::, as good as possible"; 2419 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2420 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2421 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 2422
2379 warn "unload cf.pm \"a bit\""; 2423 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2424 delete $INC{"cf.pm"};
2381 2425
2382 # don't, removes xs symbols, too, 2426 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2427 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2428 #Symbol::delete_package __PACKAGE__;
2385 2429
2430 warn "unload completed, starting to reload now";
2431
2386 warn "reloading cf.pm"; 2432 warn "reloading cf.pm";
2387 require cf; 2433 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2434 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2435
2390 warn "load config and database again"; 2436 warn "loading config and database again";
2391 cf::cfg_load; 2437 cf::cfg_load;
2392 cf::db_load; 2438 cf::db_load;
2393 2439
2394 warn "load extensions"; 2440 warn "loading extensions";
2395 cf::load_extensions; 2441 cf::load_extensions;
2396 2442
2397 warn "reattach attachments to objects/players"; 2443 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2444 _global_reattach;
2399 warn "reattach attachments to maps"; 2445 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2446 reattach $_ for values %MAP;
2447
2448 warn "restarting server ticker";
2449
2450 $TICK_WATCHER->start;
2401 }; 2451 };
2402 2452
2403 if ($@) { 2453 if ($@) {
2404 warn $@; 2454 warn $@;
2405 warn "error while reloading, exiting."; 2455 warn "error while reloading, exiting.";
… …
2407 } 2457 }
2408 2458
2409 warn "reloaded"; 2459 warn "reloaded";
2410}; 2460};
2411 2461
2412############################################################################# 2462our $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 2463
2455register_command "reload" => sub { 2464register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2465 my ($who, $arg) = @_;
2457 2466
2458 if ($who->flag (FLAG_WIZ)) { 2467 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2468 $who->message ("reloading server.");
2469
2470 # doing reload synchronously and two reloads happen back-to-back,
2471 # coro crashes during coro_state_free->destroy here.
2472
2473 $RELOAD_WATCHER ||= Event->timer (
2474 reentrant => 0,
2475 after => 0,
2476 data => WF_AUTOCANCEL,
2477 cb => sub {
2460 reload; 2478 reload;
2461 $who->message ("end of reload."); 2479 undef $RELOAD_WATCHER;
2480 },
2481 );
2462 } 2482 }
2463}; 2483};
2464 2484
2465unshift @INC, $LIBDIR; 2485unshift @INC, $LIBDIR;
2486
2487my $bug_warning = 0;
2466 2488
2467$TICK_WATCHER = Event->timer ( 2489$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2490 reentrant => 0,
2491 parked => 1,
2469 prio => 0, 2492 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2493 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2494 data => WF_AUTOCANCEL,
2472 cb => sub { 2495 cb => sub {
2496 if ($Coro::current != $Coro::main) {
2497 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2498 unless ++$bug_warning > 10;
2499 return;
2500 }
2501
2473 $NOW = Event::time; 2502 $NOW = Event::time;
2474 2503
2475 cf::server_tick; # one server iteration 2504 cf::server_tick; # one server iteration
2476 $RUNTIME += $TICK; 2505 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 2506 $NEXT_TICK += $TICK;
2478 2507
2479 $WAIT_FOR_TICK->broadcast; 2508 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2509 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2510
2511 Event::sweep;
2512 Coro::cede_notself;
2513
2514# my $AFTER = Event::time;
2515# warn $AFTER - $NOW;#d#
2481 2516
2482 # if we are delayed by four ticks or more, skip them all 2517 # if we are delayed by four ticks or more, skip them all
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2518 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2484 2519
2485 $TICK_WATCHER->at ($NEXT_TICK); 2520 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 2521 $TICK_WATCHER->start;
2487 }, 2522 },
2488); 2523);
2489 2524
2490IO::AIO::max_poll_time $TICK * 0.2; 2525IO::AIO::max_poll_time $TICK * 0.1;
2491 2526
2492Event->io ( 2527undef $Coro::AIO::WATCHER;
2528$AIO_POLL_WATCHER = Event->io (
2529 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 2530 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2531 poll => 'r',
2495 prio => 5, 2532 prio => 6,
2496 data => WF_AUTOCANCEL, 2533 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2534 cb => \&IO::AIO::poll_cb,
2498); 2535);
2499 2536
2500Event->timer ( 2537$WRITE_RUNTIME_WATCHER = Event->timer (
2538 reentrant => 0,
2501 data => WF_AUTOCANCEL, 2539 data => WF_AUTOCANCEL,
2502 after => 0, 2540 after => 1,
2503 interval => 10, 2541 interval => 10,
2504 cb => sub { 2542 prio => 6, # keep it lowest so it acts like a watchdog
2505 (Coro::unblock_sub { 2543 cb => Coro::unblock_sub {
2506 write_runtime 2544 write_runtime
2507 or warn "ERROR: unable to write runtime file: $!"; 2545 or warn "ERROR: unable to write runtime file: $!";
2508 })->();
2509 }, 2546 },
2510); 2547);
2511 2548
2512END { cf::emergency_save } 2549END { cf::emergency_save }
2513 2550

Diff Legend

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