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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.177 by root, Sun Jan 14 22:54:18 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
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 373
523############################################################################# 374#############################################################################
524 375
525=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
526 377
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 504our @CB_MAP = ();
654 505
655my %attachment; 506my %attachment;
656 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
657sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
659 516
660 use sort 'stable'; 517 use sort 'stable';
661 518
… …
832# object support 689# object support
833 690
834sub reattach { 691sub reattach {
835 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 696
838 my $registry = $obj->registry; 697 my $registry = $obj->registry;
839 698
840 @$registry = (); 699 @$registry = ();
841 700
… …
1028 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 890 . "\n};\n1";
1032 891
1033 eval $source 892 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1035 : "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 }
1036 902
1037 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1038} 904}
1039 905
1040sub load_extensions { 906sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1047 } 913 }
1048} 914}
1049 915
1050############################################################################# 916#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 917
1066=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1067 919
1068Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1069 921
… …
1205 \@logins 1057 \@logins
1206} 1058}
1207 1059
1208=item $player->maps 1060=item $player->maps
1209 1061
1210Returns 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
1211player. May block. 1063player. May block.
1212 1064
1213=cut 1065=cut
1214 1066
1215sub maps($) { 1067sub maps($) {
… …
1223 for (@$files) { 1075 for (@$files) {
1224 utf8::decode $_; 1076 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1227 1079
1080 s/\.map$//;
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1229 } 1082 }
1230 1083
1231 \@paths 1084 \@paths
1232} 1085}
1233 1086
… …
1259package cf::map; 1112package cf::map;
1260 1113
1261use Fcntl; 1114use Fcntl;
1262use Coro::AIO; 1115use Coro::AIO;
1263 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1264our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1266 1123
1267sub generate_random_map { 1124sub generate_random_map {
1268 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1269 1126
1270 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1128 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1140 )
1285} 1141}
1286 1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub thawer_merge {
1157 my ($self, $merge) = @_;
1158
1159 # we have to keep some variables in memory intact
1160 local $self->{path};
1161 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164
1165 $self->SUPER::thawer_merge ($merge);
1166}
1167
1168sub normalise {
1169 my ($path, $base) = @_;
1170
1171 # map plan:
1172 #
1173 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched
1175 # ?xxx/... are special absolute paths
1176 # ?random/... random maps
1177 # /... normal maps
1178 # ~user/... per-player map of a specific user
1179
1180 $path =~ s/$PATH_SEP/\//go;
1181
1182 # treat it as relative path if it starts with
1183 # something that looks reasonable
1184 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1185 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1186
1187 $base =~ s{[^/]+/?$}{};
1188 $path = "$base/$path";
1189 }
1190
1191 for ($path) {
1192 redo if s{//}{/};
1193 redo if s{/\.?/}{/};
1194 redo if s{/[^/]+/\.\./}{/};
1195 }
1196
1197 $path
1198}
1199
1200sub new_from_path {
1201 my (undef, $path, $base) = @_;
1202
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204
1205 $path = normalise $path, $base;
1206
1207 for my $pkg (keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) {
1209 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc.
1212 return $self;
1213 }
1214 }
1215
1216 Carp::carp "unable to resolve path '$path'.";
1217 ()
1218}
1219
1220sub init {
1221 my ($self) = @_;
1222
1223 $self
1224}
1225
1226sub as_string {
1227 my ($self) = @_;
1228
1229 "$self->{path}"
1230}
1231
1232# the displayed name, this is a one way mapping
1233sub visible_name {
1234 &as_string
1235}
1236
1237# the original (read-only) location
1238sub load_path {
1239 my ($self) = @_;
1240
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1242}
1243
1244# the temporary/swap location
1245sub save_path {
1246 my ($self) = @_;
1247
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1250}
1251
1252# the unique path, undef == no special unique path
1253sub uniq_path {
1254 my ($self) = @_;
1255
1256 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1257 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1258}
1259
1287# and all this just because we cannot iterate over 1260# and all this just because we cannot iterate over
1288# all maps in C++... 1261# all maps in C++...
1289sub change_all_map_light { 1262sub change_all_map_light {
1290 my ($change) = @_; 1263 my ($change) = @_;
1291 1264
1292 $_->change_map_light ($change) 1265 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1266 for grep $_->outdoor, values %cf::MAP;
1294} 1267}
1295 1268
1269sub unlink_save {
1270 my ($self) = @_;
1271
1272 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1275}
1276
1296sub load_map_header($) { 1277sub load_header_from($) {
1297 my ($path) = @_; 1278 my ($self, $path) = @_;
1298 1279
1299 utf8::encode $path; 1280 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1281 aio_open $path, O_RDONLY, 0
1301 or return; 1282 or return;
1302 1283
1303 my $map = cf::map::new 1284 $self->_load_header ($path)
1304 or return; 1285 or return;
1305 1286
1306 # for better error messages only, will be overwritten later 1287 $self->{load_path} = $path;
1307 $map->path ($path);
1308 1288
1309 $map->load_header ($path) 1289 1
1290}
1291
1292sub load_orig {
1293 my ($self) = @_;
1294
1295 $self->load_header_from ($self->load_path)
1296}
1297
1298sub load_temp {
1299 my ($self) = @_;
1300
1301 $self->load_header_from ($self->save_path)
1302}
1303
1304sub load_header {
1305 my ($self) = @_;
1306
1307 if ($self->load_temp) {
1308 $self->last_access ((delete $self->{last_access})
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else {
1314 $self->load_orig
1310 or return; 1315 or return;
1311 1316
1312 $map->{load_path} = $path; 1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 }
1313 1322
1314 $map 1323 1
1315} 1324}
1316 1325
1317sub find; 1326sub find;
1318sub find { 1327sub find {
1319 my ($path, $origin) = @_; 1328 my ($path, $origin) = @_;
1320 1329
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1330 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1331
1326 cf::lock_wait "map_find:$key"; 1332 cf::lock_wait "map_find:$path";
1327 1333
1328 $cf::MAP{$key} || do { 1334 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1335 my $guard = cf::lock_acquire "map_find:$path";
1330 1336 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1337 or return;
1345 1338
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1339 $map->{last_save} = $cf::RUNTIME;
1358 1340
1359 Coro::cede; 1341 $map->load_header
1342 or return;
1360 1343
1361 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1362 $map->reset; 1346 $map->reset;
1363 undef $guard; 1347 undef $guard;
1364 $map = find $path 1348 $map = find $path
1365 or return; 1349 or return;
1366 } 1350 }
1367 1351
1368 $cf::MAP{$key} = $map 1352 $cf::MAP{$path} = $map
1369 } 1353 }
1370} 1354}
1371 1355
1372sub load { 1356sub load {
1373 my ($self) = @_; 1357 my ($self) = @_;
1374 1358
1375 my $path = $self->{path}; 1359 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1360 my $guard = cf::lock_acquire "map_load:$path";
1377 1361
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1362 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1363
1380 $self->in_memory (cf::MAP_LOADING); 1364 $self->in_memory (cf::MAP_LOADING);
1381 1365
1382 $self->alloc; 1366 $self->alloc;
1383 $self->load_objects ($self->{load_path}, 1) 1367 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1368 or return;
1385 1369
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1371 if delete $self->{load_original};
1388 1372
1389 if (my $uniq = $path->uniq_path) { 1373 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1374 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1375 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1376 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1377 $self->_load_objects ($uniq, 0);
1394 } 1378 }
1395 } 1379 }
1396 1380
1397 Coro::cede; 1381 Coro::cede;
1398 1382
1399 # now do the right thing for maps 1383 # now do the right thing for maps
1400 $self->link_multipart_objects; 1384 $self->link_multipart_objects;
1401 1385
1402 if ($self->{path}->is_style_map) { 1386 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1387 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1388 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1389 $self->update_buttons;
1390 Coro::cede;
1409 $self->set_darkness_map; 1391 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1392 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1393 unless $self->difficulty;
1394 Coro::cede;
1412 $self->activate; 1395 $self->activate;
1413 } 1396 }
1414 1397
1415 Coro::cede;
1416
1417 $self->in_memory (cf::MAP_IN_MEMORY); 1398 $self->in_memory (cf::MAP_IN_MEMORY);
1399}
1400
1401sub customise_for {
1402 my ($self, $ob) = @_;
1403
1404 return find "~" . $ob->name . "/" . $self->{path}
1405 if $self->per_player;
1406
1407 $self
1418} 1408}
1419 1409
1420# find and load all maps in the 3x3 area around a map 1410# find and load all maps in the 3x3 area around a map
1421sub load_diag { 1411sub load_diag {
1422 my ($map) = @_; 1412 my ($map) = @_;
… …
1454} 1444}
1455 1445
1456our %MAP_PREFETCH; 1446our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1447our $MAP_PREFETCHER = Coro::async {
1458 while () { 1448 while () {
1459 while (%MAP_PREFETCH) { 1449 for my $path (keys %MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path 1450 my $map = find $path
1465 or next; 1451 or next;
1466 $map->load; 1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1467 } 1455 }
1468 Coro::schedule; 1456 Coro::schedule;
1469 } 1457 }
1470}; 1458};
1471 1459
1472sub find_async { 1460sub find_async {
1473 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1474 1462
1475 $path = new cf::path $path, $origin && $origin->path; 1463 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1464
1478 if (my $map = $cf::MAP{$key}) { 1465 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1467 }
1481 1468
1482 $MAP_PREFETCH{$key} = $path; 1469 $MAP_PREFETCH{$path} = 0;
1483 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER->ready;
1484 1471
1485 () 1472 ()
1486} 1473}
1487 1474
… …
1492 1479
1493 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1494 1481
1495 return unless $self->dirty; 1482 return unless $self->dirty;
1496 1483
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1486
1500 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1501 1488
1502 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1503 1490
… …
1506 cf::async { 1493 cf::async {
1507 $_->contr->save for $self->players; 1494 $_->contr->save for $self->players;
1508 }; 1495 };
1509 1496
1510 if ($uniq) { 1497 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1500 } else {
1514 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1515 } 1502 }
1516} 1503}
1517 1504
1518sub swap_out { 1505sub swap_out {
1519 my ($self) = @_; 1506 my ($self) = @_;
… …
1533 1520
1534sub reset_at { 1521sub reset_at {
1535 my ($self) = @_; 1522 my ($self) = @_;
1536 1523
1537 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1540 1527
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1543 1530
… …
1548 my ($self) = @_; 1535 my ($self) = @_;
1549 1536
1550 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1551} 1538}
1552 1539
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 1540sub reset {
1575 my ($self) = @_; 1541 my ($self) = @_;
1576 1542
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1544
1579 return if $self->players; 1545 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1546 return if $self->isa ("ext::map_per_player");#d#
1581 1547
1582 warn "resetting map ", $self->path;#d# 1548 warn "resetting map ", $self->path;#d#
1583 1549
1584 delete $cf::MAP{$self->path}; 1550 delete $cf::MAP{$self->path};
1551
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear;
1585 1554
1586 $_->clear_links_to ($self) for values %cf::MAP; 1555 $_->clear_links_to ($self) for values %cf::MAP;
1587 1556
1588 $self->unlink_save; 1557 $self->unlink_save;
1589 $self->destroy; 1558 $self->destroy;
… …
1592my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1593 1562
1594sub nuke { 1563sub nuke {
1595 my ($self) = @_; 1564 my ($self) = @_;
1596 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1600 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1601} 1579}
1602 1580
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 1581=item cf::map::unique_maps
1614 1582
1615Returns an arrayref of cf::path's of all shared maps that have 1583Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1584instantiated unique items. May block.
1617 1585
1618=cut 1586=cut
1619 1587
1620sub unique_maps() { 1588sub unique_maps() {
… …
1626 for (@$files) { 1594 for (@$files) {
1627 utf8::decode $_; 1595 utf8::decode $_;
1628 next if /\.pst$/; 1596 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1597 next unless /^$PATH_SEP/o;
1630 1598
1599 s/\.map$//;
1631 push @paths, new cf::path $_; 1600 push @paths, $_;
1632 } 1601 }
1633 1602
1634 \@paths 1603 \@paths
1635} 1604}
1636 1605
… …
1711 1680
1712=item $player_object->enter_link 1681=item $player_object->enter_link
1713 1682
1714Freezes the player and moves him/her to a special map (C<{link}>). 1683Freezes the player and moves him/her to a special map (C<{link}>).
1715 1684
1716The player should be reaosnably safe there for short amounts of time. You 1685The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1718 1687
1688Will never block.
1689
1719=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1720 1691
1721Moves the player out of the specila link map onto the given map. If the 1692Moves 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 1693map. 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, 1694to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1695fails, to the emergency map position.
1725 1696
1726Might block. 1697Might block.
1727 1698
1728=cut 1699=cut
1700
1701sub link_map {
1702 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1705 $LINK_MAP->load;
1706 }
1707
1708 $LINK_MAP
1709}
1729 1710
1730sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1731 my ($self) = @_; 1712 my ($self) = @_;
1732 1713
1733 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1734 1715
1735 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1717
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1719 if $self->map;
1739 1720
1740 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1722}
1742 1723
1743sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1745 1726
… …
1809=cut 1790=cut
1810 1791
1811sub cf::object::player::goto { 1792sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1813 1794
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1795 $self->enter_link;
1817 1796
1818 (async { 1797 (async {
1819 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1821 1800
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1802# if $map;
1824 1803
… …
1867 1846
1868 $rmp->{random_seed} ||= $exit->random_seed; 1847 $rmp->{random_seed} ||= $exit->random_seed;
1869 1848
1870 my $data = cf::to_json $rmp; 1849 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1850 my $md5 = Digest::MD5::md5_hex $data;
1851 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1852
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1853 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1854 aio_write $fh, 0, (length $data), $data, 0;
1855 undef $fh;
1856 aio_rename "$meta~", $meta;
1875 1857
1876 $exit->slaying ("?random/$md5"); 1858 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1859 $exit->msg (undef);
1878 } 1860 }
1879} 1861}
… …
1889 $self->deactivate_recursive; # just to be sure 1871 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1872 unless (eval {
1891 prepare_random_map $exit 1873 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1874 if $exit->slaying eq "/!";
1893 1875
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1876 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1877 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1878
1897 1; 1879 1;
1898 }) { 1880 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1881 $self->message ("Something went wrong deep within the crossfire server. "
… …
2249 2231
2250sub main { 2232sub main {
2251 # we must not ever block the main coroutine 2233 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2234 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2236 (async {
2254 async { Event::one_event }; 2237 Event::one_event;
2238 })->prio (Coro::PRIO_MAX);
2255 }; 2239 };
2256 2240
2257 cfg_load; 2241 cfg_load;
2258 db_load; 2242 db_load;
2259 load_extensions; 2243 load_extensions;
… …
2282 warn "enter emergency perl save\n"; 2266 warn "enter emergency perl save\n";
2283 2267
2284 cf::sync_job { 2268 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2269 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2270 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2271 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2272 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2273 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2274 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2275 $pl->valid or next;
2292 $pl->save; 2276 $pl->save;
… …
2407 } 2391 }
2408 2392
2409 warn "reloaded"; 2393 warn "reloaded";
2410}; 2394};
2411 2395
2412############################################################################# 2396our $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 2397
2455register_command "reload" => sub { 2398register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2399 my ($who, $arg) = @_;
2457 2400
2458 if ($who->flag (FLAG_WIZ)) { 2401 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2402 $who->message ("reloading server.");
2403
2404 # doing reload synchronously and two reloads happen back-to-back,
2405 # coro crashes during coro_state_free->destroy here.
2406
2407 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2460 reload; 2408 reload;
2461 $who->message ("end of reload."); 2409 undef $RELOAD_WATCHER;
2410 });
2462 } 2411 }
2463}; 2412};
2464 2413
2465unshift @INC, $LIBDIR; 2414unshift @INC, $LIBDIR;
2466 2415
… …
2487 }, 2436 },
2488); 2437);
2489 2438
2490IO::AIO::max_poll_time $TICK * 0.2; 2439IO::AIO::max_poll_time $TICK * 0.2;
2491 2440
2492Event->io ( 2441$AIO_POLL_WATCHER = Event->io (
2493 fd => IO::AIO::poll_fileno, 2442 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2443 poll => 'r',
2495 prio => 5, 2444 prio => 5,
2496 data => WF_AUTOCANCEL, 2445 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2446 cb => \&IO::AIO::poll_cb,
2498); 2447);
2499 2448
2500Event->timer ( 2449$WRITE_RUNTIME_WATCHER = Event->timer (
2501 data => WF_AUTOCANCEL, 2450 data => WF_AUTOCANCEL,
2502 after => 0, 2451 after => 0,
2503 interval => 10, 2452 interval => 10,
2504 cb => sub { 2453 cb => sub {
2505 (Coro::unblock_sub { 2454 (Coro::unblock_sub {

Diff Legend

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