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.199 by root, Mon Jan 29 14:46:01 2007 UTC

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

Diff Legend

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