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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.164 by root, Thu Jan 11 01:24:25 2007 UTC vs.
Revision 1.176 by root, Sun Jan 14 22:14:35 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
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
527}
528
529package cf;
530 373
531############################################################################# 374#############################################################################
532 375
533=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
534 377
… …
660our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
661our @CB_MAP = (); 504our @CB_MAP = ();
662 505
663my %attachment; 506my %attachment;
664 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
665sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
666 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
667 516
668 use sort 'stable'; 517 use sort 'stable';
669 518
… …
840# object support 689# object support
841 690
842sub reattach { 691sub reattach {
843 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 696
846 my $registry = $obj->registry; 697 my $registry = $obj->registry;
847 698
848 @$registry = (); 699 @$registry = ();
849 700
… …
1036 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1037 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1038 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1039 . "\n};\n1"; 890 . "\n};\n1";
1040 891
1041 eval $source 892 unless (eval $source) {
1042 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1043 : "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 }
1044 902
1045 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1046} 904}
1047 905
1048sub load_extensions { 906sub load_extensions {
… …
1054 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1055 } 913 }
1056} 914}
1057 915
1058############################################################################# 916#############################################################################
1059# load/save/clean perl data associated with a map
1060
1061*cf::mapsupport::on_clean = sub {
1062 my ($map) = @_;
1063
1064 my $path = $map->tmpname;
1065 defined $path or return;
1066
1067 unlink "$path.pst";
1068};
1069
1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1071
1072#############################################################################
1073 917
1074=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1075 919
1076Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1077 921
… …
1213 \@logins 1057 \@logins
1214} 1058}
1215 1059
1216=item $player->maps 1060=item $player->maps
1217 1061
1218Returns 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
1219player. May block. 1063player. May block.
1220 1064
1221=cut 1065=cut
1222 1066
1223sub maps($) { 1067sub maps($) {
… …
1231 for (@$files) { 1075 for (@$files) {
1232 utf8::decode $_; 1076 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1235 1079
1080 s/\.map$//;
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1237 } 1082 }
1238 1083
1239 \@paths 1084 \@paths
1240} 1085}
1241 1086
… …
1267package cf::map; 1112package cf::map;
1268 1113
1269use Fcntl; 1114use Fcntl;
1270use Coro::AIO; 1115use Coro::AIO;
1271 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1272our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1273our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1274 1123
1275sub generate_random_map { 1124sub generate_random_map {
1276 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1277 1126
1278 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1128 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
… …
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1140 )
1293} 1141}
1294 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
1295# and all this just because we cannot iterate over 1260# and all this just because we cannot iterate over
1296# all maps in C++... 1261# all maps in C++...
1297sub change_all_map_light { 1262sub change_all_map_light {
1298 my ($change) = @_; 1263 my ($change) = @_;
1299 1264
1300 $_->change_map_light ($change) 1265 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1266 for grep $_->outdoor, values %cf::MAP;
1302} 1267}
1303 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
1304sub load_map_header($) { 1277sub load_header_from($) {
1305 my ($path) = @_; 1278 my ($self, $path) = @_;
1306 1279
1307 utf8::encode $path; 1280 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1281 aio_open $path, O_RDONLY, 0
1309 or return; 1282 or return;
1310 1283
1311 my $map = cf::map::new 1284 $self->_load_header ($path)
1312 or return; 1285 or return;
1313 1286
1314 # for better error messages only, will be overwritten later 1287 $self->{load_path} = $path;
1315 $map->path ($path);
1316 1288
1317 $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
1318 or return; 1315 or return;
1319 1316
1320 $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 }
1321 1322
1322 $map 1323 1
1323} 1324}
1324 1325
1325sub find; 1326sub find;
1326sub find { 1327sub find {
1327 my ($path, $origin) = @_; 1328 my ($path, $origin) = @_;
1328 1329
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1330 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1331
1334 cf::lock_wait "map_find:$key"; 1332 cf::lock_wait "map_find:$path";
1335 1333
1336 $cf::MAP{$key} || do { 1334 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1335 my $guard = cf::lock_acquire "map_find:$path";
1338 1336 my $map = new_from_path cf::map $path
1339 # do it the slow way
1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1343
1344 if ($map) {
1345 $map->last_access ((delete $map->{last_access})
1346 || $cf::RUNTIME); #d#
1347 # safety
1348 $map->{instantiate_time} = $cf::RUNTIME
1349 if $map->{instantiate_time} > $cf::RUNTIME;
1350 } else {
1351 $map = $path->load_orig
1352 or return; 1337 or return;
1353 1338
1354 $map->{load_original} = 1;
1355 $map->{instantiate_time} = $cf::RUNTIME;
1356 $map->last_access ($cf::RUNTIME);
1357 $map->instantiate;
1358
1359 # per-player maps become, after loading, normal maps
1360 $map->per_player (0) if $path->{user_rel};
1361 }
1362
1363 $map->path ($key);
1364 $map->{path} = $path;
1365 $map->{last_save} = $cf::RUNTIME; 1339 $map->{last_save} = $cf::RUNTIME;
1366 1340
1367 Coro::cede; 1341 $map->load_header
1342 or return;
1368 1343
1369 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1346 $map->reset;
1371 undef $guard; 1347 undef $guard;
1372 $map = find $path 1348 $map = find $path
1373 or return; 1349 or return;
1374 } 1350 }
1375 1351
1376 $cf::MAP{$key} = $map 1352 $cf::MAP{$path} = $map
1377 } 1353 }
1378} 1354}
1379 1355
1380sub load { 1356sub load {
1381 my ($self) = @_; 1357 my ($self) = @_;
1382 1358
1383 my $path = $self->{path}; 1359 my $path = $self->{path};
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1360 my $guard = cf::lock_acquire "map_load:$path";
1385 1361
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1362 return if $self->in_memory != cf::MAP_SWAPPED;
1387 1363
1388 $self->in_memory (cf::MAP_LOADING); 1364 $self->in_memory (cf::MAP_LOADING);
1389 1365
1390 $self->alloc; 1366 $self->alloc;
1391 $self->load_objects ($self->{load_path}, 1) 1367 $self->_load_objects ($self->{load_path}, 1)
1392 or return; 1368 or return;
1393 1369
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1371 if delete $self->{load_original};
1396 1372
1397 if (my $uniq = $path->uniq_path) { 1373 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1374 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1375 if (aio_open $uniq, O_RDONLY, 0) {
1400 $self->clear_unique_items; 1376 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1377 $self->_load_objects ($uniq, 0);
1402 } 1378 }
1403 } 1379 }
1404 1380
1405 Coro::cede; 1381 Coro::cede;
1406 1382
1407 # now do the right thing for maps 1383 # now do the right thing for maps
1408 $self->link_multipart_objects; 1384 $self->link_multipart_objects;
1409 1385
1410 if ($self->{path}->is_style_map) { 1386 unless ($self->{deny_activate}) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects; 1387 $self->decay_objects;
1415 $self->fix_auto_apply; 1388 $self->fix_auto_apply;
1416 $self->update_buttons; 1389 $self->update_buttons;
1390 Coro::cede;
1417 $self->set_darkness_map; 1391 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1392 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1393 unless $self->difficulty;
1394 Coro::cede;
1420 $self->activate; 1395 $self->activate;
1421 } 1396 }
1422 1397
1423 Coro::cede;
1424
1425 $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
1426} 1408}
1427 1409
1428# 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
1429sub load_diag { 1411sub load_diag {
1430 my ($map) = @_; 1412 my ($map) = @_;
… …
1462} 1444}
1463 1445
1464our %MAP_PREFETCH; 1446our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async { 1447our $MAP_PREFETCHER = Coro::async {
1466 while () { 1448 while () {
1467 while (%MAP_PREFETCH) { 1449 for my $path (keys %MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path 1450 my $map = find $path
1473 or next; 1451 or next;
1474 $map->load; 1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1475 } 1455 }
1476 Coro::schedule; 1456 Coro::schedule;
1477 } 1457 }
1478}; 1458};
1479 1459
1480sub find_async { 1460sub find_async {
1481 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1482 1462
1483 $path = new cf::path $path, $origin && $origin->path; 1463 $path = normalise $path, $origin && $origin->{path};
1484 my $key = $path->as_string;
1485 1464
1486 if (my $map = $cf::MAP{$key}) { 1465 if (my $map = $cf::MAP{$path}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 } 1467 }
1489 1468
1490 $MAP_PREFETCH{$key} = $path; 1469 $MAP_PREFETCH{$path} = 0;
1491 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER->ready;
1492 1471
1493 () 1472 ()
1494} 1473}
1495 1474
… …
1500 1479
1501 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1502 1481
1503 return unless $self->dirty; 1482 return unless $self->dirty;
1504 1483
1505 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 1486
1508 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1509 1488
1510 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1511 1490
… …
1514 cf::async { 1493 cf::async {
1515 $_->contr->save for $self->players; 1494 $_->contr->save for $self->players;
1516 }; 1495 };
1517 1496
1518 if ($uniq) { 1497 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 1500 } else {
1522 $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);
1523 } 1502 }
1524} 1503}
1525 1504
1526sub swap_out { 1505sub swap_out {
1527 my ($self) = @_; 1506 my ($self) = @_;
… …
1541 1520
1542sub reset_at { 1521sub reset_at {
1543 my ($self) = @_; 1522 my ($self) = @_;
1544 1523
1545 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1547 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1548 1527
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 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;
1551 1530
… …
1556 my ($self) = @_; 1535 my ($self) = @_;
1557 1536
1558 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1559} 1538}
1560 1539
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->{path}->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 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};
1585 1551
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear;
1554
1586 $_->clear_links_to ($self) for values %cf::MAP; 1555 $_->clear_links_to ($self) for values %cf::MAP;
1587 1556
1588 $self->{path}->unlink_save; 1557 $self->unlink_save;
1589 $self->destroy; 1558 $self->destroy;
1590} 1559}
1591 1560
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
… …
1889 $self->deactivate_recursive; # just to be sure 1868 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1869 unless (eval {
1891 prepare_random_map $exit 1870 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1871 if $exit->slaying eq "/!";
1893 1872
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1875
1897 1; 1876 1;
1898 }) { 1877 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1878 $self->message ("Something went wrong deep within the crossfire server. "
… …
2249 2228
2250sub main { 2229sub main {
2251 # we must not ever block the main coroutine 2230 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2231 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2233 (async {
2254 async { Event::one_event }; 2234 Event::one_event;
2235 })->prio (Coro::PRIO_MAX);
2255 }; 2236 };
2256 2237
2257 cfg_load; 2238 cfg_load;
2258 db_load; 2239 db_load;
2259 load_extensions; 2240 load_extensions;
… …
2282 warn "enter emergency perl save\n"; 2263 warn "enter emergency perl save\n";
2283 2264
2284 cf::sync_job { 2265 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2266 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2267 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2268 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2269 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2270 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2271 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2272 $pl->valid or next;
2292 $pl->save; 2273 $pl->save;
… …
2407 } 2388 }
2408 2389
2409 warn "reloaded"; 2390 warn "reloaded";
2410}; 2391};
2411 2392
2412############################################################################# 2393our $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 2394
2455register_command "reload" => sub { 2395register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2396 my ($who, $arg) = @_;
2457 2397
2458 if ($who->flag (FLAG_WIZ)) { 2398 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2399 $who->message ("reloading server.");
2400
2401 # doing reload synchronously and two reloads happen back-to-back,
2402 # coro crashes during coro_state_free->destroy here.
2403
2404 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2460 reload; 2405 reload;
2461 $who->message ("end of reload."); 2406 undef $RELOAD_WATCHER;
2407 });
2462 } 2408 }
2463}; 2409};
2464 2410
2465unshift @INC, $LIBDIR; 2411unshift @INC, $LIBDIR;
2466 2412
… …
2487 }, 2433 },
2488); 2434);
2489 2435
2490IO::AIO::max_poll_time $TICK * 0.2; 2436IO::AIO::max_poll_time $TICK * 0.2;
2491 2437
2492Event->io ( 2438$AIO_POLL_WATCHER = Event->io (
2493 fd => IO::AIO::poll_fileno, 2439 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2440 poll => 'r',
2495 prio => 5, 2441 prio => 5,
2496 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2443 cb => \&IO::AIO::poll_cb,
2498); 2444);
2499 2445
2500Event->timer ( 2446$WRITE_RUNTIME_WATCHER = Event->timer (
2501 data => WF_AUTOCANCEL, 2447 data => WF_AUTOCANCEL,
2502 after => 0, 2448 after => 0,
2503 interval => 10, 2449 interval => 10,
2504 cb => sub { 2450 cb => sub {
2505 (Coro::unblock_sub { 2451 (Coro::unblock_sub {

Diff Legend

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