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.159 by root, Wed Jan 10 22:50:12 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;
… …
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38 38
39our @EXTS = (); # list of extension package names 39our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
42 43
43our @EVENT; 44our @EVENT;
44our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
45 46
46our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
48our $NEXT_TICK; 51our $NEXT_TICK;
49our $NOW; 52our $NOW;
50 53
51our %CFG; 54our %CFG;
52 55
53our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
54our $RUNTIME; 57our $RUNTIME;
55 58
56our %PLAYER; # all users 59our %PLAYER; # all users
57our %MAP; # all maps 60our %MAP; # all maps
58our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
59our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
60 63
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $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
63 69
64binmode STDOUT; 70binmode STDOUT;
65binmode STDERR; 71binmode STDERR;
66 72
67# read virtual server time, if available 73# read virtual server time, if available
… …
75mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
76mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
77mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
78mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
79 85
80# a special map that is always available
81our $LINK_MAP;
82our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
83 89
84############################################################################# 90#############################################################################
85 91
86=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
87 93
… …
255} 261}
256 262
257sub freeze_mainloop { 263sub freeze_mainloop {
258 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
259 265
260 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;
261 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
262 $guard 272 $guard
263} 273}
264 274
265=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
341 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
342 352
343 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
344 or return; 354 or return;
345 355
356 my $value = $cf::RUNTIME + 90 + 10;
346 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
347 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
348 and return; 361 and return;
349 362
350 aio_fsync $fh 363 aio_fsync $fh
351 and return; 364 and return;
… …
360} 373}
361 374
362=back 375=back
363 376
364=cut 377=cut
365
366#############################################################################
367
368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
375
376sub new {
377 my ($class, $path, $base) = @_;
378
379 $path = $path->as_string if ref $path;
380
381 my $self = bless { }, $class;
382
383 # {... are special paths that are not touched
384 # ?xxx/... are special absolute paths
385 # ?random/... random maps
386 # /! non-realised random map exit
387 # /... normal maps
388 # ~/... per-player maps without a specific player (DO NOT USE)
389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
392
393 if ($path =~ /^{/) {
394 # fine as it is
395 } elsif ($path =~ s{^\?random/}{}) {
396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397 $self->{random} = cf::from_json $data;
398 } else {
399 if ($path =~ s{^~([^/]+)?}{}) {
400 $self->{user_rel} = 1;
401
402 if (defined $1) {
403 $self->{user} = $1;
404 } elsif ($base =~ m{^~([^/]+)/}) {
405 $self->{user} = $1;
406 } else {
407 warn "cannot resolve user-relative path without user <$path,$base>\n";
408 }
409 } elsif ($path =~ /^\//) {
410 # already absolute
411 } else {
412 $base =~ s{[^/]+/?$}{};
413 return $class->new ("$base/$path");
414 }
415
416 for ($path) {
417 redo if s{/\.?/}{/};
418 redo if s{/[^/]+/\.\./}{/};
419 }
420 }
421
422 $self->{path} = $path;
423
424 $self
425}
426
427# the name / primary key / in-game path
428sub as_string {
429 my ($self) = @_;
430
431 $self->{user_rel} ? "~$self->{user}$self->{path}"
432 : $self->{random} ? "?random/$self->{path}"
433 : $self->{path}
434}
435
436# the displayed name, this is a one way mapping
437sub visible_name {
438 my ($self) = @_;
439
440# if (my $rmp = $self->{random}) {
441# # todo: be more intelligent about this
442# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
443# } else {
444 $self->as_string
445# }
446}
447
448# escape the /'s in the path
449sub _escaped_path {
450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
451 $path
452}
453
454# the original (read-only) location
455sub load_path {
456 my ($self) = @_;
457
458 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
459}
460
461# the temporary/swap location
462sub save_path {
463 my ($self) = @_;
464
465 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
466 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
467 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
468}
469
470# the unique path, might be eq to save_path
471sub uniq_path {
472 my ($self) = @_;
473
474 $self->{user_rel} || $self->{random}
475 ? undef
476 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
477}
478
479# return random map parameters, or undef
480sub random_map_params {
481 my ($self) = @_;
482
483 $self->{random}
484}
485
486# this is somewhat ugly, but style maps do need special treatment
487sub is_style_map {
488 $_[0]{path} =~ m{^/styles/}
489}
490
491package cf;
492 378
493############################################################################# 379#############################################################################
494 380
495=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
496 382
… …
622our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 509our @CB_MAP = ();
624 510
625my %attachment; 511my %attachment;
626 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
627sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
629 521
630 use sort 'stable'; 522 use sort 'stable';
631 523
… …
802# object support 694# object support
803 695
804sub reattach { 696sub reattach {
805 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 701
808 my $registry = $obj->registry; 702 my $registry = $obj->registry;
809 703
810 @$registry = (); 704 @$registry = ();
811 705
… …
987 my $base = $1; 881 my $base = $1;
988 my $pkg = $1; 882 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 883 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 884 $pkg = "ext::$pkg";
991 885
992 warn "loading '$path' into '$pkg'\n"; 886 warn "... loading '$path' into '$pkg'\n";
993 887
994 open my $fh, "<:utf8", $path 888 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 889 or die "$path: $!";
996 890
997 my $source = 891 my $source =
998 "package $pkg; use strict; use utf8;\n" 892 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 893 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 894 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 895 . "\n};\n1";
1002 896
1003 eval $source 897 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 898 my $msg = $@ ? "$path: $@\n"
1005 : "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 }
1006 907
1007 push @EXTS, $pkg; 908 push @EXTS, $pkg;
1008} 909}
1009 910
1010sub load_extensions { 911sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 917 } or warn "$ext not loaded: $@";
1017 } 918 }
1018} 919}
1019 920
1020############################################################################# 921#############################################################################
1021# load/save/clean perl data associated with a map
1022
1023*cf::mapsupport::on_clean = sub {
1024 my ($map) = @_;
1025
1026 my $path = $map->tmpname;
1027 defined $path or return;
1028
1029 unlink "$path.pst";
1030};
1031
1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1033
1034#############################################################################
1035 922
1036=head2 CORE EXTENSIONS 923=head2 CORE EXTENSIONS
1037 924
1038Functions and methods that extend core crossfire objects. 925Functions and methods that extend core crossfire objects.
1039 926
… …
1075 962
1076sub exists($) { 963sub exists($) {
1077 my ($login) = @_; 964 my ($login) = @_;
1078 965
1079 $cf::PLAYER{$login} 966 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login } 967 or cf::sync_job { !aio_stat path $login }
1081} 968}
1082 969
1083sub find($) { 970sub find($) {
1084 return $cf::PLAYER{$_[0]} || do { 971 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0]; 972 my $login = $_[0];
… …
1175 \@logins 1062 \@logins
1176} 1063}
1177 1064
1178=item $player->maps 1065=item $player->maps
1179 1066
1180Returns 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
1181player. May block. 1068player. May block.
1182 1069
1183=cut 1070=cut
1184 1071
1185sub maps($) { 1072sub maps($) {
… …
1193 for (@$files) { 1080 for (@$files) {
1194 utf8::decode $_; 1081 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1082 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1083 next unless /^$PATH_SEP/o;
1197 1084
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1199 } 1086 }
1200 1087
1201 \@paths 1088 \@paths
1202} 1089}
1203 1090
… …
1229package cf::map; 1116package cf::map;
1230 1117
1231use Fcntl; 1118use Fcntl;
1232use Coro::AIO; 1119use Coro::AIO;
1233 1120
1121use overload
1122 '""' => \&as_string,
1123 fallback => 1;
1124
1234our $MAX_RESET = 3600; 1125our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1126our $DEFAULT_RESET = 3000;
1236 1127
1237sub generate_random_map { 1128sub generate_random_map {
1238 my ($path, $rmp) = @_; 1129 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1130 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1131 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1132 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1133 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1134 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1135 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1136 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1137 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1138 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1139 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $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},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1141 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (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
1254} 1273}
1255 1274
1256# and all this just because we cannot iterate over 1275# and all this just because we cannot iterate over
1257# all maps in C++... 1276# all maps in C++...
1258sub change_all_map_light { 1277sub change_all_map_light {
… …
1260 1279
1261 $_->change_map_light ($change) 1280 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1281 for grep $_->outdoor, values %cf::MAP;
1263} 1282}
1264 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
1265sub try_load_header($) { 1292sub load_header_from($) {
1266 my ($path) = @_; 1293 my ($self, $path) = @_;
1267 1294
1268 utf8::encode $path; 1295 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1296 aio_open $path, O_RDONLY, 0
1270 or return; 1297 or return;
1271 1298
1272 my $map = cf::map::new 1299 $self->_load_header ($path)
1273 or return; 1300 or return;
1274 1301
1275 # for better error messages only, will be overwritten 1302 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1303
1278 $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
1279 or return; 1345 or return;
1346 $self->prepare_orig;
1347 }
1280 1348
1281 $map->{load_path} = $path; 1349 1
1282
1283 $map
1284} 1350}
1285 1351
1286sub find; 1352sub find;
1287sub find { 1353sub find {
1288 my ($path, $origin) = @_; 1354 my ($path, $origin) = @_;
1289 1355
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1356 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1357
1295 cf::lock_wait "map_find:$key"; 1358 cf::lock_wait "map_find:$path";
1296 1359
1297 $cf::MAP{$key} || do { 1360 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1361 my $guard = cf::lock_acquire "map_find:$path";
1299 1362 my $map = new_from_path cf::map $path
1300 # do it the slow way
1301 my $map = try_load_header $path->save_path;
1302
1303 Coro::cede;
1304
1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1308 # safety
1309 $map->{instantiate_time} = $cf::RUNTIME
1310 if $map->{instantiate_time} > $cf::RUNTIME;
1311 } else {
1312 if (my $rmp = $path->random_map_params) {
1313 $map = generate_random_map $key, $rmp;
1314 } else {
1315 $map = try_load_header $path->load_path;
1316 }
1317
1318 $map or return; 1363 or return;
1319 1364
1320 $map->{load_original} = 1;
1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1323 $map->instantiate;
1324
1325 # per-player maps become, after loading, normal maps
1326 $map->per_player (0) if $path->{user_rel};
1327 }
1328
1329 $map->path ($key);
1330 $map->{path} = $path;
1331 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1332 1366
1333 Coro::cede; 1367 $map->load_header
1368 or return;
1334 1369
1335 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;
1336 $map->reset; 1373 $map->reset;
1337 undef $guard; 1374 undef $guard;
1338 $map = find $path 1375 return find $path;
1339 or return;
1340 } 1376 }
1341 1377
1342 $cf::MAP{$key} = $map 1378 $cf::MAP{$path} = $map
1343 } 1379 }
1344} 1380}
1381
1382sub pre_load { }
1383sub post_load { }
1345 1384
1346sub load { 1385sub load {
1347 my ($self) = @_; 1386 my ($self) = @_;
1348 1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1389
1349 my $path = $self->{path}; 1390 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1391 my $guard = cf::lock_acquire "map_load:$path";
1351 1392
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1394
1354 $self->in_memory (cf::MAP_LOADING); 1395 $self->in_memory (cf::MAP_LOADING);
1355 1396
1356 $self->alloc; 1397 $self->alloc;
1398
1399 $self->pre_load;
1400
1357 $self->load_objects ($self->{load_path}, 1) 1401 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1402 or return;
1359 1403
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1404 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1405 if delete $self->{load_original};
1362 1406
1363 if (my $uniq = $path->uniq_path) { 1407 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1408 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1409 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1410 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1411 $self->_load_objects ($uniq, 0);
1368 } 1412 }
1369 } 1413 }
1370 1414
1371 Coro::cede; 1415 Coro::cede;
1372 1416
1373 # now do the right thing for maps 1417 # now do the right thing for maps
1374 $self->link_multipart_objects; 1418 $self->link_multipart_objects;
1375 1419
1376 if ($self->{path}->is_style_map) { 1420 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1421 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1422 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1423 $self->update_buttons;
1424 Coro::cede;
1383 $self->set_darkness_map; 1425 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1426 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1427 unless $self->difficulty;
1428 Coro::cede;
1386 $self->activate; 1429 $self->activate;
1387 } 1430 }
1388 1431
1389 Coro::cede; 1432 $self->post_load;
1390 1433
1391 $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
1392} 1444}
1393 1445
1394# 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
1395sub load_diag { 1447sub load_diag {
1396 my ($map) = @_; 1448 my ($map) = @_;
… …
1426 1478
1427 cf::sync_job { $map->load }; 1479 cf::sync_job { $map->load };
1428} 1480}
1429 1481
1430our %MAP_PREFETCH; 1482our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1483our $MAP_PREFETCHER = undef;
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 }
1442 Coro::schedule;
1443 }
1444};
1445 1484
1446sub find_async { 1485sub find_async {
1447 my ($path, $origin) = @_; 1486 my ($path, $origin) = @_;
1448 1487
1449 $path = new cf::path $path, $origin && $origin->path; 1488 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1489
1452 if (my $map = $cf::MAP{$key}) { 1490 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1491 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1492 }
1455 1493
1456 $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 };
1457 $MAP_PREFETCHER->ready; 1507 $MAP_PREFETCHER->prio (6);
1458 1508
1459 () 1509 ()
1460} 1510}
1461 1511
1462sub save { 1512sub save {
… …
1466 1516
1467 $self->{last_save} = $cf::RUNTIME; 1517 $self->{last_save} = $cf::RUNTIME;
1468 1518
1469 return unless $self->dirty; 1519 return unless $self->dirty;
1470 1520
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1521 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1522 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1523
1474 $self->{load_path} = $save; 1524 $self->{load_path} = $save;
1475 1525
1476 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1477 1527
… …
1480 cf::async { 1530 cf::async {
1481 $_->contr->save for $self->players; 1531 $_->contr->save for $self->players;
1482 }; 1532 };
1483 1533
1484 if ($uniq) { 1534 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1535 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1536 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1537 } else {
1488 $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);
1489 } 1539 }
1490} 1540}
1491 1541
1492sub swap_out { 1542sub swap_out {
1493 my ($self) = @_; 1543 my ($self) = @_;
… …
1507 1557
1508sub reset_at { 1558sub reset_at {
1509 my ($self) = @_; 1559 my ($self) = @_;
1510 1560
1511 # TODO: safety, remove and allow resettable per-player maps 1561 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1562 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1563 return 1e99 if $self->{deny_reset};
1514 1564
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 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;
1517 1567
… …
1522 my ($self) = @_; 1572 my ($self) = @_;
1523 1573
1524 $self->reset_at <= $cf::RUNTIME 1574 $self->reset_at <= $cf::RUNTIME
1525} 1575}
1526 1576
1527sub unlink_save {
1528 my ($self) = @_;
1529
1530 utf8::encode (my $save = $self->{path}->save_path);
1531 aioreq_pri 3; IO::AIO::aio_unlink $save;
1532 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1533}
1534
1535sub rename {
1536 my ($self, $new_path) = @_;
1537
1538 $self->unlink_save;
1539
1540 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path;
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self;
1544
1545 $self->save;
1546}
1547
1548sub reset { 1577sub reset {
1549 my ($self) = @_; 1578 my ($self) = @_;
1550 1579
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1580 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1581
1553 return if $self->players; 1582 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1583 return if $self->isa ("ext::map_per_player");#d#
1555 1584
1556 warn "resetting map ", $self->path;#d# 1585 warn "resetting map ", $self->path;#d#
1557 1586
1558 delete $cf::MAP{$self->path}; 1587 delete $cf::MAP{$self->path};
1588
1589 $self->in_memory (cf::MAP_SWAPPED);
1590 $self->clear;
1559 1591
1560 $_->clear_links_to ($self) for values %cf::MAP; 1592 $_->clear_links_to ($self) for values %cf::MAP;
1561 1593
1562 $self->unlink_save; 1594 $self->unlink_save;
1563 $self->destroy; 1595 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1598my $nuke_counter = "aaaa";
1567 1599
1568sub nuke { 1600sub nuke {
1569 my ($self) = @_; 1601 my ($self) = @_;
1570 1602
1603 delete $cf::MAP{$self->path};
1604
1605 $self->unlink_save;
1606
1607 bless $self, "cf::map";
1608 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1609 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1612
1613 $cf::MAP{$self->path} = $self;
1614
1574 $self->reset; # polite request, might not happen 1615 $self->reset; # polite request, might not happen
1575} 1616}
1576 1617
1577sub customise_for {
1578 my ($map, $ob) = @_;
1579
1580 if ($map->per_player) {
1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1582 }
1583
1584 $map
1585}
1586
1587=item cf::map::unique_maps 1618=item cf::map::unique_maps
1588 1619
1589Returns an arrayref of cf::path's of all shared maps that have 1620Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1621instantiated unique items. May block.
1591 1622
1592=cut 1623=cut
1593 1624
1594sub unique_maps() { 1625sub unique_maps() {
… …
1600 for (@$files) { 1631 for (@$files) {
1601 utf8::decode $_; 1632 utf8::decode $_;
1602 next if /\.pst$/; 1633 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1634 next unless /^$PATH_SEP/o;
1604 1635
1605 push @paths, new cf::path $_; 1636 push @paths, cf::map::normalise $_;
1606 } 1637 }
1607 1638
1608 \@paths 1639 \@paths
1609} 1640}
1610 1641
… …
1685 1716
1686=item $player_object->enter_link 1717=item $player_object->enter_link
1687 1718
1688Freezes 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}>).
1689 1720
1690The 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
1691I<MUST> call C<leave_link> as soon as possible, though. 1722I<MUST> call C<leave_link> as soon as possible, though.
1692 1723
1724Will never block.
1725
1693=item $player_object->leave_link ($map, $x, $y) 1726=item $player_object->leave_link ($map, $x, $y)
1694 1727
1695Moves 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
1696map 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
1697location 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
1698to the emergency map position. 1731fails, to the emergency map position.
1699 1732
1700Might block. 1733Might block.
1701 1734
1702=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}
1703 1746
1704sub cf::object::player::enter_link { 1747sub cf::object::player::enter_link {
1705 my ($self) = @_; 1748 my ($self) = @_;
1706 1749
1707 $self->deactivate_recursive; 1750 $self->deactivate_recursive;
1708 1751
1709 return if $self->map == $LINK_MAP; 1752 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1753
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1754 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1755 if $self->map;
1713 1756
1714 $self->enter_map ($LINK_MAP, 20, 20); 1757 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1758}
1716 1759
1717sub cf::object::player::leave_link { 1760sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1761 my ($self, $map, $x, $y) = @_;
1719 1762
… …
1783=cut 1826=cut
1784 1827
1785sub cf::object::player::goto { 1828sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1787 1830
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1831 $self->enter_link;
1791 1832
1792 (async { 1833 (async {
1834 my $map = eval {
1793 my $map = cf::map::find $path->as_string; 1835 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1795 1837 $map
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1797# if $map;
1798
1799 $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);
1800 1840
1801 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1802 })->prio (1); 1842 })->prio (1);
1803} 1843}
1804 1844
… …
1808 1848
1809sub parse_random_map_params { 1849sub parse_random_map_params {
1810 my ($spec) = @_; 1850 my ($spec) = @_;
1811 1851
1812 my $rmp = { # defaults 1852 my $rmp = { # defaults
1813 xsize => 10, 1853 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1854 ysize => (cf::rndm 15, 40),
1855 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1856 #layout => string,
1815 }; 1857 };
1816 1858
1817 for (split /\n/, $spec) { 1859 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1860 my ($k, $v) = split /\s+/, $_, 2;
1819 1861
… …
1823 $rmp 1865 $rmp
1824} 1866}
1825 1867
1826sub prepare_random_map { 1868sub prepare_random_map {
1827 my ($exit) = @_; 1869 my ($exit) = @_;
1870
1871 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1872
1829 # all this does is basically replace the /! path by 1873 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1874 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1875 # that depends on the exit object
1832 1876
1833 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1834 1878
1835 if ($exit->map) { 1879 if ($exit->map) {
1836 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1837 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1838 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1839 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1840 } 1884 }
1841 1885
1842 $rmp->{random_seed} ||= $exit->random_seed; 1886 $rmp->{random_seed} ||= $exit->random_seed;
1843 1887
1844 my $data = cf::to_json $rmp; 1888 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1889 my $md5 = Digest::MD5::md5_hex $data;
1890 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1891
1847 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) {
1848 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;
1849 1896
1850 $exit->slaying ("?random/$md5"); 1897 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1898 $exit->msg (undef);
1852 } 1899 }
1853} 1900}
1854 1901
1855sub cf::object::player::enter_exit { 1902sub cf::object::player::enter_exit {
1856 my ($self, $exit) = @_; 1903 my ($self, $exit) = @_;
1857 1904
1858 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;
1859 1915
1860 $self->enter_link; 1916 $self->enter_link;
1861 1917
1862 (async { 1918 (async {
1863 $self->deactivate_recursive; # just to be sure 1919 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1920 unless (eval {
1865 prepare_random_map $exit 1921 $self->goto ($slaying, $hp, $sp);
1866 if $exit->slaying eq "/!";
1867
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1922
1871 1; 1923 1;
1872 }) { 1924 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1925 $self->message ("Something went wrong deep within the crossfire server. "
1874 . "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. "
… …
2163 sub db_sync() { 2215 sub db_sync() {
2164 db_save if $dirty; 2216 db_save if $dirty;
2165 undef $dirty; 2217 undef $dirty;
2166 } 2218 }
2167 2219
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2220 my $idle = Event->idle (
2169 db_sync; 2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2170 }); 2227 );
2171 2228
2172 sub db_dirty() { 2229 sub db_dirty() {
2173 $dirty = 1; 2230 $dirty = 1;
2174 $idle->start; 2231 $idle->start;
2175 } 2232 }
… …
2223 2280
2224sub main { 2281sub main {
2225 # we must not ever block the main coroutine 2282 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2283 local $Coro::idle = sub {
2227 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 {
2228 async { Event::one_event }; 2286 Event::one_event;
2287 })->prio (Coro::PRIO_MAX);
2229 }; 2288 };
2230 2289
2231 cfg_load; 2290 cfg_load;
2232 db_load; 2291 db_load;
2233 load_extensions; 2292 load_extensions;
2293
2294 $TICK_WATCHER->start;
2234 Event::loop; 2295 Event::loop;
2235} 2296}
2236 2297
2237############################################################################# 2298#############################################################################
2238# initialisation and cleanup 2299# initialisation and cleanup
2239 2300
2240# install some emergency cleanup handlers 2301# install some emergency cleanup handlers
2241BEGIN { 2302BEGIN {
2242 for my $signal (qw(INT HUP TERM)) { 2303 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal ( 2304 Event->signal (
2305 reentrant => 0,
2244 data => WF_AUTOCANCEL, 2306 data => WF_AUTOCANCEL,
2245 signal => $signal, 2307 signal => $signal,
2308 prio => 0,
2246 cb => sub { 2309 cb => sub {
2247 cf::cleanup "SIG$signal"; 2310 cf::cleanup "SIG$signal";
2248 }, 2311 },
2249 ); 2312 );
2250 } 2313 }
2251} 2314}
… …
2256 warn "enter emergency perl save\n"; 2319 warn "enter emergency perl save\n";
2257 2320
2258 cf::sync_job { 2321 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2322 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2323 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2324 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2325 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2326 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2327 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2328 $pl->valid or next;
2266 $pl->save; 2329 $pl->save;
… …
2280} 2343}
2281 2344
2282sub reload() { 2345sub reload() {
2283 # can/must only be called in main 2346 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2347 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2348 warn "can only reload from main coroutine";
2286 return; 2349 return;
2287 } 2350 }
2288 2351
2289 warn "reloading..."; 2352 warn "reloading...";
2290 2353
2291 warn "freezing server"; 2354 warn "cancelling server ticker";
2292 my $guard = freeze_mainloop; 2355 $TICK_WATCHER->cancel;
2356
2293 cf::emergency_save; 2357 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298 2358
2299 eval { 2359 eval {
2300 # 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
2301 2361
2362 warn "syncing database to disk";
2363 cf::db_sync;
2364
2302 warn "cancel all watchers"; 2365 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2366 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2367 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2368 }
2306 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
2307 warn "cancel all extension coros"; 2378 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2379 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2380 %EXT_CORO = ();
2310 2381
2311 warn "remove commands"; 2382 warn "removing commands";
2312 %COMMAND = (); 2383 %COMMAND = ();
2313 2384
2314 warn "remove ext commands"; 2385 warn "removing ext commands";
2315 %EXTCMD = (); 2386 %EXTCMD = ();
2316 2387
2317 warn "unload/nuke all extensions"; 2388 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2389 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2390 warn "... unloading $pkg";
2320 2391
2321 if (my $cb = $pkg->can ("unload")) { 2392 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2393 eval {
2323 $cb->($pkg); 2394 $cb->($pkg);
2324 1 2395 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2396 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2397 }
2327 2398
2399 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2400 Symbol::delete_package $pkg;
2329 } 2401 }
2330 2402
2331 warn "unload all perl modules loaded from $LIBDIR"; 2403 warn "unloading all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2404 while (my ($k, $v) = each %INC) {
2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2405 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2334 2406
2335 warn "removing <$k>"; 2407 warn "... unloading $k";
2336 delete $INC{$k}; 2408 delete $INC{$k};
2337 2409
2338 $k =~ s/\.pm$//; 2410 $k =~ s/\.pm$//;
2339 $k =~ s/\//::/g; 2411 $k =~ s/\//::/g;
2340 2412
… …
2343 } 2415 }
2344 2416
2345 Symbol::delete_package $k; 2417 Symbol::delete_package $k;
2346 } 2418 }
2347 2419
2348 warn "get rid of safe::, as good as possible"; 2420 warn "getting rid of safe::, as good as possible";
2349 Symbol::delete_package "safe::$_" 2421 Symbol::delete_package "safe::$_"
2350 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);
2351 2423
2352 warn "unload cf.pm \"a bit\""; 2424 warn "unloading cf.pm \"a bit\"";
2353 delete $INC{"cf.pm"}; 2425 delete $INC{"cf.pm"};
2354 2426
2355 # don't, removes xs symbols, too, 2427 # don't, removes xs symbols, too,
2356 # and global variables created in xs 2428 # and global variables created in xs
2357 #Symbol::delete_package __PACKAGE__; 2429 #Symbol::delete_package __PACKAGE__;
2358 2430
2431 warn "unload completed, starting to reload now";
2432
2359 warn "reloading cf.pm"; 2433 warn "reloading cf.pm";
2360 require cf; 2434 require cf;
2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2362 2436
2363 warn "load config and database again"; 2437 warn "loading config and database again";
2364 cf::cfg_load; 2438 cf::cfg_load;
2365 cf::db_load; 2439 cf::db_load;
2366 2440
2367 warn "load extensions"; 2441 warn "loading extensions";
2368 cf::load_extensions; 2442 cf::load_extensions;
2369 2443
2370 warn "reattach attachments to objects/players"; 2444 warn "reattaching attachments to objects/players";
2371 _global_reattach; 2445 _global_reattach;
2372 warn "reattach attachments to maps"; 2446 warn "reattaching attachments to maps";
2373 reattach $_ for values %MAP; 2447 reattach $_ for values %MAP;
2448
2449 warn "restarting server ticker";
2450
2451 $TICK_WATCHER->start;
2374 }; 2452 };
2375 2453
2376 if ($@) { 2454 if ($@) {
2377 warn $@; 2455 warn $@;
2378 warn "error while reloading, exiting."; 2456 warn "error while reloading, exiting.";
… …
2380 } 2458 }
2381 2459
2382 warn "reloaded"; 2460 warn "reloaded";
2383}; 2461};
2384 2462
2385############################################################################# 2463our $RELOAD_WATCHER; # used only during reload
2386
2387unless ($LINK_MAP) {
2388 $LINK_MAP = cf::map::new;
2389
2390 $LINK_MAP->width (41);
2391 $LINK_MAP->height (41);
2392 $LINK_MAP->alloc;
2393 $LINK_MAP->path ("{link}");
2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2396
2397 # dirty hack because... archetypes are not yet loaded
2398 Event->timer (
2399 after => 10,
2400 cb => sub {
2401 $_[0]->w->cancel;
2402
2403 # provide some exits "home"
2404 my $exit = cf::object::new "exit";
2405
2406 $exit->slaying ($EMERGENCY_POSITION->[0]);
2407 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2408 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2409
2410 $LINK_MAP->insert ($exit->clone, 19, 19);
2411 $LINK_MAP->insert ($exit->clone, 19, 20);
2412 $LINK_MAP->insert ($exit->clone, 19, 21);
2413 $LINK_MAP->insert ($exit->clone, 20, 19);
2414 $LINK_MAP->insert ($exit->clone, 20, 21);
2415 $LINK_MAP->insert ($exit->clone, 21, 19);
2416 $LINK_MAP->insert ($exit->clone, 21, 20);
2417 $LINK_MAP->insert ($exit->clone, 21, 21);
2418
2419 $exit->destroy;
2420 });
2421
2422 $LINK_MAP->{deny_save} = 1;
2423 $LINK_MAP->{deny_reset} = 1;
2424
2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2426}
2427 2464
2428register_command "reload" => sub { 2465register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2466 my ($who, $arg) = @_;
2430 2467
2431 if ($who->flag (FLAG_WIZ)) { 2468 if ($who->flag (FLAG_WIZ)) {
2432 $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 {
2433 reload; 2479 reload;
2434 $who->message ("end of reload."); 2480 undef $RELOAD_WATCHER;
2481 },
2482 );
2435 } 2483 }
2436}; 2484};
2437 2485
2438unshift @INC, $LIBDIR; 2486unshift @INC, $LIBDIR;
2487
2488my $bug_warning = 0;
2439 2489
2440$TICK_WATCHER = Event->timer ( 2490$TICK_WATCHER = Event->timer (
2441 reentrant => 0, 2491 reentrant => 0,
2492 parked => 1,
2442 prio => 0, 2493 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2494 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2495 data => WF_AUTOCANCEL,
2445 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
2446 cf::server_tick; # one server iteration 2505 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2506 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2507 $NEXT_TICK += $TICK;
2449 2508
2450 $WAIT_FOR_TICK->broadcast; 2509 $WAIT_FOR_TICK->broadcast;
2451 $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#
2452 2517
2453 # 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
2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2455 2520
2456 $TICK_WATCHER->at ($NEXT_TICK); 2521 $TICK_WATCHER->at ($NEXT_TICK);
2457 $TICK_WATCHER->start; 2522 $TICK_WATCHER->start;
2458 }, 2523 },
2459); 2524);
2460 2525
2461IO::AIO::max_poll_time $TICK * 0.2; 2526IO::AIO::max_poll_time $TICK * 0.1;
2462 2527
2463Event->io ( 2528undef $Coro::AIO::WATCHER;
2529$AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0,
2464 fd => IO::AIO::poll_fileno, 2531 fd => IO::AIO::poll_fileno,
2465 poll => 'r', 2532 poll => 'r',
2466 prio => 5, 2533 prio => 6,
2467 data => WF_AUTOCANCEL, 2534 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb, 2535 cb => \&IO::AIO::poll_cb,
2469); 2536);
2470 2537
2471Event->timer ( 2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2472 data => WF_AUTOCANCEL, 2540 data => WF_AUTOCANCEL,
2473 after => 0, 2541 after => 1,
2474 interval => 10, 2542 interval => 10,
2475 cb => sub { 2543 prio => 6, # keep it lowest so it acts like a watchdog
2476 (Coro::unblock_sub { 2544 cb => Coro::unblock_sub {
2477 write_runtime 2545 write_runtime
2478 or warn "ERROR: unable to write runtime file: $!"; 2546 or warn "ERROR: unable to write runtime file: $!";
2479 })->();
2480 }, 2547 },
2481); 2548);
2482 2549
2483END { cf::emergency_save } 2550END { cf::emergency_save }
2484 2551

Diff Legend

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