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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.165 by root, Fri Jan 12 22:09:22 2007 UTC vs.
Revision 1.178 by root, Thu Jan 18 00:06:55 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 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 373
543############################################################################# 374#############################################################################
544 375
545=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
546 377
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 504our @CB_MAP = ();
674 505
675my %attachment; 506my %attachment;
676 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
677sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
679 516
680 use sort 'stable'; 517 use sort 'stable';
681 518
… …
852# object support 689# object support
853 690
854sub reattach { 691sub reattach {
855 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 696
858 my $registry = $obj->registry; 697 my $registry = $obj->registry;
859 698
860 @$registry = (); 699 @$registry = ();
861 700
… …
1048 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 890 . "\n};\n1";
1052 891
1053 eval $source 892 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1055 : "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 }
1056 902
1057 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1058} 904}
1059 905
1060sub load_extensions { 906sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1067 } 913 }
1068} 914}
1069 915
1070############################################################################# 916#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 917
1086=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1087 919
1088Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1089 921
… …
1225 \@logins 1057 \@logins
1226} 1058}
1227 1059
1228=item $player->maps 1060=item $player->maps
1229 1061
1230Returns 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
1231player. May block. 1063player. May block.
1232 1064
1233=cut 1065=cut
1234 1066
1235sub maps($) { 1067sub maps($) {
… …
1243 for (@$files) { 1075 for (@$files) {
1244 utf8::decode $_; 1076 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1247 1079
1080 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1082 }
1250 1083
1251 \@paths 1084 \@paths
1252} 1085}
1253 1086
… …
1279package cf::map; 1112package cf::map;
1280 1113
1281use Fcntl; 1114use Fcntl;
1282use Coro::AIO; 1115use Coro::AIO;
1283 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1284our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1286 1123
1287sub generate_random_map { 1124sub generate_random_map {
1288 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1127 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1139 )
1305} 1140}
1306 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
1257}
1258
1307# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1308# all maps in C++... 1260# all maps in C++...
1309sub change_all_map_light { 1261sub change_all_map_light {
1310 my ($change) = @_; 1262 my ($change) = @_;
1311 1263
1312 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1314} 1266}
1315 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
1316sub load_map_header($) { 1276sub load_header_from($) {
1317 my ($path) = @_; 1277 my ($self, $path) = @_;
1318 1278
1319 utf8::encode $path; 1279 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1321 or return; 1281 or return;
1322 1282
1323 my $map = cf::map::new 1283 $self->_load_header ($path)
1324 or return; 1284 or return;
1325 1285
1326 # for better error messages only, will be overwritten later 1286 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1287
1329 $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
1330 or return; 1314 or return;
1331 1315
1332 $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 }
1333 1321
1334 $map 1322 1
1335} 1323}
1336 1324
1337sub find; 1325sub find;
1338sub find { 1326sub find {
1339 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1340 1328
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1330
1346 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1347 1332
1348 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1350 1335 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1336 or return;
1365 1337
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1338 $map->{last_save} = $cf::RUNTIME;
1378 1339
1379 Coro::cede; 1340 $map->load_header
1341 or return;
1380 1342
1381 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1382 $map->reset; 1345 $map->reset;
1383 undef $guard; 1346 undef $guard;
1384 $map = find $path 1347 $map = find $path
1385 or return; 1348 or return;
1386 } 1349 }
1387 1350
1388 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1389 } 1352 }
1390} 1353}
1391 1354
1392sub load { 1355sub load {
1393 my ($self) = @_; 1356 my ($self) = @_;
1394 1357
1395 my $path = $self->{path}; 1358 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1397 1360
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1362
1400 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1401 1364
1402 $self->alloc; 1365 $self->alloc;
1403 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1367 or return;
1405 1368
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1408 1371
1409 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1373 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1375 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1414 } 1377 }
1415 } 1378 }
1416 1379
1417 Coro::cede; 1380 Coro::cede;
1418 1381
1419 # now do the right thing for maps 1382 # now do the right thing for maps
1420 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1421 1384
1422 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1386 $self->decay_objects;
1427 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1428 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1429 $self->set_darkness_map; 1390 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1432 $self->activate; 1394 $self->activate;
1433 } 1395 }
1434 1396
1435 Coro::cede;
1436
1437 $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
1438} 1407}
1439 1408
1440# 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
1441sub load_diag { 1410sub load_diag {
1442 my ($map) = @_; 1411 my ($map) = @_;
… …
1474} 1443}
1475 1444
1476our %MAP_PREFETCH; 1445our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1446our $MAP_PREFETCHER = Coro::async {
1478 while () { 1447 while () {
1479 while (%MAP_PREFETCH) { 1448 for my $path (keys %MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path 1449 my $map = find $path
1485 or next; 1450 or next;
1486 $map->load; 1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1487 } 1454 }
1488 Coro::schedule; 1455 Coro::schedule;
1489 } 1456 }
1490}; 1457};
1491 1458
1492sub find_async { 1459sub find_async {
1493 my ($path, $origin) = @_; 1460 my ($path, $origin) = @_;
1494 1461
1495 $path = new cf::path $path, $origin && $origin->path; 1462 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1463
1498 if (my $map = $cf::MAP{$key}) { 1464 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1466 }
1501 1467
1502 $MAP_PREFETCH{$key} = $path; 1468 $MAP_PREFETCH{$path} = 0;
1503 $MAP_PREFETCHER->ready; 1469 $MAP_PREFETCHER->ready;
1504 1470
1505 () 1471 ()
1506} 1472}
1507 1473
… …
1512 1478
1513 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1514 1480
1515 return unless $self->dirty; 1481 return unless $self->dirty;
1516 1482
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1485
1520 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1521 1487
1522 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1523 1489
… …
1526 cf::async { 1492 cf::async {
1527 $_->contr->save for $self->players; 1493 $_->contr->save for $self->players;
1528 }; 1494 };
1529 1495
1530 if ($uniq) { 1496 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1499 } else {
1534 $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);
1535 } 1501 }
1536} 1502}
1537 1503
1538sub swap_out { 1504sub swap_out {
1539 my ($self) = @_; 1505 my ($self) = @_;
… …
1553 1519
1554sub reset_at { 1520sub reset_at {
1555 my ($self) = @_; 1521 my ($self) = @_;
1556 1522
1557 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1560 1526
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 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;
1563 1529
… …
1568 my ($self) = @_; 1534 my ($self) = @_;
1569 1535
1570 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1571} 1537}
1572 1538
1573sub rename {
1574 my ($self, $new_path) = @_;
1575
1576 $self->{path}->unlink_save;
1577
1578 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path;
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self;
1582
1583 $self->save;
1584}
1585
1586sub reset { 1539sub reset {
1587 my ($self) = @_; 1540 my ($self) = @_;
1588 1541
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1543
1591 return if $self->players; 1544 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1545 return if $self->isa ("ext::map_per_player");#d#
1593 1546
1594 warn "resetting map ", $self->path;#d# 1547 warn "resetting map ", $self->path;#d#
1595 1548
1596 delete $cf::MAP{$self->path}; 1549 delete $cf::MAP{$self->path};
1597 1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1553
1598 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1599 1555
1600 $self->{path}->unlink_save; 1556 $self->unlink_save;
1601 $self->destroy; 1557 $self->destroy;
1602} 1558}
1603 1559
1604my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1605 1561
1606sub nuke { 1562sub nuke {
1607 my ($self) = @_; 1563 my ($self) = @_;
1608 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1612 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1613} 1578}
1614 1579
1615=item cf::map::unique_maps 1580=item cf::map::unique_maps
1616 1581
1617Returns an arrayref of cf::path's of all shared maps that have 1582Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1583instantiated unique items. May block.
1619 1584
1620=cut 1585=cut
1621 1586
1622sub unique_maps() { 1587sub unique_maps() {
… …
1628 for (@$files) { 1593 for (@$files) {
1629 utf8::decode $_; 1594 utf8::decode $_;
1630 next if /\.pst$/; 1595 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1596 next unless /^$PATH_SEP/o;
1632 1597
1598 s/\.map$//;
1633 push @paths, new cf::path $_; 1599 push @paths, $_;
1634 } 1600 }
1635 1601
1636 \@paths 1602 \@paths
1637} 1603}
1638 1604
… …
1713 1679
1714=item $player_object->enter_link 1680=item $player_object->enter_link
1715 1681
1716Freezes 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}>).
1717 1683
1718The 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
1719I<MUST> call C<leave_link> as soon as possible, though. 1685I<MUST> call C<leave_link> as soon as possible, though.
1720 1686
1687Will never block.
1688
1721=item $player_object->leave_link ($map, $x, $y) 1689=item $player_object->leave_link ($map, $x, $y)
1722 1690
1723Moves 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
1724map 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
1725location 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
1726to the emergency map position. 1694fails, to the emergency map position.
1727 1695
1728Might block. 1696Might block.
1729 1697
1730=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}
1731 1709
1732sub cf::object::player::enter_link { 1710sub cf::object::player::enter_link {
1733 my ($self) = @_; 1711 my ($self) = @_;
1734 1712
1735 $self->deactivate_recursive; 1713 $self->deactivate_recursive;
1736 1714
1737 return if $self->map == $LINK_MAP; 1715 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1716
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1718 if $self->map;
1741 1719
1742 $self->enter_map ($LINK_MAP, 20, 20); 1720 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1743} 1721}
1744 1722
1745sub cf::object::player::leave_link { 1723sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1724 my ($self, $map, $x, $y) = @_;
1747 1725
… …
1811=cut 1789=cut
1812 1790
1813sub cf::object::player::goto { 1791sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1792 my ($self, $path, $x, $y) = @_;
1815 1793
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1794 $self->enter_link;
1819 1795
1820 (async { 1796 (async {
1821 my $map = cf::map::find $path->as_string; 1797 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1798 $map = $map->customise_for ($self) if $map;
1823 1799
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1800# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1801# if $map;
1826 1802
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
… …
1836 1812
1837sub parse_random_map_params { 1813sub parse_random_map_params {
1838 my ($spec) = @_; 1814 my ($spec) = @_;
1839 1815
1840 my $rmp = { # defaults 1816 my $rmp = { # defaults
1841 xsize => 10, 1817 xsize => -1,
1842 ysize => 10, 1818 ysize => -1,
1843 }; 1819 };
1844 1820
1845 for (split /\n/, $spec) { 1821 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1822 my ($k, $v) = split /\s+/, $_, 2;
1847 1823
… …
1869 1845
1870 $rmp->{random_seed} ||= $exit->random_seed; 1846 $rmp->{random_seed} ||= $exit->random_seed;
1871 1847
1872 my $data = cf::to_json $rmp; 1848 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1849 my $md5 = Digest::MD5::md5_hex $data;
1850 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1851
1875 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1852 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1876 aio_write $fh, 0, (length $data), $data, 0; 1853 aio_write $fh, 0, (length $data), $data, 0;
1854 undef $fh;
1855 aio_rename "$meta~", $meta;
1877 1856
1878 $exit->slaying ("?random/$md5"); 1857 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1858 $exit->msg (undef);
1880 } 1859 }
1881} 1860}
… …
1891 $self->deactivate_recursive; # just to be sure 1870 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1871 unless (eval {
1893 prepare_random_map $exit 1872 prepare_random_map $exit
1894 if $exit->slaying eq "/!"; 1873 if $exit->slaying eq "/!";
1895 1874
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1875 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1876 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1877
1899 1; 1878 1;
1900 }) { 1879 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1880 $self->message ("Something went wrong deep within the crossfire server. "
… …
2251 2230
2252sub main { 2231sub main {
2253 # we must not ever block the main coroutine 2232 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2233 local $Coro::idle = sub {
2255 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2234 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2235 (async {
2256 async { Event::one_event }; 2236 Event::one_event;
2237 })->prio (Coro::PRIO_MAX);
2257 }; 2238 };
2258 2239
2259 cfg_load; 2240 cfg_load;
2260 db_load; 2241 db_load;
2261 load_extensions; 2242 load_extensions;
… …
2284 warn "enter emergency perl save\n"; 2265 warn "enter emergency perl save\n";
2285 2266
2286 cf::sync_job { 2267 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2268 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2269 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2270 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2271 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2272 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2273 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2274 $pl->valid or next;
2294 $pl->save; 2275 $pl->save;
… …
2409 } 2390 }
2410 2391
2411 warn "reloaded"; 2392 warn "reloaded";
2412}; 2393};
2413 2394
2414############################################################################# 2395our $RELOAD_WATCHER; # used only during reload
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2396
2457register_command "reload" => sub { 2397register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2398 my ($who, $arg) = @_;
2459 2399
2460 if ($who->flag (FLAG_WIZ)) { 2400 if ($who->flag (FLAG_WIZ)) {
2461 $who->message ("start of reload."); 2401 $who->message ("reloading server.");
2402
2403 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here.
2405
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2462 reload; 2407 reload;
2463 $who->message ("end of reload."); 2408 undef $RELOAD_WATCHER;
2409 });
2464 } 2410 }
2465}; 2411};
2466 2412
2467unshift @INC, $LIBDIR; 2413unshift @INC, $LIBDIR;
2468 2414
… …
2489 }, 2435 },
2490); 2436);
2491 2437
2492IO::AIO::max_poll_time $TICK * 0.2; 2438IO::AIO::max_poll_time $TICK * 0.2;
2493 2439
2494Event->io ( 2440$AIO_POLL_WATCHER = Event->io (
2495 fd => IO::AIO::poll_fileno, 2441 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2442 poll => 'r',
2497 prio => 5, 2443 prio => 5,
2498 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2445 cb => \&IO::AIO::poll_cb,
2500); 2446);
2501 2447
2502Event->timer ( 2448$WRITE_RUNTIME_WATCHER = Event->timer (
2503 data => WF_AUTOCANCEL, 2449 data => WF_AUTOCANCEL,
2504 after => 0, 2450 after => 0,
2505 interval => 10, 2451 interval => 10,
2506 cb => sub { 2452 cb => sub {
2507 (Coro::unblock_sub { 2453 (Coro::unblock_sub {

Diff Legend

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