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.165 by root, Fri Jan 12 22:09:22 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 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 378
543############################################################################# 379#############################################################################
544 380
545=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
546 382
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 509our @CB_MAP = ();
674 510
675my %attachment; 511my %attachment;
676 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
677sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
679 521
680 use sort 'stable'; 522 use sort 'stable';
681 523
… …
852# object support 694# object support
853 695
854sub reattach { 696sub reattach {
855 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 701
858 my $registry = $obj->registry; 702 my $registry = $obj->registry;
859 703
860 @$registry = (); 704 @$registry = ();
861 705
… …
1048 "package $pkg; use strict; use utf8;\n" 892 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 893 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 894 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 895 . "\n};\n1";
1052 896
1053 eval $source 897 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 898 my $msg = $@ ? "$path: $@\n"
1055 : "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 }
1056 907
1057 push @EXTS, $pkg; 908 push @EXTS, $pkg;
1058} 909}
1059 910
1060sub load_extensions { 911sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 917 } or warn "$ext not loaded: $@";
1067 } 918 }
1068} 919}
1069 920
1070############################################################################# 921#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 922
1086=head2 CORE EXTENSIONS 923=head2 CORE EXTENSIONS
1087 924
1088Functions and methods that extend core crossfire objects. 925Functions and methods that extend core crossfire objects.
1089 926
… …
1125 962
1126sub exists($) { 963sub exists($) {
1127 my ($login) = @_; 964 my ($login) = @_;
1128 965
1129 $cf::PLAYER{$login} 966 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login } 967 or cf::sync_job { !aio_stat path $login }
1131} 968}
1132 969
1133sub find($) { 970sub find($) {
1134 return $cf::PLAYER{$_[0]} || do { 971 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0]; 972 my $login = $_[0];
… …
1225 \@logins 1062 \@logins
1226} 1063}
1227 1064
1228=item $player->maps 1065=item $player->maps
1229 1066
1230Returns 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
1231player. May block. 1068player. May block.
1232 1069
1233=cut 1070=cut
1234 1071
1235sub maps($) { 1072sub maps($) {
… …
1243 for (@$files) { 1080 for (@$files) {
1244 utf8::decode $_; 1081 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1082 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1083 next unless /^$PATH_SEP/o;
1247 1084
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1249 } 1086 }
1250 1087
1251 \@paths 1088 \@paths
1252} 1089}
1253 1090
… …
1279package cf::map; 1116package cf::map;
1280 1117
1281use Fcntl; 1118use Fcntl;
1282use Coro::AIO; 1119use Coro::AIO;
1283 1120
1121use overload
1122 '""' => \&as_string,
1123 fallback => 1;
1124
1284our $MAX_RESET = 3600; 1125our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1126our $DEFAULT_RESET = 3000;
1286 1127
1287sub generate_random_map { 1128sub generate_random_map {
1288 my ($path, $rmp) = @_; 1129 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1130 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1131 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1132 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1133 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1134 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1135 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1136 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1141 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1142 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1143 )
1305} 1144}
1306 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
1307# and all this just because we cannot iterate over 1275# and all this just because we cannot iterate over
1308# all maps in C++... 1276# all maps in C++...
1309sub change_all_map_light { 1277sub change_all_map_light {
1310 my ($change) = @_; 1278 my ($change) = @_;
1311 1279
1312 $_->change_map_light ($change) 1280 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1281 for grep $_->outdoor, values %cf::MAP;
1314} 1282}
1315 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
1316sub load_map_header($) { 1292sub load_header_from($) {
1317 my ($path) = @_; 1293 my ($self, $path) = @_;
1318 1294
1319 utf8::encode $path; 1295 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1296 aio_open $path, O_RDONLY, 0
1321 or return; 1297 or return;
1322 1298
1323 my $map = cf::map::new 1299 $self->_load_header ($path)
1324 or return; 1300 or return;
1325 1301
1326 # for better error messages only, will be overwritten later 1302 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1303
1329 $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
1330 or return; 1345 or return;
1346 $self->prepare_orig;
1347 }
1331 1348
1332 $map->{load_path} = $path; 1349 1
1333
1334 $map
1335} 1350}
1336 1351
1337sub find; 1352sub find;
1338sub find { 1353sub find {
1339 my ($path, $origin) = @_; 1354 my ($path, $origin) = @_;
1340 1355
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1356 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1357
1346 cf::lock_wait "map_find:$key"; 1358 cf::lock_wait "map_find:$path";
1347 1359
1348 $cf::MAP{$key} || do { 1360 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1361 my $guard = cf::lock_acquire "map_find:$path";
1350 1362 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1363 or return;
1365 1364
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1378 1366
1379 Coro::cede; 1367 $map->load_header
1368 or return;
1380 1369
1381 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;
1382 $map->reset; 1373 $map->reset;
1383 undef $guard; 1374 undef $guard;
1384 $map = find $path 1375 return find $path;
1385 or return;
1386 } 1376 }
1387 1377
1388 $cf::MAP{$key} = $map 1378 $cf::MAP{$path} = $map
1389 } 1379 }
1390} 1380}
1381
1382sub pre_load { }
1383sub post_load { }
1391 1384
1392sub load { 1385sub load {
1393 my ($self) = @_; 1386 my ($self) = @_;
1394 1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1389
1395 my $path = $self->{path}; 1390 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1391 my $guard = cf::lock_acquire "map_load:$path";
1397 1392
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1394
1400 $self->in_memory (cf::MAP_LOADING); 1395 $self->in_memory (cf::MAP_LOADING);
1401 1396
1402 $self->alloc; 1397 $self->alloc;
1398
1399 $self->pre_load;
1400
1403 $self->load_objects ($self->{load_path}, 1) 1401 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1402 or return;
1405 1403
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1404 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1405 if delete $self->{load_original};
1408 1406
1409 if (my $uniq = $path->uniq_path) { 1407 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1408 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1409 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1410 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1411 $self->_load_objects ($uniq, 0);
1414 } 1412 }
1415 } 1413 }
1416 1414
1417 Coro::cede; 1415 Coro::cede;
1418 1416
1419 # now do the right thing for maps 1417 # now do the right thing for maps
1420 $self->link_multipart_objects; 1418 $self->link_multipart_objects;
1421 1419
1422 if ($self->{path}->is_style_map) { 1420 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1421 $self->decay_objects;
1427 $self->fix_auto_apply; 1422 $self->fix_auto_apply;
1428 $self->update_buttons; 1423 $self->update_buttons;
1424 Coro::cede;
1429 $self->set_darkness_map; 1425 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1426 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1427 unless $self->difficulty;
1428 Coro::cede;
1432 $self->activate; 1429 $self->activate;
1433 } 1430 }
1434 1431
1435 Coro::cede; 1432 $self->post_load;
1436 1433
1437 $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
1438} 1444}
1439 1445
1440# 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
1441sub load_diag { 1447sub load_diag {
1442 my ($map) = @_; 1448 my ($map) = @_;
… …
1472 1478
1473 cf::sync_job { $map->load }; 1479 cf::sync_job { $map->load };
1474} 1480}
1475 1481
1476our %MAP_PREFETCH; 1482our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1483our $MAP_PREFETCHER = undef;
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1486 $map->load;
1487 }
1488 Coro::schedule;
1489 }
1490};
1491 1484
1492sub find_async { 1485sub find_async {
1493 my ($path, $origin) = @_; 1486 my ($path, $origin) = @_;
1494 1487
1495 $path = new cf::path $path, $origin && $origin->path; 1488 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1489
1498 if (my $map = $cf::MAP{$key}) { 1490 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1491 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1492 }
1501 1493
1502 $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 };
1503 $MAP_PREFETCHER->ready; 1507 $MAP_PREFETCHER->prio (6);
1504 1508
1505 () 1509 ()
1506} 1510}
1507 1511
1508sub save { 1512sub save {
… …
1512 1516
1513 $self->{last_save} = $cf::RUNTIME; 1517 $self->{last_save} = $cf::RUNTIME;
1514 1518
1515 return unless $self->dirty; 1519 return unless $self->dirty;
1516 1520
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1521 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1522 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1523
1520 $self->{load_path} = $save; 1524 $self->{load_path} = $save;
1521 1525
1522 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1523 1527
… …
1526 cf::async { 1530 cf::async {
1527 $_->contr->save for $self->players; 1531 $_->contr->save for $self->players;
1528 }; 1532 };
1529 1533
1530 if ($uniq) { 1534 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1535 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1536 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1537 } else {
1534 $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);
1535 } 1539 }
1536} 1540}
1537 1541
1538sub swap_out { 1542sub swap_out {
1539 my ($self) = @_; 1543 my ($self) = @_;
… …
1553 1557
1554sub reset_at { 1558sub reset_at {
1555 my ($self) = @_; 1559 my ($self) = @_;
1556 1560
1557 # TODO: safety, remove and allow resettable per-player maps 1561 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1562 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1563 return 1e99 if $self->{deny_reset};
1560 1564
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 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;
1563 1567
… …
1568 my ($self) = @_; 1572 my ($self) = @_;
1569 1573
1570 $self->reset_at <= $cf::RUNTIME 1574 $self->reset_at <= $cf::RUNTIME
1571} 1575}
1572 1576
1573sub rename {
1574 my ($self, $new_path) = @_;
1575
1576 $self->{path}->unlink_save;
1577
1578 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path;
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self;
1582
1583 $self->save;
1584}
1585
1586sub reset { 1577sub reset {
1587 my ($self) = @_; 1578 my ($self) = @_;
1588 1579
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1580 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1581
1591 return if $self->players; 1582 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1583 return if $self->isa ("ext::map_per_player");#d#
1593 1584
1594 warn "resetting map ", $self->path;#d# 1585 warn "resetting map ", $self->path;#d#
1595 1586
1596 delete $cf::MAP{$self->path}; 1587 delete $cf::MAP{$self->path};
1597 1588
1589 $self->in_memory (cf::MAP_SWAPPED);
1590 $self->clear;
1591
1598 $_->clear_links_to ($self) for values %cf::MAP; 1592 $_->clear_links_to ($self) for values %cf::MAP;
1599 1593
1600 $self->{path}->unlink_save; 1594 $self->unlink_save;
1601 $self->destroy; 1595 $self->destroy;
1602} 1596}
1603 1597
1604my $nuke_counter = "aaaa"; 1598my $nuke_counter = "aaaa";
1605 1599
1606sub nuke { 1600sub nuke {
1607 my ($self) = @_; 1601 my ($self) = @_;
1608 1602
1603 delete $cf::MAP{$self->path};
1604
1605 $self->unlink_save;
1606
1607 bless $self, "cf::map";
1608 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1609 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1612
1613 $cf::MAP{$self->path} = $self;
1614
1612 $self->reset; # polite request, might not happen 1615 $self->reset; # polite request, might not happen
1613} 1616}
1614 1617
1615=item cf::map::unique_maps 1618=item cf::map::unique_maps
1616 1619
1617Returns an arrayref of cf::path's of all shared maps that have 1620Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1621instantiated unique items. May block.
1619 1622
1620=cut 1623=cut
1621 1624
1622sub unique_maps() { 1625sub unique_maps() {
… …
1628 for (@$files) { 1631 for (@$files) {
1629 utf8::decode $_; 1632 utf8::decode $_;
1630 next if /\.pst$/; 1633 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1634 next unless /^$PATH_SEP/o;
1632 1635
1633 push @paths, new cf::path $_; 1636 push @paths, cf::map::normalise $_;
1634 } 1637 }
1635 1638
1636 \@paths 1639 \@paths
1637} 1640}
1638 1641
… …
1713 1716
1714=item $player_object->enter_link 1717=item $player_object->enter_link
1715 1718
1716Freezes 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}>).
1717 1720
1718The 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
1719I<MUST> call C<leave_link> as soon as possible, though. 1722I<MUST> call C<leave_link> as soon as possible, though.
1720 1723
1724Will never block.
1725
1721=item $player_object->leave_link ($map, $x, $y) 1726=item $player_object->leave_link ($map, $x, $y)
1722 1727
1723Moves 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
1724map 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
1725location 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
1726to the emergency map position. 1731fails, to the emergency map position.
1727 1732
1728Might block. 1733Might block.
1729 1734
1730=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}
1731 1746
1732sub cf::object::player::enter_link { 1747sub cf::object::player::enter_link {
1733 my ($self) = @_; 1748 my ($self) = @_;
1734 1749
1735 $self->deactivate_recursive; 1750 $self->deactivate_recursive;
1736 1751
1737 return if $self->map == $LINK_MAP; 1752 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1753
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1754 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1755 if $self->map;
1741 1756
1742 $self->enter_map ($LINK_MAP, 20, 20); 1757 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1743} 1758}
1744 1759
1745sub cf::object::player::leave_link { 1760sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1761 my ($self, $map, $x, $y) = @_;
1747 1762
… …
1811=cut 1826=cut
1812 1827
1813sub cf::object::player::goto { 1828sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1815 1830
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1831 $self->enter_link;
1819 1832
1820 (async { 1833 (async {
1834 my $map = eval {
1821 my $map = cf::map::find $path->as_string; 1835 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1823 1837 $map
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1825# if $map;
1826
1827 $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);
1828 1840
1829 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1830 })->prio (1); 1842 })->prio (1);
1831} 1843}
1832 1844
… …
1836 1848
1837sub parse_random_map_params { 1849sub parse_random_map_params {
1838 my ($spec) = @_; 1850 my ($spec) = @_;
1839 1851
1840 my $rmp = { # defaults 1852 my $rmp = { # defaults
1841 xsize => 10, 1853 xsize => (cf::rndm 15, 40),
1842 ysize => 10, 1854 ysize => (cf::rndm 15, 40),
1855 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1856 #layout => string,
1843 }; 1857 };
1844 1858
1845 for (split /\n/, $spec) { 1859 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1860 my ($k, $v) = split /\s+/, $_, 2;
1847 1861
… …
1851 $rmp 1865 $rmp
1852} 1866}
1853 1867
1854sub prepare_random_map { 1868sub prepare_random_map {
1855 my ($exit) = @_; 1869 my ($exit) = @_;
1870
1871 my $guard = cf::lock_acquire "exit_prepare:$exit";
1856 1872
1857 # all this does is basically replace the /! path by 1873 # all this does is basically replace the /! path by
1858 # a new random map path (?random/...) with a seed 1874 # a new random map path (?random/...) with a seed
1859 # that depends on the exit object 1875 # that depends on the exit object
1860 1876
1861 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1862 1878
1863 if ($exit->map) { 1879 if ($exit->map) {
1864 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1865 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1866 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1867 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1868 } 1884 }
1869 1885
1870 $rmp->{random_seed} ||= $exit->random_seed; 1886 $rmp->{random_seed} ||= $exit->random_seed;
1871 1887
1872 my $data = cf::to_json $rmp; 1888 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1889 my $md5 = Digest::MD5::md5_hex $data;
1890 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1891
1875 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) {
1876 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;
1877 1896
1878 $exit->slaying ("?random/$md5"); 1897 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1898 $exit->msg (undef);
1880 } 1899 }
1881} 1900}
1882 1901
1883sub cf::object::player::enter_exit { 1902sub cf::object::player::enter_exit {
1884 my ($self, $exit) = @_; 1903 my ($self, $exit) = @_;
1885 1904
1886 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;
1887 1915
1888 $self->enter_link; 1916 $self->enter_link;
1889 1917
1890 (async { 1918 (async {
1891 $self->deactivate_recursive; # just to be sure 1919 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1920 unless (eval {
1893 prepare_random_map $exit 1921 $self->goto ($slaying, $hp, $sp);
1894 if $exit->slaying eq "/!";
1895
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1922
1899 1; 1923 1;
1900 }) { 1924 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1925 $self->message ("Something went wrong deep within the crossfire server. "
1902 . "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. "
… …
2191 sub db_sync() { 2215 sub db_sync() {
2192 db_save if $dirty; 2216 db_save if $dirty;
2193 undef $dirty; 2217 undef $dirty;
2194 } 2218 }
2195 2219
2196 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2220 my $idle = Event->idle (
2197 db_sync; 2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2198 }); 2227 );
2199 2228
2200 sub db_dirty() { 2229 sub db_dirty() {
2201 $dirty = 1; 2230 $dirty = 1;
2202 $idle->start; 2231 $idle->start;
2203 } 2232 }
… …
2251 2280
2252sub main { 2281sub main {
2253 # we must not ever block the main coroutine 2282 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2283 local $Coro::idle = sub {
2255 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 {
2256 async { Event::one_event }; 2286 Event::one_event;
2287 })->prio (Coro::PRIO_MAX);
2257 }; 2288 };
2258 2289
2259 cfg_load; 2290 cfg_load;
2260 db_load; 2291 db_load;
2261 load_extensions; 2292 load_extensions;
2293
2294 $TICK_WATCHER->start;
2262 Event::loop; 2295 Event::loop;
2263} 2296}
2264 2297
2265############################################################################# 2298#############################################################################
2266# initialisation and cleanup 2299# initialisation and cleanup
2267 2300
2268# install some emergency cleanup handlers 2301# install some emergency cleanup handlers
2269BEGIN { 2302BEGIN {
2270 for my $signal (qw(INT HUP TERM)) { 2303 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal ( 2304 Event->signal (
2305 reentrant => 0,
2272 data => WF_AUTOCANCEL, 2306 data => WF_AUTOCANCEL,
2273 signal => $signal, 2307 signal => $signal,
2308 prio => 0,
2274 cb => sub { 2309 cb => sub {
2275 cf::cleanup "SIG$signal"; 2310 cf::cleanup "SIG$signal";
2276 }, 2311 },
2277 ); 2312 );
2278 } 2313 }
2279} 2314}
… …
2284 warn "enter emergency perl save\n"; 2319 warn "enter emergency perl save\n";
2285 2320
2286 cf::sync_job { 2321 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2322 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2323 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2324 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2325 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2326 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2327 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2328 $pl->valid or next;
2294 $pl->save; 2329 $pl->save;
… …
2308} 2343}
2309 2344
2310sub reload() { 2345sub reload() {
2311 # can/must only be called in main 2346 # can/must only be called in main
2312 if ($Coro::current != $Coro::main) { 2347 if ($Coro::current != $Coro::main) {
2313 warn "can only reload from main coroutine\n"; 2348 warn "can only reload from main coroutine";
2314 return; 2349 return;
2315 } 2350 }
2316 2351
2317 warn "reloading..."; 2352 warn "reloading...";
2318 2353
2319 warn "freezing server"; 2354 warn "cancelling server ticker";
2320 my $guard = freeze_mainloop; 2355 $TICK_WATCHER->cancel;
2356
2321 cf::emergency_save; 2357 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326 2358
2327 eval { 2359 eval {
2328 # 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
2329 2361
2362 warn "syncing database to disk";
2363 cf::db_sync;
2364
2330 warn "cancel all watchers"; 2365 warn "cancelling all WF_AUTOCANCEL watchers";
2331 for (Event::all_watchers) { 2366 for (Event::all_watchers) {
2332 $_->cancel if $_->data & WF_AUTOCANCEL; 2367 $_->cancel if $_->data & WF_AUTOCANCEL;
2333 } 2368 }
2334 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
2335 warn "cancel all extension coros"; 2378 warn "cancelling all extension coros";
2336 $_->cancel for values %EXT_CORO; 2379 $_->cancel for values %EXT_CORO;
2337 %EXT_CORO = (); 2380 %EXT_CORO = ();
2338 2381
2339 warn "remove commands"; 2382 warn "removing commands";
2340 %COMMAND = (); 2383 %COMMAND = ();
2341 2384
2342 warn "remove ext commands"; 2385 warn "removing ext commands";
2343 %EXTCMD = (); 2386 %EXTCMD = ();
2344 2387
2345 warn "unload/nuke all extensions"; 2388 warn "unloading/nuking all extensions";
2346 for my $pkg (@EXTS) { 2389 for my $pkg (@EXTS) {
2347 warn "... unloading $pkg"; 2390 warn "... unloading $pkg";
2348 2391
2349 if (my $cb = $pkg->can ("unload")) { 2392 if (my $cb = $pkg->can ("unload")) {
2350 eval { 2393 eval {
… …
2355 2398
2356 warn "... nuking $pkg"; 2399 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg; 2400 Symbol::delete_package $pkg;
2358 } 2401 }
2359 2402
2360 warn "unload all perl modules loaded from $LIBDIR"; 2403 warn "unloading all perl modules loaded from $LIBDIR";
2361 while (my ($k, $v) = each %INC) { 2404 while (my ($k, $v) = each %INC) {
2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2405 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2363 2406
2364 warn "removing <$k>"; 2407 warn "... unloading $k";
2365 delete $INC{$k}; 2408 delete $INC{$k};
2366 2409
2367 $k =~ s/\.pm$//; 2410 $k =~ s/\.pm$//;
2368 $k =~ s/\//::/g; 2411 $k =~ s/\//::/g;
2369 2412
… …
2372 } 2415 }
2373 2416
2374 Symbol::delete_package $k; 2417 Symbol::delete_package $k;
2375 } 2418 }
2376 2419
2377 warn "get rid of safe::, as good as possible"; 2420 warn "getting rid of safe::, as good as possible";
2378 Symbol::delete_package "safe::$_" 2421 Symbol::delete_package "safe::$_"
2379 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);
2380 2423
2381 warn "unload cf.pm \"a bit\""; 2424 warn "unloading cf.pm \"a bit\"";
2382 delete $INC{"cf.pm"}; 2425 delete $INC{"cf.pm"};
2383 2426
2384 # don't, removes xs symbols, too, 2427 # don't, removes xs symbols, too,
2385 # and global variables created in xs 2428 # and global variables created in xs
2386 #Symbol::delete_package __PACKAGE__; 2429 #Symbol::delete_package __PACKAGE__;
2387 2430
2431 warn "unload completed, starting to reload now";
2432
2388 warn "reloading cf.pm"; 2433 warn "reloading cf.pm";
2389 require cf; 2434 require cf;
2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2391 2436
2392 warn "load config and database again"; 2437 warn "loading config and database again";
2393 cf::cfg_load; 2438 cf::cfg_load;
2394 cf::db_load; 2439 cf::db_load;
2395 2440
2396 warn "load extensions"; 2441 warn "loading extensions";
2397 cf::load_extensions; 2442 cf::load_extensions;
2398 2443
2399 warn "reattach attachments to objects/players"; 2444 warn "reattaching attachments to objects/players";
2400 _global_reattach; 2445 _global_reattach;
2401 warn "reattach attachments to maps"; 2446 warn "reattaching attachments to maps";
2402 reattach $_ for values %MAP; 2447 reattach $_ for values %MAP;
2448
2449 warn "restarting server ticker";
2450
2451 $TICK_WATCHER->start;
2403 }; 2452 };
2404 2453
2405 if ($@) { 2454 if ($@) {
2406 warn $@; 2455 warn $@;
2407 warn "error while reloading, exiting."; 2456 warn "error while reloading, exiting.";
… …
2409 } 2458 }
2410 2459
2411 warn "reloaded"; 2460 warn "reloaded";
2412}; 2461};
2413 2462
2414############################################################################# 2463our $RELOAD_WATCHER; # used only during reload
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2464
2457register_command "reload" => sub { 2465register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2466 my ($who, $arg) = @_;
2459 2467
2460 if ($who->flag (FLAG_WIZ)) { 2468 if ($who->flag (FLAG_WIZ)) {
2461 $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 {
2462 reload; 2479 reload;
2463 $who->message ("end of reload."); 2480 undef $RELOAD_WATCHER;
2481 },
2482 );
2464 } 2483 }
2465}; 2484};
2466 2485
2467unshift @INC, $LIBDIR; 2486unshift @INC, $LIBDIR;
2487
2488my $bug_warning = 0;
2468 2489
2469$TICK_WATCHER = Event->timer ( 2490$TICK_WATCHER = Event->timer (
2470 reentrant => 0, 2491 reentrant => 0,
2492 parked => 1,
2471 prio => 0, 2493 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2494 at => $NEXT_TICK || $TICK,
2473 data => WF_AUTOCANCEL, 2495 data => WF_AUTOCANCEL,
2474 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
2475 $NOW = Event::time; 2503 $NOW = Event::time;
2476 2504
2477 cf::server_tick; # one server iteration 2505 cf::server_tick; # one server iteration
2478 $RUNTIME += $TICK; 2506 $RUNTIME += $TICK;
2479 $NEXT_TICK += $TICK; 2507 $NEXT_TICK += $TICK;
2480 2508
2481 $WAIT_FOR_TICK->broadcast; 2509 $WAIT_FOR_TICK->broadcast;
2482 $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#
2483 2517
2484 # 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
2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2486 2520
2487 $TICK_WATCHER->at ($NEXT_TICK); 2521 $TICK_WATCHER->at ($NEXT_TICK);
2488 $TICK_WATCHER->start; 2522 $TICK_WATCHER->start;
2489 }, 2523 },
2490); 2524);
2491 2525
2492IO::AIO::max_poll_time $TICK * 0.2; 2526IO::AIO::max_poll_time $TICK * 0.1;
2493 2527
2494Event->io ( 2528undef $Coro::AIO::WATCHER;
2529$AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0,
2495 fd => IO::AIO::poll_fileno, 2531 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2532 poll => 'r',
2497 prio => 5, 2533 prio => 6,
2498 data => WF_AUTOCANCEL, 2534 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2535 cb => \&IO::AIO::poll_cb,
2500); 2536);
2501 2537
2502Event->timer ( 2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2503 data => WF_AUTOCANCEL, 2540 data => WF_AUTOCANCEL,
2504 after => 0, 2541 after => 1,
2505 interval => 10, 2542 interval => 10,
2506 cb => sub { 2543 prio => 6, # keep it lowest so it acts like a watchdog
2507 (Coro::unblock_sub { 2544 cb => Coro::unblock_sub {
2508 write_runtime 2545 write_runtime
2509 or warn "ERROR: unable to write runtime file: $!"; 2546 or warn "ERROR: unable to write runtime file: $!";
2510 })->();
2511 }, 2547 },
2512); 2548);
2513 2549
2514END { cf::emergency_save } 2550END { cf::emergency_save }
2515 2551

Diff Legend

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