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.164 by root, Thu Jan 11 01:24:25 2007 UTC vs.
Revision 1.186 by root, Sat Jan 20 01:12:39 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
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
527}
528
529package cf;
530 376
531############################################################################# 377#############################################################################
532 378
533=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
534 380
… …
660our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
661our @CB_MAP = (); 507our @CB_MAP = ();
662 508
663my %attachment; 509my %attachment;
664 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
665sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
666 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
667 519
668 use sort 'stable'; 520 use sort 'stable';
669 521
… …
840# object support 692# object support
841 693
842sub reattach { 694sub reattach {
843 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 699
846 my $registry = $obj->registry; 700 my $registry = $obj->registry;
847 701
848 @$registry = (); 702 @$registry = ();
849 703
… …
1036 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
1037 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1038 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1039 . "\n};\n1"; 893 . "\n};\n1";
1040 894
1041 eval $source 895 unless (eval $source) {
1042 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1043 : "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 }
1044 905
1045 push @EXTS, $pkg; 906 push @EXTS, $pkg;
1046} 907}
1047 908
1048sub load_extensions { 909sub load_extensions {
… …
1054 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1055 } 916 }
1056} 917}
1057 918
1058############################################################################# 919#############################################################################
1059# load/save/clean perl data associated with a map
1060
1061*cf::mapsupport::on_clean = sub {
1062 my ($map) = @_;
1063
1064 my $path = $map->tmpname;
1065 defined $path or return;
1066
1067 unlink "$path.pst";
1068};
1069
1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1071
1072#############################################################################
1073 920
1074=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1075 922
1076Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1077 924
… …
1113 960
1114sub exists($) { 961sub exists($) {
1115 my ($login) = @_; 962 my ($login) = @_;
1116 963
1117 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1119} 966}
1120 967
1121sub find($) { 968sub find($) {
1122 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0]; 970 my $login = $_[0];
… …
1213 \@logins 1060 \@logins
1214} 1061}
1215 1062
1216=item $player->maps 1063=item $player->maps
1217 1064
1218Returns 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
1219player. May block. 1066player. May block.
1220 1067
1221=cut 1068=cut
1222 1069
1223sub maps($) { 1070sub maps($) {
… …
1231 for (@$files) { 1078 for (@$files) {
1232 utf8::decode $_; 1079 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1235 1082
1083 s/\.map$//;
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1237 } 1085 }
1238 1086
1239 \@paths 1087 \@paths
1240} 1088}
1241 1089
… …
1267package cf::map; 1115package cf::map;
1268 1116
1269use Fcntl; 1117use Fcntl;
1270use Coro::AIO; 1118use Coro::AIO;
1271 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1272our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1273our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1274 1126
1275sub generate_random_map { 1127sub generate_random_map {
1276 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1277
1278 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1130 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
… …
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1142 )
1293} 1143}
1294 1144
1145sub register {
1146 my (undef, $regex) = @_;
1147 my $pkg = caller;
1148
1149 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__;
1151
1152 $EXT_MAP{$pkg} = qr<$regex>;
1153}
1154
1155# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)};
1157
1158sub thawer_merge {
1159 my ($self, $merge) = @_;
1160
1161 # we have to keep some variables in memory intact
1162 local $self->{path};
1163 local $self->{load_path};
1164 local $self->{deny_save};
1165 local $self->{deny_reset};
1166
1167 $self->SUPER::thawer_merge ($merge);
1168}
1169
1170sub normalise {
1171 my ($path, $base) = @_;
1172
1173 # map plan:
1174 #
1175 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched
1177 # ?xxx/... are special absolute paths
1178 # ?random/... random maps
1179 # /... normal maps
1180 # ~user/... per-player map of a specific user
1181
1182 $path =~ s/$PATH_SEP/\//go;
1183
1184 # treat it as relative path if it starts with
1185 # something that looks reasonable
1186 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1187 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1188
1189 $base =~ s{[^/]+/?$}{};
1190 $path = "$base/$path";
1191 }
1192
1193 for ($path) {
1194 redo if s{//}{/};
1195 redo if s{/\.?/}{/};
1196 redo if s{/[^/]+/\.\./}{/};
1197 }
1198
1199 $path
1200}
1201
1202sub new_from_path {
1203 my (undef, $path, $base) = @_;
1204
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206
1207 $path = normalise $path, $base;
1208
1209 for my $pkg (keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) {
1211 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc.
1214 return $self;
1215 }
1216 }
1217
1218 Carp::carp "unable to resolve path '$path'.";
1219 ()
1220}
1221
1222sub init {
1223 my ($self) = @_;
1224
1225 $self
1226}
1227
1228sub as_string {
1229 my ($self) = @_;
1230
1231 "$self->{path}"
1232}
1233
1234# the displayed name, this is a one way mapping
1235sub visible_name {
1236 &as_string
1237}
1238
1239# the original (read-only) location
1240sub load_path {
1241 my ($self) = @_;
1242
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1244}
1245
1246# the temporary/swap location
1247sub save_path {
1248 my ($self) = @_;
1249
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1252}
1253
1254# the unique path, undef == no special unique path
1255sub uniq_path {
1256 my ($self) = @_;
1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1260}
1261
1295# and all this just because we cannot iterate over 1262# and all this just because we cannot iterate over
1296# all maps in C++... 1263# all maps in C++...
1297sub change_all_map_light { 1264sub change_all_map_light {
1298 my ($change) = @_; 1265 my ($change) = @_;
1299 1266
1300 $_->change_map_light ($change) 1267 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1268 for grep $_->outdoor, values %cf::MAP;
1302} 1269}
1303 1270
1271sub unlink_save {
1272 my ($self) = @_;
1273
1274 utf8::encode (my $save = $self->save_path);
1275 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1276 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1277}
1278
1304sub load_map_header($) { 1279sub load_header_from($) {
1305 my ($path) = @_; 1280 my ($self, $path) = @_;
1306 1281
1307 utf8::encode $path; 1282 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1283 aio_open $path, O_RDONLY, 0
1309 or return; 1284 or return;
1310 1285
1311 my $map = cf::map::new 1286 $self->_load_header ($path)
1312 or return; 1287 or return;
1313 1288
1314 # for better error messages only, will be overwritten later 1289 $self->{load_path} = $path;
1315 $map->path ($path);
1316 1290
1317 $map->load_header ($path) 1291 1
1292}
1293
1294sub load_orig {
1295 my ($self) = @_;
1296
1297 $self->load_header_from ($self->load_path)
1298}
1299
1300sub load_temp {
1301 my ($self) = @_;
1302
1303 $self->load_header_from ($self->save_path)
1304}
1305
1306sub load_header {
1307 my ($self) = @_;
1308
1309 if ($self->load_temp) {
1310 $self->last_access ((delete $self->{last_access})
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else {
1316 $self->load_orig
1318 or return; 1317 or return;
1319 1318
1320 $map->{load_path} = $path; 1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 }
1321 1324
1322 $map 1325 1
1323} 1326}
1324 1327
1325sub find; 1328sub find;
1326sub find { 1329sub find {
1327 my ($path, $origin) = @_; 1330 my ($path, $origin) = @_;
1328 1331
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1332 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1333
1334 cf::lock_wait "map_find:$key"; 1334 cf::lock_wait "map_find:$path";
1335 1335
1336 $cf::MAP{$key} || do { 1336 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1337 my $guard = cf::lock_acquire "map_find:$path";
1338 1338 my $map = new_from_path cf::map $path
1339 # do it the slow way
1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1343
1344 if ($map) {
1345 $map->last_access ((delete $map->{last_access})
1346 || $cf::RUNTIME); #d#
1347 # safety
1348 $map->{instantiate_time} = $cf::RUNTIME
1349 if $map->{instantiate_time} > $cf::RUNTIME;
1350 } else {
1351 $map = $path->load_orig
1352 or return; 1339 or return;
1353 1340
1354 $map->{load_original} = 1;
1355 $map->{instantiate_time} = $cf::RUNTIME;
1356 $map->last_access ($cf::RUNTIME);
1357 $map->instantiate;
1358
1359 # per-player maps become, after loading, normal maps
1360 $map->per_player (0) if $path->{user_rel};
1361 }
1362
1363 $map->path ($key);
1364 $map->{path} = $path;
1365 $map->{last_save} = $cf::RUNTIME; 1341 $map->{last_save} = $cf::RUNTIME;
1366 1342
1367 Coro::cede; 1343 $map->load_header
1344 or return;
1368 1345
1369 if ($map->should_reset) { 1346 if ($map->should_reset) {
1347 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1349 $map->reset;
1371 undef $guard; 1350 undef $guard;
1372 $map = find $path 1351 $map = find $path
1373 or return; 1352 or return;
1374 } 1353 }
1375 1354
1376 $cf::MAP{$key} = $map 1355 $cf::MAP{$path} = $map
1377 } 1356 }
1378} 1357}
1379 1358
1380sub load { 1359sub load {
1381 my ($self) = @_; 1360 my ($self) = @_;
1382 1361
1383 my $path = $self->{path}; 1362 my $path = $self->{path};
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1363 my $guard = cf::lock_acquire "map_load:$path";
1385 1364
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1365 return if $self->in_memory != cf::MAP_SWAPPED;
1387 1366
1388 $self->in_memory (cf::MAP_LOADING); 1367 $self->in_memory (cf::MAP_LOADING);
1389 1368
1390 $self->alloc; 1369 $self->alloc;
1391 $self->load_objects ($self->{load_path}, 1) 1370 $self->_load_objects ($self->{load_path}, 1)
1392 or return; 1371 or return;
1393 1372
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1374 if delete $self->{load_original};
1396 1375
1397 if (my $uniq = $path->uniq_path) { 1376 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1377 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1378 if (aio_open $uniq, O_RDONLY, 0) {
1400 $self->clear_unique_items; 1379 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1380 $self->_load_objects ($uniq, 0);
1402 } 1381 }
1403 } 1382 }
1404 1383
1405 Coro::cede; 1384 Coro::cede;
1406 1385
1407 # now do the right thing for maps 1386 # now do the right thing for maps
1408 $self->link_multipart_objects; 1387 $self->link_multipart_objects;
1409 1388
1410 if ($self->{path}->is_style_map) { 1389 unless ($self->{deny_activate}) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects; 1390 $self->decay_objects;
1415 $self->fix_auto_apply; 1391 $self->fix_auto_apply;
1416 $self->update_buttons; 1392 $self->update_buttons;
1393 Coro::cede;
1417 $self->set_darkness_map; 1394 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1395 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1396 unless $self->difficulty;
1397 Coro::cede;
1420 $self->activate; 1398 $self->activate;
1421 } 1399 }
1422 1400
1423 Coro::cede;
1424
1425 $self->in_memory (cf::MAP_IN_MEMORY); 1401 $self->in_memory (cf::MAP_IN_MEMORY);
1402}
1403
1404sub customise_for {
1405 my ($self, $ob) = @_;
1406
1407 return find "~" . $ob->name . "/" . $self->{path}
1408 if $self->per_player;
1409
1410 $self
1426} 1411}
1427 1412
1428# find and load all maps in the 3x3 area around a map 1413# find and load all maps in the 3x3 area around a map
1429sub load_diag { 1414sub load_diag {
1430 my ($map) = @_; 1415 my ($map) = @_;
… …
1460 1445
1461 cf::sync_job { $map->load }; 1446 cf::sync_job { $map->load };
1462} 1447}
1463 1448
1464our %MAP_PREFETCH; 1449our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async { 1450our $MAP_PREFETCHER = undef;
1466 while () {
1467 while (%MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path
1473 or next;
1474 $map->load;
1475 }
1476 Coro::schedule;
1477 }
1478};
1479 1451
1480sub find_async { 1452sub find_async {
1481 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1482 1454
1483 $path = new cf::path $path, $origin && $origin->path; 1455 $path = normalise $path, $origin && $origin->{path};
1484 my $key = $path->as_string;
1485 1456
1486 if (my $map = $cf::MAP{$key}) { 1457 if (my $map = $cf::MAP{$path}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 } 1459 }
1489 1460
1490 $MAP_PREFETCH{$key} = $path; 1461 undef $MAP_PREFETCH{$path};
1491 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER ||= cf::async {
1463 while (%MAP_PREFETCH) {
1464 for my $path (keys %MAP_PREFETCH) {
1465 my $map = find $path
1466 or next;
1467 $map->load;
1468
1469 delete $MAP_PREFETCH{$path};
1470 }
1471 }
1472 undef $MAP_PREFETCHER;
1473 };
1492 1474
1493 () 1475 ()
1494} 1476}
1495 1477
1496sub save { 1478sub save {
… …
1500 1482
1501 $self->{last_save} = $cf::RUNTIME; 1483 $self->{last_save} = $cf::RUNTIME;
1502 1484
1503 return unless $self->dirty; 1485 return unless $self->dirty;
1504 1486
1505 my $save = $self->{path}->save_path; utf8::encode $save; 1487 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1488 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 1489
1508 $self->{load_path} = $save; 1490 $self->{load_path} = $save;
1509 1491
1510 return if $self->{deny_save}; 1492 return if $self->{deny_save};
1511 1493
… …
1514 cf::async { 1496 cf::async {
1515 $_->contr->save for $self->players; 1497 $_->contr->save for $self->players;
1516 }; 1498 };
1517 1499
1518 if ($uniq) { 1500 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 1502 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 1503 } else {
1522 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1504 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1523 } 1505 }
1524} 1506}
1525 1507
1526sub swap_out { 1508sub swap_out {
1527 my ($self) = @_; 1509 my ($self) = @_;
… …
1541 1523
1542sub reset_at { 1524sub reset_at {
1543 my ($self) = @_; 1525 my ($self) = @_;
1544 1526
1545 # TODO: safety, remove and allow resettable per-player maps 1527 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel}; 1528 return 1e99 if $self->isa ("ext::map_per_player");#d#
1547 return 1e99 if $self->{deny_reset}; 1529 return 1e99 if $self->{deny_reset};
1548 1530
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1531 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1532 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1551 1533
… …
1556 my ($self) = @_; 1538 my ($self) = @_;
1557 1539
1558 $self->reset_at <= $cf::RUNTIME 1540 $self->reset_at <= $cf::RUNTIME
1559} 1541}
1560 1542
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->{path}->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 { 1543sub reset {
1575 my ($self) = @_; 1544 my ($self) = @_;
1576 1545
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1546 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1547
1579 return if $self->players; 1548 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1549 return if $self->isa ("ext::map_per_player");#d#
1581 1550
1582 warn "resetting map ", $self->path;#d# 1551 warn "resetting map ", $self->path;#d#
1583 1552
1584 delete $cf::MAP{$self->path}; 1553 delete $cf::MAP{$self->path};
1585 1554
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear;
1557
1586 $_->clear_links_to ($self) for values %cf::MAP; 1558 $_->clear_links_to ($self) for values %cf::MAP;
1587 1559
1588 $self->{path}->unlink_save; 1560 $self->unlink_save;
1589 $self->destroy; 1561 $self->destroy;
1590} 1562}
1591 1563
1592my $nuke_counter = "aaaa"; 1564my $nuke_counter = "aaaa";
1593 1565
1594sub nuke { 1566sub nuke {
1595 my ($self) = @_; 1567 my ($self) = @_;
1596 1568
1569 delete $cf::MAP{$self->path};
1570
1571 $self->unlink_save;
1572
1573 bless $self, "cf::map";
1574 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1575 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1578
1579 $cf::MAP{$self->path} = $self;
1580
1600 $self->reset; # polite request, might not happen 1581 $self->reset; # polite request, might not happen
1601} 1582}
1602 1583
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 1584=item cf::map::unique_maps
1614 1585
1615Returns an arrayref of cf::path's of all shared maps that have 1586Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1587instantiated unique items. May block.
1617 1588
1618=cut 1589=cut
1619 1590
1620sub unique_maps() { 1591sub unique_maps() {
… …
1626 for (@$files) { 1597 for (@$files) {
1627 utf8::decode $_; 1598 utf8::decode $_;
1628 next if /\.pst$/; 1599 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1600 next unless /^$PATH_SEP/o;
1630 1601
1602 s/\.map$//;
1631 push @paths, new cf::path $_; 1603 push @paths, $_;
1632 } 1604 }
1633 1605
1634 \@paths 1606 \@paths
1635} 1607}
1636 1608
… …
1711 1683
1712=item $player_object->enter_link 1684=item $player_object->enter_link
1713 1685
1714Freezes the player and moves him/her to a special map (C<{link}>). 1686Freezes the player and moves him/her to a special map (C<{link}>).
1715 1687
1716The player should be reaosnably safe there for short amounts of time. You 1688The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1689I<MUST> call C<leave_link> as soon as possible, though.
1718 1690
1691Will never block.
1692
1719=item $player_object->leave_link ($map, $x, $y) 1693=item $player_object->leave_link ($map, $x, $y)
1720 1694
1721Moves the player out of the specila link map onto the given map. If the 1695Moves 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 1696map. 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, 1697to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1698fails, to the emergency map position.
1725 1699
1726Might block. 1700Might block.
1727 1701
1728=cut 1702=cut
1703
1704sub link_map {
1705 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1708 $LINK_MAP->load;
1709 }
1710
1711 $LINK_MAP
1712}
1729 1713
1730sub cf::object::player::enter_link { 1714sub cf::object::player::enter_link {
1731 my ($self) = @_; 1715 my ($self) = @_;
1732 1716
1733 $self->deactivate_recursive; 1717 $self->deactivate_recursive;
1734 1718
1735 return if $self->map == $LINK_MAP; 1719 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1720
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1722 if $self->map;
1739 1723
1740 $self->enter_map ($LINK_MAP, 20, 20); 1724 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1725}
1742 1726
1743sub cf::object::player::leave_link { 1727sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1728 my ($self, $map, $x, $y) = @_;
1745 1729
… …
1809=cut 1793=cut
1810 1794
1811sub cf::object::player::goto { 1795sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1796 my ($self, $path, $x, $y) = @_;
1813 1797
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1798 $self->enter_link;
1817 1799
1818 (async { 1800 (async {
1819 my $map = cf::map::find $path->as_string; 1801 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1802 $map = $map->customise_for ($self) if $map;
1821 1803
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1804# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1805# if $map;
1824 1806
… …
1834 1816
1835sub parse_random_map_params { 1817sub parse_random_map_params {
1836 my ($spec) = @_; 1818 my ($spec) = @_;
1837 1819
1838 my $rmp = { # defaults 1820 my $rmp = { # defaults
1839 xsize => 10, 1821 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1822 ysize => (cf::rndm 15, 40),
1823 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1824 #layout => string,
1841 }; 1825 };
1842 1826
1843 for (split /\n/, $spec) { 1827 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1828 my ($k, $v) = split /\s+/, $_, 2;
1845 1829
… …
1849 $rmp 1833 $rmp
1850} 1834}
1851 1835
1852sub prepare_random_map { 1836sub prepare_random_map {
1853 my ($exit) = @_; 1837 my ($exit) = @_;
1838
1839 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1840
1855 # all this does is basically replace the /! path by 1841 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1842 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1843 # that depends on the exit object
1858 1844
… …
1867 1853
1868 $rmp->{random_seed} ||= $exit->random_seed; 1854 $rmp->{random_seed} ||= $exit->random_seed;
1869 1855
1870 my $data = cf::to_json $rmp; 1856 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1857 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1859
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1860 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1861 aio_write $fh, 0, (length $data), $data, 0;
1862 undef $fh;
1863 aio_rename "$meta~", $meta;
1875 1864
1876 $exit->slaying ("?random/$md5"); 1865 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1866 $exit->msg (undef);
1878 } 1867 }
1879} 1868}
… …
1889 $self->deactivate_recursive; # just to be sure 1878 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1879 unless (eval {
1891 prepare_random_map $exit 1880 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1881 if $exit->slaying eq "/!";
1893 1882
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1885
1897 1; 1886 1;
1898 }) { 1887 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1888 $self->message ("Something went wrong deep within the crossfire server. "
… …
2189 sub db_sync() { 2178 sub db_sync() {
2190 db_save if $dirty; 2179 db_save if $dirty;
2191 undef $dirty; 2180 undef $dirty;
2192 } 2181 }
2193 2182
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2195 db_sync; 2184 db_sync;
2196 }); 2185 });
2197 2186
2198 sub db_dirty() { 2187 sub db_dirty() {
2199 $dirty = 1; 2188 $dirty = 1;
… …
2249 2238
2250sub main { 2239sub main {
2251 # we must not ever block the main coroutine 2240 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2241 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2242 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2243 (async {
2254 async { Event::one_event }; 2244 Event::one_event;
2245 })->prio (Coro::PRIO_MAX);
2255 }; 2246 };
2256 2247
2257 cfg_load; 2248 cfg_load;
2258 db_load; 2249 db_load;
2259 load_extensions; 2250 load_extensions;
2251
2252 $TICK_WATCHER->start;
2260 Event::loop; 2253 Event::loop;
2261} 2254}
2262 2255
2263############################################################################# 2256#############################################################################
2264# initialisation and cleanup 2257# initialisation and cleanup
… …
2282 warn "enter emergency perl save\n"; 2275 warn "enter emergency perl save\n";
2283 2276
2284 cf::sync_job { 2277 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2278 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2279 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2280 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2281 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2282 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2283 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2284 $pl->valid or next;
2292 $pl->save; 2285 $pl->save;
… …
2306} 2299}
2307 2300
2308sub reload() { 2301sub reload() {
2309 # can/must only be called in main 2302 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2303 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2304 warn "can only reload from main coroutine";
2312 return; 2305 return;
2313 } 2306 }
2314 2307
2315 warn "reloading..."; 2308 warn "reloading...";
2316 2309
2317 warn "freezing server"; 2310 warn "cancelling server ticker";
2318 my $guard = freeze_mainloop; 2311 $TICK_WATCHER->cancel;
2312
2319 cf::emergency_save; 2313 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324 2314
2325 eval { 2315 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 2316 # if anything goes wrong in here, we should simply crash as we already saved
2327 2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320
2328 warn "cancel all watchers"; 2321 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2322 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2323 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2324 }
2332 2325
2326 warn "flushing outstanding aio requests";
2327 for (;;) {
2328 IO::AIO::flush;
2329 Coro::cede;
2330 last unless IO::AIO::nreqs;
2331 warn "iterate...";
2332 }
2333
2333 warn "cancel all extension coros"; 2334 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2335 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2336 %EXT_CORO = ();
2336 2337
2337 warn "remove commands"; 2338 warn "removing commands";
2338 %COMMAND = (); 2339 %COMMAND = ();
2339 2340
2340 warn "remove ext commands"; 2341 warn "removing ext commands";
2341 %EXTCMD = (); 2342 %EXTCMD = ();
2342 2343
2343 warn "unload/nuke all extensions"; 2344 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2345 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2346 warn "... unloading $pkg";
2346 2347
2347 if (my $cb = $pkg->can ("unload")) { 2348 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2349 eval {
… …
2353 2354
2354 warn "... nuking $pkg"; 2355 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2356 Symbol::delete_package $pkg;
2356 } 2357 }
2357 2358
2358 warn "unload all perl modules loaded from $LIBDIR"; 2359 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2360 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2362
2362 warn "removing <$k>"; 2363 warn "... unloading $k";
2363 delete $INC{$k}; 2364 delete $INC{$k};
2364 2365
2365 $k =~ s/\.pm$//; 2366 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2367 $k =~ s/\//::/g;
2367 2368
… …
2370 } 2371 }
2371 2372
2372 Symbol::delete_package $k; 2373 Symbol::delete_package $k;
2373 } 2374 }
2374 2375
2375 warn "get rid of safe::, as good as possible"; 2376 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2377 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 2379
2379 warn "unload cf.pm \"a bit\""; 2380 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2381 delete $INC{"cf.pm"};
2381 2382
2382 # don't, removes xs symbols, too, 2383 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2384 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2385 #Symbol::delete_package __PACKAGE__;
2385 2386
2387 warn "unload completed, starting to reload now";
2388
2386 warn "reloading cf.pm"; 2389 warn "reloading cf.pm";
2387 require cf; 2390 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2392
2390 warn "load config and database again"; 2393 warn "loading config and database again";
2391 cf::cfg_load; 2394 cf::cfg_load;
2392 cf::db_load; 2395 cf::db_load;
2393 2396
2394 warn "load extensions"; 2397 warn "loading extensions";
2395 cf::load_extensions; 2398 cf::load_extensions;
2396 2399
2397 warn "reattach attachments to objects/players"; 2400 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2401 _global_reattach;
2399 warn "reattach attachments to maps"; 2402 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2403 reattach $_ for values %MAP;
2404
2405 warn "restarting server ticker";
2406
2407 $TICK_WATCHER->start;
2401 }; 2408 };
2402 2409
2403 if ($@) { 2410 if ($@) {
2404 warn $@; 2411 warn $@;
2405 warn "error while reloading, exiting."; 2412 warn "error while reloading, exiting.";
… …
2407 } 2414 }
2408 2415
2409 warn "reloaded"; 2416 warn "reloaded";
2410}; 2417};
2411 2418
2412############################################################################# 2419our $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 2420
2455register_command "reload" => sub { 2421register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2422 my ($who, $arg) = @_;
2457 2423
2458 if ($who->flag (FLAG_WIZ)) { 2424 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2425 $who->message ("reloading server.");
2426
2427 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here.
2429
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2460 reload; 2431 reload;
2461 $who->message ("end of reload."); 2432 undef $RELOAD_WATCHER;
2433 });
2462 } 2434 }
2463}; 2435};
2464 2436
2465unshift @INC, $LIBDIR; 2437unshift @INC, $LIBDIR;
2438
2439my $bug_warning = 0;
2466 2440
2467$TICK_WATCHER = Event->timer ( 2441$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2442 reentrant => 0,
2443 parked => 1,
2469 prio => 0, 2444 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2445 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2446 data => WF_AUTOCANCEL,
2472 cb => sub { 2447 cb => sub {
2448 if ($Coro::current != $Coro::main) {
2449 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2450 unless ++$bug_warning > 10;
2451 return;
2452 }
2453
2473 $NOW = Event::time; 2454 $NOW = Event::time;
2474 2455
2475 cf::server_tick; # one server iteration 2456 cf::server_tick; # one server iteration
2476 $RUNTIME += $TICK; 2457 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 2458 $NEXT_TICK += $TICK;
… …
2487 }, 2468 },
2488); 2469);
2489 2470
2490IO::AIO::max_poll_time $TICK * 0.2; 2471IO::AIO::max_poll_time $TICK * 0.2;
2491 2472
2492Event->io ( 2473$AIO_POLL_WATCHER = Event->io (
2493 fd => IO::AIO::poll_fileno, 2474 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2475 poll => 'r',
2495 prio => 5, 2476 prio => 5,
2496 data => WF_AUTOCANCEL, 2477 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2478 cb => \&IO::AIO::poll_cb,
2498); 2479);
2499 2480
2500Event->timer ( 2481$WRITE_RUNTIME_WATCHER = Event->timer (
2501 data => WF_AUTOCANCEL, 2482 data => WF_AUTOCANCEL,
2502 after => 0, 2483 after => 1,
2503 interval => 10, 2484 interval => 10,
2504 cb => sub { 2485 prio => 6, # keep it lowest so it acts like a watchdog
2505 (Coro::unblock_sub { 2486 cb => Coro::unblock_sub {
2506 write_runtime 2487 write_runtime
2507 or warn "ERROR: unable to write runtime file: $!"; 2488 or warn "ERROR: unable to write runtime file: $!";
2508 })->();
2509 }, 2489 },
2510); 2490);
2511 2491
2512END { cf::emergency_save } 2492END { cf::emergency_save }
2513 2493

Diff Legend

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