ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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