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

Diff Legend

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