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.165 by root, Fri Jan 12 22:09:22 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 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 376
543############################################################################# 377#############################################################################
544 378
545=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
546 380
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 507our @CB_MAP = ();
674 508
675my %attachment; 509my %attachment;
676 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
677sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
679 519
680 use sort 'stable'; 520 use sort 'stable';
681 521
… …
852# object support 692# object support
853 693
854sub reattach { 694sub reattach {
855 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 699
858 my $registry = $obj->registry; 700 my $registry = $obj->registry;
859 701
860 @$registry = (); 702 @$registry = ();
861 703
… …
1048 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 893 . "\n};\n1";
1052 894
1053 eval $source 895 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1055 : "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 }
1056 905
1057 push @EXTS, $pkg; 906 push @EXTS, $pkg;
1058} 907}
1059 908
1060sub load_extensions { 909sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1067 } 916 }
1068} 917}
1069 918
1070############################################################################# 919#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 920
1086=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1087 922
1088Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1089 924
… …
1125 960
1126sub exists($) { 961sub exists($) {
1127 my ($login) = @_; 962 my ($login) = @_;
1128 963
1129 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1131} 966}
1132 967
1133sub find($) { 968sub find($) {
1134 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0]; 970 my $login = $_[0];
… …
1225 \@logins 1060 \@logins
1226} 1061}
1227 1062
1228=item $player->maps 1063=item $player->maps
1229 1064
1230Returns 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
1231player. May block. 1066player. May block.
1232 1067
1233=cut 1068=cut
1234 1069
1235sub maps($) { 1070sub maps($) {
… …
1243 for (@$files) { 1078 for (@$files) {
1244 utf8::decode $_; 1079 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1247 1082
1083 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1085 }
1250 1086
1251 \@paths 1087 \@paths
1252} 1088}
1253 1089
… …
1279package cf::map; 1115package cf::map;
1280 1116
1281use Fcntl; 1117use Fcntl;
1282use Coro::AIO; 1118use Coro::AIO;
1283 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1284our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1286 1126
1287sub generate_random_map { 1127sub generate_random_map {
1288 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1130 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1142 )
1305} 1143}
1306 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
1307# and all this just because we cannot iterate over 1262# and all this just because we cannot iterate over
1308# all maps in C++... 1263# all maps in C++...
1309sub change_all_map_light { 1264sub change_all_map_light {
1310 my ($change) = @_; 1265 my ($change) = @_;
1311 1266
1312 $_->change_map_light ($change) 1267 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1268 for grep $_->outdoor, values %cf::MAP;
1314} 1269}
1315 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
1316sub load_map_header($) { 1279sub load_header_from($) {
1317 my ($path) = @_; 1280 my ($self, $path) = @_;
1318 1281
1319 utf8::encode $path; 1282 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1283 aio_open $path, O_RDONLY, 0
1321 or return; 1284 or return;
1322 1285
1323 my $map = cf::map::new 1286 $self->_load_header ($path)
1324 or return; 1287 or return;
1325 1288
1326 # for better error messages only, will be overwritten later 1289 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1290
1329 $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
1330 or return; 1317 or return;
1331 1318
1332 $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 }
1333 1324
1334 $map 1325 1
1335} 1326}
1336 1327
1337sub find; 1328sub find;
1338sub find { 1329sub find {
1339 my ($path, $origin) = @_; 1330 my ($path, $origin) = @_;
1340 1331
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1332 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1333
1346 cf::lock_wait "map_find:$key"; 1334 cf::lock_wait "map_find:$path";
1347 1335
1348 $cf::MAP{$key} || do { 1336 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1337 my $guard = cf::lock_acquire "map_find:$path";
1350 1338 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1339 or return;
1365 1340
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1341 $map->{last_save} = $cf::RUNTIME;
1378 1342
1379 Coro::cede; 1343 $map->load_header
1344 or return;
1380 1345
1381 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;
1382 $map->reset; 1349 $map->reset;
1383 undef $guard; 1350 undef $guard;
1384 $map = find $path 1351 $map = find $path
1385 or return; 1352 or return;
1386 } 1353 }
1387 1354
1388 $cf::MAP{$key} = $map 1355 $cf::MAP{$path} = $map
1389 } 1356 }
1390} 1357}
1391 1358
1392sub load { 1359sub load {
1393 my ($self) = @_; 1360 my ($self) = @_;
1394 1361
1395 my $path = $self->{path}; 1362 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1363 my $guard = cf::lock_acquire "map_load:$path";
1397 1364
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1365 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1366
1400 $self->in_memory (cf::MAP_LOADING); 1367 $self->in_memory (cf::MAP_LOADING);
1401 1368
1402 $self->alloc; 1369 $self->alloc;
1403 $self->load_objects ($self->{load_path}, 1) 1370 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1371 or return;
1405 1372
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1374 if delete $self->{load_original};
1408 1375
1409 if (my $uniq = $path->uniq_path) { 1376 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1377 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1378 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1379 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1380 $self->_load_objects ($uniq, 0);
1414 } 1381 }
1415 } 1382 }
1416 1383
1417 Coro::cede; 1384 Coro::cede;
1418 1385
1419 # now do the right thing for maps 1386 # now do the right thing for maps
1420 $self->link_multipart_objects; 1387 $self->link_multipart_objects;
1421 1388
1422 if ($self->{path}->is_style_map) { 1389 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1390 $self->decay_objects;
1427 $self->fix_auto_apply; 1391 $self->fix_auto_apply;
1428 $self->update_buttons; 1392 $self->update_buttons;
1393 Coro::cede;
1429 $self->set_darkness_map; 1394 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1395 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1396 unless $self->difficulty;
1397 Coro::cede;
1432 $self->activate; 1398 $self->activate;
1433 } 1399 }
1434 1400
1435 Coro::cede;
1436
1437 $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
1438} 1411}
1439 1412
1440# 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
1441sub load_diag { 1414sub load_diag {
1442 my ($map) = @_; 1415 my ($map) = @_;
… …
1472 1445
1473 cf::sync_job { $map->load }; 1446 cf::sync_job { $map->load };
1474} 1447}
1475 1448
1476our %MAP_PREFETCH; 1449our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1450our $MAP_PREFETCHER = undef;
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1486 $map->load;
1487 }
1488 Coro::schedule;
1489 }
1490};
1491 1451
1492sub find_async { 1452sub find_async {
1493 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1494 1454
1495 $path = new cf::path $path, $origin && $origin->path; 1455 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1456
1498 if (my $map = $cf::MAP{$key}) { 1457 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1459 }
1501 1460
1502 $MAP_PREFETCH{$key} = $path; 1461 undef $MAP_PREFETCH{$path};
1503 $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 };
1504 1474
1505 () 1475 ()
1506} 1476}
1507 1477
1508sub save { 1478sub save {
… …
1512 1482
1513 $self->{last_save} = $cf::RUNTIME; 1483 $self->{last_save} = $cf::RUNTIME;
1514 1484
1515 return unless $self->dirty; 1485 return unless $self->dirty;
1516 1486
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1487 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1488 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1489
1520 $self->{load_path} = $save; 1490 $self->{load_path} = $save;
1521 1491
1522 return if $self->{deny_save}; 1492 return if $self->{deny_save};
1523 1493
… …
1526 cf::async { 1496 cf::async {
1527 $_->contr->save for $self->players; 1497 $_->contr->save for $self->players;
1528 }; 1498 };
1529 1499
1530 if ($uniq) { 1500 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1502 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1503 } else {
1534 $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);
1535 } 1505 }
1536} 1506}
1537 1507
1538sub swap_out { 1508sub swap_out {
1539 my ($self) = @_; 1509 my ($self) = @_;
… …
1553 1523
1554sub reset_at { 1524sub reset_at {
1555 my ($self) = @_; 1525 my ($self) = @_;
1556 1526
1557 # TODO: safety, remove and allow resettable per-player maps 1527 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1528 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1529 return 1e99 if $self->{deny_reset};
1560 1530
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1531 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 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;
1563 1533
… …
1568 my ($self) = @_; 1538 my ($self) = @_;
1569 1539
1570 $self->reset_at <= $cf::RUNTIME 1540 $self->reset_at <= $cf::RUNTIME
1571} 1541}
1572 1542
1573sub rename {
1574 my ($self, $new_path) = @_;
1575
1576 $self->{path}->unlink_save;
1577
1578 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path;
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self;
1582
1583 $self->save;
1584}
1585
1586sub reset { 1543sub reset {
1587 my ($self) = @_; 1544 my ($self) = @_;
1588 1545
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1546 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1547
1591 return if $self->players; 1548 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1549 return if $self->isa ("ext::map_per_player");#d#
1593 1550
1594 warn "resetting map ", $self->path;#d# 1551 warn "resetting map ", $self->path;#d#
1595 1552
1596 delete $cf::MAP{$self->path}; 1553 delete $cf::MAP{$self->path};
1597 1554
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear;
1557
1598 $_->clear_links_to ($self) for values %cf::MAP; 1558 $_->clear_links_to ($self) for values %cf::MAP;
1599 1559
1600 $self->{path}->unlink_save; 1560 $self->unlink_save;
1601 $self->destroy; 1561 $self->destroy;
1602} 1562}
1603 1563
1604my $nuke_counter = "aaaa"; 1564my $nuke_counter = "aaaa";
1605 1565
1606sub nuke { 1566sub nuke {
1607 my ($self) = @_; 1567 my ($self) = @_;
1608 1568
1569 delete $cf::MAP{$self->path};
1570
1571 $self->unlink_save;
1572
1573 bless $self, "cf::map";
1574 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1575 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1578
1579 $cf::MAP{$self->path} = $self;
1580
1612 $self->reset; # polite request, might not happen 1581 $self->reset; # polite request, might not happen
1613} 1582}
1614 1583
1615=item cf::map::unique_maps 1584=item cf::map::unique_maps
1616 1585
1617Returns an arrayref of cf::path's of all shared maps that have 1586Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1587instantiated unique items. May block.
1619 1588
1620=cut 1589=cut
1621 1590
1622sub unique_maps() { 1591sub unique_maps() {
… …
1628 for (@$files) { 1597 for (@$files) {
1629 utf8::decode $_; 1598 utf8::decode $_;
1630 next if /\.pst$/; 1599 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1600 next unless /^$PATH_SEP/o;
1632 1601
1602 s/\.map$//;
1633 push @paths, new cf::path $_; 1603 push @paths, $_;
1634 } 1604 }
1635 1605
1636 \@paths 1606 \@paths
1637} 1607}
1638 1608
… …
1713 1683
1714=item $player_object->enter_link 1684=item $player_object->enter_link
1715 1685
1716Freezes 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}>).
1717 1687
1718The 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
1719I<MUST> call C<leave_link> as soon as possible, though. 1689I<MUST> call C<leave_link> as soon as possible, though.
1720 1690
1691Will never block.
1692
1721=item $player_object->leave_link ($map, $x, $y) 1693=item $player_object->leave_link ($map, $x, $y)
1722 1694
1723Moves 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
1724map 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
1725location 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
1726to the emergency map position. 1698fails, to the emergency map position.
1727 1699
1728Might block. 1700Might block.
1729 1701
1730=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}
1731 1713
1732sub cf::object::player::enter_link { 1714sub cf::object::player::enter_link {
1733 my ($self) = @_; 1715 my ($self) = @_;
1734 1716
1735 $self->deactivate_recursive; 1717 $self->deactivate_recursive;
1736 1718
1737 return if $self->map == $LINK_MAP; 1719 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1720
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1722 if $self->map;
1741 1723
1742 $self->enter_map ($LINK_MAP, 20, 20); 1724 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1743} 1725}
1744 1726
1745sub cf::object::player::leave_link { 1727sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1728 my ($self, $map, $x, $y) = @_;
1747 1729
… …
1811=cut 1793=cut
1812 1794
1813sub cf::object::player::goto { 1795sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1796 my ($self, $path, $x, $y) = @_;
1815 1797
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1798 $self->enter_link;
1819 1799
1820 (async { 1800 (async {
1821 my $map = cf::map::find $path->as_string; 1801 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1802 $map = $map->customise_for ($self) if $map;
1823 1803
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1804# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1805# if $map;
1826 1806
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1807 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
… …
1836 1816
1837sub parse_random_map_params { 1817sub parse_random_map_params {
1838 my ($spec) = @_; 1818 my ($spec) = @_;
1839 1819
1840 my $rmp = { # defaults 1820 my $rmp = { # defaults
1841 xsize => 10, 1821 xsize => (cf::rndm 15, 40),
1842 ysize => 10, 1822 ysize => (cf::rndm 15, 40),
1823 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1824 #layout => string,
1843 }; 1825 };
1844 1826
1845 for (split /\n/, $spec) { 1827 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1828 my ($k, $v) = split /\s+/, $_, 2;
1847 1829
… …
1851 $rmp 1833 $rmp
1852} 1834}
1853 1835
1854sub prepare_random_map { 1836sub prepare_random_map {
1855 my ($exit) = @_; 1837 my ($exit) = @_;
1838
1839 my $guard = cf::lock_acquire "exit_prepare:$exit";
1856 1840
1857 # all this does is basically replace the /! path by 1841 # all this does is basically replace the /! path by
1858 # a new random map path (?random/...) with a seed 1842 # a new random map path (?random/...) with a seed
1859 # that depends on the exit object 1843 # that depends on the exit object
1860 1844
… …
1869 1853
1870 $rmp->{random_seed} ||= $exit->random_seed; 1854 $rmp->{random_seed} ||= $exit->random_seed;
1871 1855
1872 my $data = cf::to_json $rmp; 1856 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1857 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1859
1875 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) {
1876 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;
1877 1864
1878 $exit->slaying ("?random/$md5"); 1865 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1866 $exit->msg (undef);
1880 } 1867 }
1881} 1868}
… …
1891 $self->deactivate_recursive; # just to be sure 1878 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1879 unless (eval {
1893 prepare_random_map $exit 1880 prepare_random_map $exit
1894 if $exit->slaying eq "/!"; 1881 if $exit->slaying eq "/!";
1895 1882
1896 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;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1885
1899 1; 1886 1;
1900 }) { 1887 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1888 $self->message ("Something went wrong deep within the crossfire server. "
… …
2191 sub db_sync() { 2178 sub db_sync() {
2192 db_save if $dirty; 2179 db_save if $dirty;
2193 undef $dirty; 2180 undef $dirty;
2194 } 2181 }
2195 2182
2196 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 {
2197 db_sync; 2184 db_sync;
2198 }); 2185 });
2199 2186
2200 sub db_dirty() { 2187 sub db_dirty() {
2201 $dirty = 1; 2188 $dirty = 1;
… …
2251 2238
2252sub main { 2239sub main {
2253 # we must not ever block the main coroutine 2240 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2241 local $Coro::idle = sub {
2255 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 {
2256 async { Event::one_event }; 2244 Event::one_event;
2245 })->prio (Coro::PRIO_MAX);
2257 }; 2246 };
2258 2247
2259 cfg_load; 2248 cfg_load;
2260 db_load; 2249 db_load;
2261 load_extensions; 2250 load_extensions;
2251
2252 $TICK_WATCHER->start;
2262 Event::loop; 2253 Event::loop;
2263} 2254}
2264 2255
2265############################################################################# 2256#############################################################################
2266# initialisation and cleanup 2257# initialisation and cleanup
… …
2284 warn "enter emergency perl save\n"; 2275 warn "enter emergency perl save\n";
2285 2276
2286 cf::sync_job { 2277 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2278 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2279 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2280 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2281 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2282 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2283 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2284 $pl->valid or next;
2294 $pl->save; 2285 $pl->save;
… …
2308} 2299}
2309 2300
2310sub reload() { 2301sub reload() {
2311 # can/must only be called in main 2302 # can/must only be called in main
2312 if ($Coro::current != $Coro::main) { 2303 if ($Coro::current != $Coro::main) {
2313 warn "can only reload from main coroutine\n"; 2304 warn "can only reload from main coroutine";
2314 return; 2305 return;
2315 } 2306 }
2316 2307
2317 warn "reloading..."; 2308 warn "reloading...";
2318 2309
2319 warn "freezing server"; 2310 warn "cancelling server ticker";
2320 my $guard = freeze_mainloop; 2311 $TICK_WATCHER->cancel;
2312
2321 cf::emergency_save; 2313 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326 2314
2327 eval { 2315 eval {
2328 # 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
2329 2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320
2330 warn "cancel all watchers"; 2321 warn "cancelling all WF_AUTOCANCEL watchers";
2331 for (Event::all_watchers) { 2322 for (Event::all_watchers) {
2332 $_->cancel if $_->data & WF_AUTOCANCEL; 2323 $_->cancel if $_->data & WF_AUTOCANCEL;
2333 } 2324 }
2334 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
2335 warn "cancel all extension coros"; 2334 warn "cancelling all extension coros";
2336 $_->cancel for values %EXT_CORO; 2335 $_->cancel for values %EXT_CORO;
2337 %EXT_CORO = (); 2336 %EXT_CORO = ();
2338 2337
2339 warn "remove commands"; 2338 warn "removing commands";
2340 %COMMAND = (); 2339 %COMMAND = ();
2341 2340
2342 warn "remove ext commands"; 2341 warn "removing ext commands";
2343 %EXTCMD = (); 2342 %EXTCMD = ();
2344 2343
2345 warn "unload/nuke all extensions"; 2344 warn "unloading/nuking all extensions";
2346 for my $pkg (@EXTS) { 2345 for my $pkg (@EXTS) {
2347 warn "... unloading $pkg"; 2346 warn "... unloading $pkg";
2348 2347
2349 if (my $cb = $pkg->can ("unload")) { 2348 if (my $cb = $pkg->can ("unload")) {
2350 eval { 2349 eval {
… …
2355 2354
2356 warn "... nuking $pkg"; 2355 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg; 2356 Symbol::delete_package $pkg;
2358 } 2357 }
2359 2358
2360 warn "unload all perl modules loaded from $LIBDIR"; 2359 warn "unloading all perl modules loaded from $LIBDIR";
2361 while (my ($k, $v) = each %INC) { 2360 while (my ($k, $v) = each %INC) {
2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2363 2362
2364 warn "removing <$k>"; 2363 warn "... unloading $k";
2365 delete $INC{$k}; 2364 delete $INC{$k};
2366 2365
2367 $k =~ s/\.pm$//; 2366 $k =~ s/\.pm$//;
2368 $k =~ s/\//::/g; 2367 $k =~ s/\//::/g;
2369 2368
… …
2372 } 2371 }
2373 2372
2374 Symbol::delete_package $k; 2373 Symbol::delete_package $k;
2375 } 2374 }
2376 2375
2377 warn "get rid of safe::, as good as possible"; 2376 warn "getting rid of safe::, as good as possible";
2378 Symbol::delete_package "safe::$_" 2377 Symbol::delete_package "safe::$_"
2379 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);
2380 2379
2381 warn "unload cf.pm \"a bit\""; 2380 warn "unloading cf.pm \"a bit\"";
2382 delete $INC{"cf.pm"}; 2381 delete $INC{"cf.pm"};
2383 2382
2384 # don't, removes xs symbols, too, 2383 # don't, removes xs symbols, too,
2385 # and global variables created in xs 2384 # and global variables created in xs
2386 #Symbol::delete_package __PACKAGE__; 2385 #Symbol::delete_package __PACKAGE__;
2387 2386
2387 warn "unload completed, starting to reload now";
2388
2388 warn "reloading cf.pm"; 2389 warn "reloading cf.pm";
2389 require cf; 2390 require cf;
2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2391 2392
2392 warn "load config and database again"; 2393 warn "loading config and database again";
2393 cf::cfg_load; 2394 cf::cfg_load;
2394 cf::db_load; 2395 cf::db_load;
2395 2396
2396 warn "load extensions"; 2397 warn "loading extensions";
2397 cf::load_extensions; 2398 cf::load_extensions;
2398 2399
2399 warn "reattach attachments to objects/players"; 2400 warn "reattaching attachments to objects/players";
2400 _global_reattach; 2401 _global_reattach;
2401 warn "reattach attachments to maps"; 2402 warn "reattaching attachments to maps";
2402 reattach $_ for values %MAP; 2403 reattach $_ for values %MAP;
2404
2405 warn "restarting server ticker";
2406
2407 $TICK_WATCHER->start;
2403 }; 2408 };
2404 2409
2405 if ($@) { 2410 if ($@) {
2406 warn $@; 2411 warn $@;
2407 warn "error while reloading, exiting."; 2412 warn "error while reloading, exiting.";
… …
2409 } 2414 }
2410 2415
2411 warn "reloaded"; 2416 warn "reloaded";
2412}; 2417};
2413 2418
2414############################################################################# 2419our $RELOAD_WATCHER; # used only during reload
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2420
2457register_command "reload" => sub { 2421register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2422 my ($who, $arg) = @_;
2459 2423
2460 if ($who->flag (FLAG_WIZ)) { 2424 if ($who->flag (FLAG_WIZ)) {
2461 $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 {
2462 reload; 2431 reload;
2463 $who->message ("end of reload."); 2432 undef $RELOAD_WATCHER;
2433 });
2464 } 2434 }
2465}; 2435};
2466 2436
2467unshift @INC, $LIBDIR; 2437unshift @INC, $LIBDIR;
2438
2439my $bug_warning = 0;
2468 2440
2469$TICK_WATCHER = Event->timer ( 2441$TICK_WATCHER = Event->timer (
2470 reentrant => 0, 2442 reentrant => 0,
2443 parked => 1,
2471 prio => 0, 2444 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2445 at => $NEXT_TICK || $TICK,
2473 data => WF_AUTOCANCEL, 2446 data => WF_AUTOCANCEL,
2474 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
2475 $NOW = Event::time; 2454 $NOW = Event::time;
2476 2455
2477 cf::server_tick; # one server iteration 2456 cf::server_tick; # one server iteration
2478 $RUNTIME += $TICK; 2457 $RUNTIME += $TICK;
2479 $NEXT_TICK += $TICK; 2458 $NEXT_TICK += $TICK;
… …
2489 }, 2468 },
2490); 2469);
2491 2470
2492IO::AIO::max_poll_time $TICK * 0.2; 2471IO::AIO::max_poll_time $TICK * 0.2;
2493 2472
2494Event->io ( 2473$AIO_POLL_WATCHER = Event->io (
2495 fd => IO::AIO::poll_fileno, 2474 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2475 poll => 'r',
2497 prio => 5, 2476 prio => 5,
2498 data => WF_AUTOCANCEL, 2477 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2478 cb => \&IO::AIO::poll_cb,
2500); 2479);
2501 2480
2502Event->timer ( 2481$WRITE_RUNTIME_WATCHER = Event->timer (
2503 data => WF_AUTOCANCEL, 2482 data => WF_AUTOCANCEL,
2504 after => 0, 2483 after => 1,
2505 interval => 10, 2484 interval => 10,
2506 cb => sub { 2485 prio => 6, # keep it lowest so it acts like a watchdog
2507 (Coro::unblock_sub { 2486 cb => Coro::unblock_sub {
2508 write_runtime 2487 write_runtime
2509 or warn "ERROR: unable to write runtime file: $!"; 2488 or warn "ERROR: unable to write runtime file: $!";
2510 })->();
2511 }, 2489 },
2512); 2490);
2513 2491
2514END { cf::emergency_save } 2492END { cf::emergency_save }
2515 2493

Diff Legend

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