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

Diff Legend

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