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.161 by root, Thu Jan 11 00:16:58 2007 UTC vs.
Revision 1.196 by root, Sat Jan 27 23:59:29 2007 UTC

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

Diff Legend

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