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.200 by root, Mon Jan 29 17:57:22 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
… …
911 } 776 }
912 } else { 777 } else {
913 aio_unlink $filename; 778 aio_unlink $filename;
914 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
915 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
916 } 787 }
917} 788}
918 789
919sub object_freezer_as_string { 790sub object_freezer_as_string {
920 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
926 797
927sub object_thawer_load { 798sub object_thawer_load {
928 my ($filename) = @_; 799 my ($filename) = @_;
929 800
930 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
931 805
932 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
933 or return; 807 or return;
934 808
935 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1027 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 904 . "\n};\n1";
1031 905
1032 eval $source 906 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1034 : "extension disabled.\n"; 908 : "extension disabled.\n";
909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
910 warn $@;
911 warn "mandatory extension failed to load, exiting.\n";
912 exit 1;
913 }
914 die $@;
915 }
1035 916
1036 push @EXTS, $pkg; 917 push @EXTS, $pkg;
1037} 918}
1038 919
1039sub load_extensions { 920sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1046 } 927 }
1047} 928}
1048 929
1049############################################################################# 930#############################################################################
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 931
1065=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1066 933
1067Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1068 935
… …
1104 971
1105sub exists($) { 972sub exists($) {
1106 my ($login) = @_; 973 my ($login) = @_;
1107 974
1108 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1109 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1110} 977}
1111 978
1112sub find($) { 979sub find($) {
1113 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1114 my $login = $_[0]; 981 my $login = $_[0];
… …
1204 \@logins 1071 \@logins
1205} 1072}
1206 1073
1207=item $player->maps 1074=item $player->maps
1208 1075
1209Returns an arrayref of cf::path's of all maps that are private for this 1076Returns an arrayref of map paths that are private for this
1210player. May block. 1077player. May block.
1211 1078
1212=cut 1079=cut
1213 1080
1214sub maps($) { 1081sub maps($) {
… …
1222 for (@$files) { 1089 for (@$files) {
1223 utf8::decode $_; 1090 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1226 1093
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1228 } 1095 }
1229 1096
1230 \@paths 1097 \@paths
1231} 1098}
1232 1099
… …
1258package cf::map; 1125package cf::map;
1259 1126
1260use Fcntl; 1127use Fcntl;
1261use Coro::AIO; 1128use Coro::AIO;
1262 1129
1130use overload
1131 '""' => \&as_string,
1132 fallback => 1;
1133
1263our $MAX_RESET = 3600; 1134our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1135our $DEFAULT_RESET = 3000;
1265 1136
1266sub generate_random_map { 1137sub generate_random_map {
1267 my ($path, $rmp) = @_; 1138 my ($self, $rmp) = @_;
1268
1269 # mit "rum" bekleckern, nicht 1139 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1140 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1141 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1142 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1143 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1144 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1145 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1146 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1147 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1148 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1149 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1152 )
1153}
1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1163sub register {
1164 my (undef, $regex, $prio) = @_;
1165 my $pkg = caller;
1166
1167 no strict;
1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1169
1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1171}
1172
1173# also paths starting with '/'
1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1175
1176sub thawer_merge {
1177 my ($self, $merge) = @_;
1178
1179 # we have to keep some variables in memory intact
1180 local $self->{path};
1181 local $self->{load_path};
1182 local $self->{deny_save};
1183 local $self->{deny_reset};
1184
1185 $self->SUPER::thawer_merge ($merge);
1186}
1187
1188sub normalise {
1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1194
1195 # map plan:
1196 #
1197 # /! non-realised random map exit (special hack!)
1198 # {... are special paths that are not being touched
1199 # ?xxx/... are special absolute paths
1200 # ?random/... random maps
1201 # /... normal maps
1202 # ~user/... per-player map of a specific user
1203
1204 $path =~ s/$PATH_SEP/\//go;
1205
1206 # treat it as relative path if it starts with
1207 # something that looks reasonable
1208 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1209 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1210
1211 $base =~ s{[^/]+/?$}{};
1212 $path = "$base/$path";
1213 }
1214
1215 for ($path) {
1216 redo if s{//}{/};
1217 redo if s{/\.?/}{/};
1218 redo if s{/[^/]+/\.\./}{/};
1219 }
1220
1221 $path
1222}
1223
1224sub new_from_path {
1225 my (undef, $path, $base) = @_;
1226
1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1228
1229 $path = normalise $path, $base;
1230
1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1233 my $self = bless cf::map::new, $pkg;
1234 $self->{path} = $path; $self->path ($path);
1235 $self->init; # pass $1 etc.
1236 return $self;
1237 }
1238 }
1239
1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1241 ()
1242}
1243
1244sub init {
1245 my ($self) = @_;
1246
1247 $self
1248}
1249
1250sub as_string {
1251 my ($self) = @_;
1252
1253 "$self->{path}"
1254}
1255
1256# the displayed name, this is a one way mapping
1257sub visible_name {
1258 &as_string
1259}
1260
1261# the original (read-only) location
1262sub load_path {
1263 my ($self) = @_;
1264
1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1266}
1267
1268# the temporary/swap location
1269sub save_path {
1270 my ($self) = @_;
1271
1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1274}
1275
1276# the unique path, undef == no special unique path
1277sub uniq_path {
1278 my ($self) = @_;
1279
1280 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1281 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1283} 1282}
1284 1283
1285# and all this just because we cannot iterate over 1284# and all this just because we cannot iterate over
1286# all maps in C++... 1285# all maps in C++...
1287sub change_all_map_light { 1286sub change_all_map_light {
… …
1289 1288
1290 $_->change_map_light ($change) 1289 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1290 for grep $_->outdoor, values %cf::MAP;
1292} 1291}
1293 1292
1293sub unlink_save {
1294 my ($self) = @_;
1295
1296 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304}
1305
1294sub load_map_header($) { 1306sub load_header_from($) {
1295 my ($path) = @_; 1307 my ($self, $path) = @_;
1296 1308
1297 utf8::encode $path; 1309 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1311 # or return;
1312
1313 $self->_load_header ($path)
1299 or return; 1314 or return;
1300 1315
1301 my $map = cf::map::new 1316 $self->{load_path} = $path;
1317
1318 1
1319}
1320
1321sub load_header_orig {
1322 my ($self) = @_;
1323
1324 $self->load_header_from ($self->load_path)
1325}
1326
1327sub load_header_temp {
1328 my ($self) = @_;
1329
1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1350}
1351
1352sub load_header {
1353 my ($self) = @_;
1354
1355 if ($self->load_header_temp) {
1356 $self->prepare_temp;
1357 } else {
1358 $self->load_header_orig
1302 or return; 1359 or return;
1360 $self->prepare_orig;
1361 }
1303 1362
1304 # for better error messages only, will be overwritten later 1363 1
1305 $map->path ($path);
1306
1307 $map->load_header ($path)
1308 or return;
1309
1310 $map->{load_path} = $path;
1311
1312 $map
1313} 1364}
1314 1365
1315sub find; 1366sub find;
1316sub find { 1367sub find {
1317 my ($path, $origin) = @_; 1368 my ($path, $origin) = @_;
1318 1369
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1370 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1371
1324 cf::lock_wait "map_find:$key"; 1372 cf::lock_wait "map_find:$path";
1325 1373
1326 $cf::MAP{$key} || do { 1374 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1375 my $guard = cf::lock_acquire "map_find:$path";
1328 1376 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; 1377 or return;
1343 1378
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; 1379 $map->{last_save} = $cf::RUNTIME;
1356 1380
1357 Coro::cede; 1381 $map->load_header
1382 or return;
1358 1383
1359 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1386 #$cf::WAIT_FOR_TICK->wait;
1360 $map->reset; 1387 $map->reset;
1361 undef $guard; 1388 undef $guard;
1362 $map = find $path 1389 return find $path;
1363 or return;
1364 } 1390 }
1365 1391
1366 $cf::MAP{$key} = $map 1392 $cf::MAP{$path} = $map
1367 } 1393 }
1368} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1369 1398
1370sub load { 1399sub load {
1371 my ($self) = @_; 1400 my ($self) = @_;
1372 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1373 my $path = $self->{path}; 1404 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1405 my $guard = cf::lock_acquire "map_load:$path";
1375 1406
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1408
1378 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1379 1410
1380 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1381 $self->load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1416 or return;
1383 1417
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1419 if delete $self->{load_original};
1386 1420
1387 if (my $uniq = $path->uniq_path) { 1421 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1422 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1423 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1424 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1425 $self->_load_objects ($uniq, 0);
1392 } 1426 }
1393 } 1427 }
1394 1428
1395 Coro::cede; 1429 Coro::cede;
1396 1430
1397 # now do the right thing for maps 1431 # now do the right thing for maps
1398 $self->link_multipart_objects; 1432 $self->link_multipart_objects;
1399 1433
1400 if ($self->{path}->is_style_map) { 1434 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1435 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1436 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1437 $self->update_buttons;
1438 Coro::cede;
1407 $self->set_darkness_map; 1439 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1440 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1441 unless $self->difficulty;
1442 Coro::cede;
1410 $self->activate; 1443 $self->activate;
1411 } 1444 }
1412 1445
1413 Coro::cede; 1446 $self->post_load;
1414 1447
1415 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1449}
1450
1451sub customise_for {
1452 my ($self, $ob) = @_;
1453
1454 return find "~" . $ob->name . "/" . $self->{path}
1455 if $self->per_player;
1456
1457 $self
1416} 1458}
1417 1459
1418# find and load all maps in the 3x3 area around a map 1460# find and load all maps in the 3x3 area around a map
1419sub load_diag { 1461sub load_diag {
1420 my ($map) = @_; 1462 my ($map) = @_;
… …
1450 1492
1451 cf::sync_job { $map->load }; 1493 cf::sync_job { $map->load };
1452} 1494}
1453 1495
1454our %MAP_PREFETCH; 1496our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1497our $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 1498
1470sub find_async { 1499sub find_async {
1471 my ($path, $origin) = @_; 1500 my ($path, $origin) = @_;
1472 1501
1473 $path = new cf::path $path, $origin && $origin->path; 1502 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1503
1476 if (my $map = $cf::MAP{$key}) { 1504 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1505 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1506 }
1479 1507
1480 $MAP_PREFETCH{$key} = $path; 1508 undef $MAP_PREFETCH{$path};
1509 $MAP_PREFETCHER ||= cf::async {
1510 while (%MAP_PREFETCH) {
1511 for my $path (keys %MAP_PREFETCH) {
1512 my $map = find $path
1513 or next;
1514 $map->load;
1515
1516 delete $MAP_PREFETCH{$path};
1517 }
1518 }
1519 undef $MAP_PREFETCHER;
1520 };
1481 $MAP_PREFETCHER->ready; 1521 $MAP_PREFETCHER->prio (6);
1482 1522
1483 () 1523 ()
1484} 1524}
1485 1525
1486sub save { 1526sub save {
… …
1490 1530
1491 $self->{last_save} = $cf::RUNTIME; 1531 $self->{last_save} = $cf::RUNTIME;
1492 1532
1493 return unless $self->dirty; 1533 return unless $self->dirty;
1494 1534
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1535 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1536 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1537
1498 $self->{load_path} = $save; 1538 $self->{load_path} = $save;
1499 1539
1500 return if $self->{deny_save}; 1540 return if $self->{deny_save};
1501 1541
… …
1504 cf::async { 1544 cf::async {
1505 $_->contr->save for $self->players; 1545 $_->contr->save for $self->players;
1506 }; 1546 };
1507 1547
1508 if ($uniq) { 1548 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1549 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1550 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1551 } else {
1512 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1552 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1513 } 1553 }
1514} 1554}
1515 1555
1516sub swap_out { 1556sub swap_out {
1517 my ($self) = @_; 1557 my ($self) = @_;
… …
1531 1571
1532sub reset_at { 1572sub reset_at {
1533 my ($self) = @_; 1573 my ($self) = @_;
1534 1574
1535 # TODO: safety, remove and allow resettable per-player maps 1575 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1576 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1577 return 1e99 if $self->{deny_reset};
1538 1578
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1579 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1580 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1541 1581
… …
1546 my ($self) = @_; 1586 my ($self) = @_;
1547 1587
1548 $self->reset_at <= $cf::RUNTIME 1588 $self->reset_at <= $cf::RUNTIME
1549} 1589}
1550 1590
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 { 1591sub reset {
1573 my ($self) = @_; 1592 my ($self) = @_;
1574 1593
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1594 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1595
1577 return if $self->players; 1596 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1597 return if $self->isa ("ext::map_per_player");#d#
1579 1598
1580 warn "resetting map ", $self->path;#d# 1599 warn "resetting map ", $self->path;#d#
1581 1600
1582 delete $cf::MAP{$self->path}; 1601 delete $cf::MAP{$self->path};
1602
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear;
1583 1605
1584 $_->clear_links_to ($self) for values %cf::MAP; 1606 $_->clear_links_to ($self) for values %cf::MAP;
1585 1607
1586 $self->unlink_save; 1608 $self->unlink_save;
1587 $self->destroy; 1609 $self->destroy;
… …
1590my $nuke_counter = "aaaa"; 1612my $nuke_counter = "aaaa";
1591 1613
1592sub nuke { 1614sub nuke {
1593 my ($self) = @_; 1615 my ($self) = @_;
1594 1616
1617 delete $cf::MAP{$self->path};
1618
1619 $self->unlink_save;
1620
1621 bless $self, "cf::map";
1622 delete $self->{deny_reset};
1595 $self->{deny_save} = 1; 1623 $self->{deny_save} = 1;
1596 $self->reset_timeout (1); 1624 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1625 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1626
1627 $cf::MAP{$self->path} = $self;
1628
1598 $self->reset; # polite request, might not happen 1629 $self->reset; # polite request, might not happen
1599} 1630}
1600 1631
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 1632=item cf::map::unique_maps
1612 1633
1613Returns an arrayref of cf::path's of all shared maps that have 1634Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1635instantiated unique items. May block.
1615 1636
1616=cut 1637=cut
1617 1638
1618sub unique_maps() { 1639sub unique_maps() {
… …
1624 for (@$files) { 1645 for (@$files) {
1625 utf8::decode $_; 1646 utf8::decode $_;
1626 next if /\.pst$/; 1647 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1628 1649
1629 push @paths, new cf::path $_; 1650 push @paths, cf::map::normalise $_;
1630 } 1651 }
1631 1652
1632 \@paths 1653 \@paths
1633} 1654}
1634 1655
… …
1709 1730
1710=item $player_object->enter_link 1731=item $player_object->enter_link
1711 1732
1712Freezes the player and moves him/her to a special map (C<{link}>). 1733Freezes the player and moves him/her to a special map (C<{link}>).
1713 1734
1714The player should be reaosnably safe there for short amounts of time. You 1735The player should be reasonably safe there for short amounts of time. You
1715I<MUST> call C<leave_link> as soon as possible, though. 1736I<MUST> call C<leave_link> as soon as possible, though.
1716 1737
1738Will never block.
1739
1717=item $player_object->leave_link ($map, $x, $y) 1740=item $player_object->leave_link ($map, $x, $y)
1718 1741
1719Moves the player out of the specila link map onto the given map. If the 1742Moves 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 1743map. 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, 1744to the location he/she was before the call to C<enter_link>, or, if that
1722to the emergency map position. 1745fails, to the emergency map position.
1723 1746
1724Might block. 1747Might block.
1725 1748
1726=cut 1749=cut
1750
1751sub link_map {
1752 unless ($LINK_MAP) {
1753 $LINK_MAP = cf::map::find "{link}"
1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1755 $LINK_MAP->load;
1756 }
1757
1758 $LINK_MAP
1759}
1727 1760
1728sub cf::object::player::enter_link { 1761sub cf::object::player::enter_link {
1729 my ($self) = @_; 1762 my ($self) = @_;
1730 1763
1731 $self->deactivate_recursive; 1764 $self->deactivate_recursive;
1732 1765
1733 return if $self->map == $LINK_MAP; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1767
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1769 if $self->map;
1737 1770
1738 $self->enter_map ($LINK_MAP, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1739} 1772}
1740 1773
1741sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1743 1776
… …
1807=cut 1840=cut
1808 1841
1809sub cf::object::player::goto { 1842sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1811 1844
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1845 $self->enter_link;
1815 1846
1816 (async { 1847 (async {
1848 my $map = eval {
1817 my $map = cf::map::find $path->as_string; 1849 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1819 1851 $map
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1821# if $map;
1822
1823 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1824 1854
1825 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1826 })->prio (1); 1856 })->prio (1);
1827} 1857}
1828 1858
… …
1832 1862
1833sub parse_random_map_params { 1863sub parse_random_map_params {
1834 my ($spec) = @_; 1864 my ($spec) = @_;
1835 1865
1836 my $rmp = { # defaults 1866 my $rmp = { # defaults
1837 xsize => 10, 1867 xsize => (cf::rndm 15, 40),
1838 ysize => 10, 1868 ysize => (cf::rndm 15, 40),
1869 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1870 #layout => string,
1839 }; 1871 };
1840 1872
1841 for (split /\n/, $spec) { 1873 for (split /\n/, $spec) {
1842 my ($k, $v) = split /\s+/, $_, 2; 1874 my ($k, $v) = split /\s+/, $_, 2;
1843 1875
… …
1847 $rmp 1879 $rmp
1848} 1880}
1849 1881
1850sub prepare_random_map { 1882sub prepare_random_map {
1851 my ($exit) = @_; 1883 my ($exit) = @_;
1884
1885 my $guard = cf::lock_acquire "exit_prepare:$exit";
1852 1886
1853 # all this does is basically replace the /! path by 1887 # all this does is basically replace the /! path by
1854 # a new random map path (?random/...) with a seed 1888 # a new random map path (?random/...) with a seed
1855 # that depends on the exit object 1889 # that depends on the exit object
1856 1890
1857 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1858 1892
1859 if ($exit->map) { 1893 if ($exit->map) {
1860 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1861 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1862 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1863 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1864 } 1898 }
1865 1899
1866 $rmp->{random_seed} ||= $exit->random_seed; 1900 $rmp->{random_seed} ||= $exit->random_seed;
1867 1901
1868 my $data = cf::to_json $rmp; 1902 my $data = cf::to_json $rmp;
1869 my $md5 = Digest::MD5::md5_hex $data; 1903 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1870 1905
1871 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1872 aio_write $fh, 0, (length $data), $data, 0; 1907 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh;
1909 aio_rename "$meta~", $meta;
1873 1910
1874 $exit->slaying ("?random/$md5"); 1911 $exit->slaying ("?random/$md5");
1875 $exit->msg (undef); 1912 $exit->msg (undef);
1876 } 1913 }
1877} 1914}
1878 1915
1879sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1880 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1881 1918
1882 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1883 1929
1884 $self->enter_link; 1930 $self->enter_link;
1885 1931
1886 (async { 1932 (async {
1887 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1934 unless (eval {
1889 prepare_random_map $exit 1935 $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 1936
1895 1; 1937 1;
1896 }) { 1938 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1898 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
… …
2187 sub db_sync() { 2229 sub db_sync() {
2188 db_save if $dirty; 2230 db_save if $dirty;
2189 undef $dirty; 2231 undef $dirty;
2190 } 2232 }
2191 2233
2192 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2193 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2194 }); 2241 );
2195 2242
2196 sub db_dirty() { 2243 sub db_dirty() {
2197 $dirty = 1; 2244 $dirty = 1;
2198 $idle->start; 2245 $idle->start;
2199 } 2246 }
… …
2247 2294
2248sub main { 2295sub main {
2249 # we must not ever block the main coroutine 2296 # we must not ever block the main coroutine
2250 local $Coro::idle = sub { 2297 local $Coro::idle = sub {
2251 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2298 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2299 (async {
2252 async { Event::one_event }; 2300 Event::one_event;
2301 })->prio (Coro::PRIO_MAX);
2253 }; 2302 };
2254 2303
2255 cfg_load; 2304 cfg_load;
2256 db_load; 2305 db_load;
2257 load_extensions; 2306 load_extensions;
2307
2308 $TICK_WATCHER->start;
2258 Event::loop; 2309 Event::loop;
2259} 2310}
2260 2311
2261############################################################################# 2312#############################################################################
2262# initialisation and cleanup 2313# initialisation and cleanup
2263 2314
2264# install some emergency cleanup handlers 2315# install some emergency cleanup handlers
2265BEGIN { 2316BEGIN {
2266 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal ( 2318 Event->signal (
2319 reentrant => 0,
2268 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2269 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2270 cb => sub { 2323 cb => sub {
2271 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2272 }, 2325 },
2273 ); 2326 );
2274 } 2327 }
2275} 2328}
… …
2280 warn "enter emergency perl save\n"; 2333 warn "enter emergency perl save\n";
2281 2334
2282 cf::sync_job { 2335 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2336 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2337 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2338 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2339 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2340 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2341 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2342 $pl->valid or next;
2290 $pl->save; 2343 $pl->save;
… …
2304} 2357}
2305 2358
2306sub reload() { 2359sub reload() {
2307 # can/must only be called in main 2360 # can/must only be called in main
2308 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2309 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2310 return; 2363 return;
2311 } 2364 }
2312 2365
2313 warn "reloading..."; 2366 warn "reloading...";
2314 2367
2315 warn "freezing server"; 2368 warn "cancelling server ticker";
2316 my $guard = freeze_mainloop; 2369 $TICK_WATCHER->cancel;
2370
2317 cf::emergency_save; 2371 cf::emergency_save;
2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322 2372
2323 eval { 2373 eval {
2324 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2325 2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378
2326 warn "cancel all watchers"; 2379 warn "cancelling all WF_AUTOCANCEL watchers";
2327 for (Event::all_watchers) { 2380 for (Event::all_watchers) {
2328 $_->cancel if $_->data & WF_AUTOCANCEL; 2381 $_->cancel if $_->data & WF_AUTOCANCEL;
2329 } 2382 }
2330 2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 IO::AIO::flush;
2387 Coro::cede;
2388 last unless IO::AIO::nreqs;
2389 warn "iterate...";
2390 }
2391
2331 warn "cancel all extension coros"; 2392 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2393 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2394 %EXT_CORO = ();
2334 2395
2335 warn "remove commands"; 2396 warn "removing commands";
2336 %COMMAND = (); 2397 %COMMAND = ();
2337 2398
2338 warn "remove ext commands"; 2399 warn "removing ext commands";
2339 %EXTCMD = (); 2400 %EXTCMD = ();
2340 2401
2341 warn "unload/nuke all extensions"; 2402 warn "unloading/nuking all extensions";
2342 for my $pkg (@EXTS) { 2403 for my $pkg (@EXTS) {
2343 warn "... unloading $pkg"; 2404 warn "... unloading $pkg";
2344 2405
2345 if (my $cb = $pkg->can ("unload")) { 2406 if (my $cb = $pkg->can ("unload")) {
2346 eval { 2407 eval {
… …
2351 2412
2352 warn "... nuking $pkg"; 2413 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg; 2414 Symbol::delete_package $pkg;
2354 } 2415 }
2355 2416
2356 warn "unload all perl modules loaded from $LIBDIR"; 2417 warn "unloading all perl modules loaded from $LIBDIR";
2357 while (my ($k, $v) = each %INC) { 2418 while (my ($k, $v) = each %INC) {
2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2419 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2359 2420
2360 warn "removing <$k>"; 2421 warn "... unloading $k";
2361 delete $INC{$k}; 2422 delete $INC{$k};
2362 2423
2363 $k =~ s/\.pm$//; 2424 $k =~ s/\.pm$//;
2364 $k =~ s/\//::/g; 2425 $k =~ s/\//::/g;
2365 2426
… …
2368 } 2429 }
2369 2430
2370 Symbol::delete_package $k; 2431 Symbol::delete_package $k;
2371 } 2432 }
2372 2433
2373 warn "get rid of safe::, as good as possible"; 2434 warn "getting rid of safe::, as good as possible";
2374 Symbol::delete_package "safe::$_" 2435 Symbol::delete_package "safe::$_"
2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2376 2437
2377 warn "unload cf.pm \"a bit\""; 2438 warn "unloading cf.pm \"a bit\"";
2378 delete $INC{"cf.pm"}; 2439 delete $INC{"cf.pm"};
2379 2440
2380 # don't, removes xs symbols, too, 2441 # don't, removes xs symbols, too,
2381 # and global variables created in xs 2442 # and global variables created in xs
2382 #Symbol::delete_package __PACKAGE__; 2443 #Symbol::delete_package __PACKAGE__;
2383 2444
2445 warn "unload completed, starting to reload now";
2446
2384 warn "reloading cf.pm"; 2447 warn "reloading cf.pm";
2385 require cf; 2448 require cf;
2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2387 2450
2388 warn "load config and database again"; 2451 warn "loading config and database again";
2389 cf::cfg_load; 2452 cf::cfg_load;
2390 cf::db_load; 2453 cf::db_load;
2391 2454
2392 warn "load extensions"; 2455 warn "loading extensions";
2393 cf::load_extensions; 2456 cf::load_extensions;
2394 2457
2395 warn "reattach attachments to objects/players"; 2458 warn "reattaching attachments to objects/players";
2396 _global_reattach; 2459 _global_reattach;
2397 warn "reattach attachments to maps"; 2460 warn "reattaching attachments to maps";
2398 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "restarting server ticker";
2464
2465 $TICK_WATCHER->start;
2399 }; 2466 };
2400 2467
2401 if ($@) { 2468 if ($@) {
2402 warn $@; 2469 warn $@;
2403 warn "error while reloading, exiting."; 2470 warn "error while reloading, exiting.";
… …
2405 } 2472 }
2406 2473
2407 warn "reloaded"; 2474 warn "reloaded";
2408}; 2475};
2409 2476
2410############################################################################# 2477our $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 2478
2453register_command "reload" => sub { 2479register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2480 my ($who, $arg) = @_;
2455 2481
2456 if ($who->flag (FLAG_WIZ)) { 2482 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2483 $who->message ("reloading server.");
2484
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2458 reload; 2493 reload;
2459 $who->message ("end of reload."); 2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2460 } 2497 }
2461}; 2498};
2462 2499
2463unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2501
2502my $bug_warning = 0;
2464 2503
2465$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2466 reentrant => 0, 2505 reentrant => 0,
2506 parked => 1,
2467 prio => 0, 2507 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2470 cb => sub { 2510 cb => sub {
2511 if ($Coro::current != $Coro::main) {
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10;
2514 return;
2515 }
2516
2517 $NOW = Event::time;
2518
2471 cf::server_tick; # one server iteration 2519 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2520 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2474 2522
2475 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2476 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2477 2531
2478 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2480 2534
2481 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2482 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2483 }, 2537 },
2484); 2538);
2485 2539
2486IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2487 2541
2488Event->io ( 2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2489 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2546 poll => 'r',
2491 prio => 5, 2547 prio => 6,
2492 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2494); 2550);
2495 2551
2496Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2497 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2498 after => 0, 2555 after => 1,
2499 interval => 10, 2556 interval => 10,
2500 cb => sub { 2557 prio => 6, # keep it lowest so it acts like a watchdog
2501 (Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2502 write_runtime 2559 write_runtime
2503 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2504 })->();
2505 }, 2561 },
2506); 2562);
2507 2563
2508END { cf::emergency_save } 2564END { cf::emergency_save }
2509 2565

Diff Legend

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