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.181 by root, Fri Jan 19 15:29:52 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
… …
1113 957
1114sub exists($) { 958sub exists($) {
1115 my ($login) = @_; 959 my ($login) = @_;
1116 960
1117 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
1119} 963}
1120 964
1121sub find($) { 965sub find($) {
1122 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0]; 967 my $login = $_[0];
… …
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
1278 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1127 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
… …
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1139 )
1293} 1140}
1294 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
1295# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1296# all maps in C++... 1260# all maps in C++...
1297sub change_all_map_light { 1261sub change_all_map_light {
1298 my ($change) = @_; 1262 my ($change) = @_;
1299 1263
1300 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1302} 1266}
1303 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
1304sub load_map_header($) { 1276sub load_header_from($) {
1305 my ($path) = @_; 1277 my ($self, $path) = @_;
1306 1278
1307 utf8::encode $path; 1279 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1309 or return; 1281 or return;
1310 1282
1311 my $map = cf::map::new 1283 $self->_load_header ($path)
1312 or return; 1284 or return;
1313 1285
1314 # for better error messages only, will be overwritten later 1286 $self->{load_path} = $path;
1315 $map->path ($path);
1316 1287
1317 $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
1318 or return; 1314 or return;
1319 1315
1320 $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 }
1321 1321
1322 $map 1322 1
1323} 1323}
1324 1324
1325sub find; 1325sub find;
1326sub find { 1326sub find {
1327 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1328 1328
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1330
1334 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1335 1332
1336 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1338 1335 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; 1336 or return;
1353 1337
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; 1338 $map->{last_save} = $cf::RUNTIME;
1366 1339
1367 Coro::cede; 1340 $map->load_header
1341 or return;
1368 1342
1369 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1345 $map->reset;
1371 undef $guard; 1346 undef $guard;
1372 $map = find $path 1347 $map = find $path
1373 or return; 1348 or return;
1374 } 1349 }
1375 1350
1376 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1377 } 1352 }
1378} 1353}
1379 1354
1380sub load { 1355sub load {
1381 my ($self) = @_; 1356 my ($self) = @_;
1382 1357
1383 my $path = $self->{path}; 1358 my $path = $self->{path};
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1385 1360
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1387 1362
1388 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1389 1364
1390 $self->alloc; 1365 $self->alloc;
1391 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1392 or return; 1367 or return;
1393 1368
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1396 1371
1397 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1373 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1400 $self->clear_unique_items; 1375 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1402 } 1377 }
1403 } 1378 }
1404 1379
1405 Coro::cede; 1380 Coro::cede;
1406 1381
1407 # now do the right thing for maps 1382 # now do the right thing for maps
1408 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1409 1384
1410 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects; 1386 $self->decay_objects;
1415 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1416 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1417 $self->set_darkness_map; 1390 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1420 $self->activate; 1394 $self->activate;
1421 } 1395 }
1422 1396
1423 Coro::cede;
1424
1425 $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
1426} 1407}
1427 1408
1428# 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
1429sub load_diag { 1410sub load_diag {
1430 my ($map) = @_; 1411 my ($map) = @_;
… …
1462} 1443}
1463 1444
1464our %MAP_PREFETCH; 1445our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async { 1446our $MAP_PREFETCHER = Coro::async {
1466 while () { 1447 while () {
1467 while (%MAP_PREFETCH) { 1448 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 1449 my $map = find $path
1473 or next; 1450 or next;
1474 $map->load; 1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1475 } 1454 }
1476 Coro::schedule; 1455 Coro::schedule;
1477 } 1456 }
1478}; 1457};
1479 1458
1480sub find_async { 1459sub find_async {
1481 my ($path, $origin) = @_; 1460 my ($path, $origin) = @_;
1482 1461
1483 $path = new cf::path $path, $origin && $origin->path; 1462 $path = normalise $path, $origin && $origin->{path};
1484 my $key = $path->as_string;
1485 1463
1486 if (my $map = $cf::MAP{$key}) { 1464 if (my $map = $cf::MAP{$path}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 } 1466 }
1489 1467
1490 $MAP_PREFETCH{$key} = $path; 1468 $MAP_PREFETCH{$path} = 0;
1491 $MAP_PREFETCHER->ready; 1469 $MAP_PREFETCHER->ready;
1492 1470
1493 () 1471 ()
1494} 1472}
1495 1473
… …
1500 1478
1501 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1502 1480
1503 return unless $self->dirty; 1481 return unless $self->dirty;
1504 1482
1505 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 1485
1508 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1509 1487
1510 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1511 1489
… …
1514 cf::async { 1492 cf::async {
1515 $_->contr->save for $self->players; 1493 $_->contr->save for $self->players;
1516 }; 1494 };
1517 1495
1518 if ($uniq) { 1496 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 1499 } else {
1522 $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);
1523 } 1501 }
1524} 1502}
1525 1503
1526sub swap_out { 1504sub swap_out {
1527 my ($self) = @_; 1505 my ($self) = @_;
… …
1541 1519
1542sub reset_at { 1520sub reset_at {
1543 my ($self) = @_; 1521 my ($self) = @_;
1544 1522
1545 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1547 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1548 1526
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 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;
1551 1529
… …
1556 my ($self) = @_; 1534 my ($self) = @_;
1557 1535
1558 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1559} 1537}
1560 1538
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 { 1539sub reset {
1575 my ($self) = @_; 1540 my ($self) = @_;
1576 1541
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1543
1579 return if $self->players; 1544 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1545 return if $self->isa ("ext::map_per_player");#d#
1581 1546
1582 warn "resetting map ", $self->path;#d# 1547 warn "resetting map ", $self->path;#d#
1583 1548
1584 delete $cf::MAP{$self->path}; 1549 delete $cf::MAP{$self->path};
1585 1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1553
1586 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1587 1555
1588 $self->{path}->unlink_save; 1556 $self->unlink_save;
1589 $self->destroy; 1557 $self->destroy;
1590} 1558}
1591 1559
1592my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1593 1561
1594sub nuke { 1562sub nuke {
1595 my ($self) = @_; 1563 my ($self) = @_;
1596 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1600 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1601} 1578}
1602 1579
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 1580=item cf::map::unique_maps
1614 1581
1615Returns an arrayref of cf::path's of all shared maps that have 1582Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1583instantiated unique items. May block.
1617 1584
1618=cut 1585=cut
1619 1586
1620sub unique_maps() { 1587sub unique_maps() {
… …
1626 for (@$files) { 1593 for (@$files) {
1627 utf8::decode $_; 1594 utf8::decode $_;
1628 next if /\.pst$/; 1595 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1596 next unless /^$PATH_SEP/o;
1630 1597
1598 s/\.map$//;
1631 push @paths, new cf::path $_; 1599 push @paths, $_;
1632 } 1600 }
1633 1601
1634 \@paths 1602 \@paths
1635} 1603}
1636 1604
… …
1711 1679
1712=item $player_object->enter_link 1680=item $player_object->enter_link
1713 1681
1714Freezes 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}>).
1715 1683
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1685I<MUST> call C<leave_link> as soon as possible, though.
1718 1686
1687Will never block.
1688
1719=item $player_object->leave_link ($map, $x, $y) 1689=item $player_object->leave_link ($map, $x, $y)
1720 1690
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1694fails, to the emergency map position.
1725 1695
1726Might block. 1696Might block.
1727 1697
1728=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}
1729 1709
1730sub cf::object::player::enter_link { 1710sub cf::object::player::enter_link {
1731 my ($self) = @_; 1711 my ($self) = @_;
1732 1712
1733 $self->deactivate_recursive; 1713 $self->deactivate_recursive;
1734 1714
1735 return if $self->map == $LINK_MAP; 1715 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1716
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1718 if $self->map;
1739 1719
1740 $self->enter_map ($LINK_MAP, 20, 20); 1720 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1721}
1742 1722
1743sub cf::object::player::leave_link { 1723sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1724 my ($self, $map, $x, $y) = @_;
1745 1725
… …
1809=cut 1789=cut
1810 1790
1811sub cf::object::player::goto { 1791sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1792 my ($self, $path, $x, $y) = @_;
1813 1793
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1794 $self->enter_link;
1817 1795
1818 (async { 1796 (async {
1819 my $map = cf::map::find $path->as_string; 1797 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1798 $map = $map->customise_for ($self) if $map;
1821 1799
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1800# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1801# if $map;
1824 1802
… …
1834 1812
1835sub parse_random_map_params { 1813sub parse_random_map_params {
1836 my ($spec) = @_; 1814 my ($spec) = @_;
1837 1815
1838 my $rmp = { # defaults 1816 my $rmp = { # defaults
1839 xsize => 10, 1817 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1818 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string
1841 }; 1821 };
1842 1822
1843 for (split /\n/, $spec) { 1823 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1824 my ($k, $v) = split /\s+/, $_, 2;
1845 1825
… …
1849 $rmp 1829 $rmp
1850} 1830}
1851 1831
1852sub prepare_random_map { 1832sub prepare_random_map {
1853 my ($exit) = @_; 1833 my ($exit) = @_;
1834
1835 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1836
1855 # all this does is basically replace the /! path by 1837 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1838 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1839 # that depends on the exit object
1858 1840
… …
1867 1849
1868 $rmp->{random_seed} ||= $exit->random_seed; 1850 $rmp->{random_seed} ||= $exit->random_seed;
1869 1851
1870 my $data = cf::to_json $rmp; 1852 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1853 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1855
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1856 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1857 aio_write $fh, 0, (length $data), $data, 0;
1858 undef $fh;
1859 aio_rename "$meta~", $meta;
1875 1860
1876 $exit->slaying ("?random/$md5"); 1861 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1862 $exit->msg (undef);
1878 } 1863 }
1879} 1864}
… …
1889 $self->deactivate_recursive; # just to be sure 1874 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1875 unless (eval {
1891 prepare_random_map $exit 1876 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1877 if $exit->slaying eq "/!";
1893 1878
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1881
1897 1; 1882 1;
1898 }) { 1883 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1884 $self->message ("Something went wrong deep within the crossfire server. "
… …
2249 2234
2250sub main { 2235sub main {
2251 # we must not ever block the main coroutine 2236 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2237 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2238 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2239 (async {
2254 async { Event::one_event }; 2240 Event::one_event;
2241 })->prio (Coro::PRIO_MAX);
2255 }; 2242 };
2256 2243
2257 cfg_load; 2244 cfg_load;
2258 db_load; 2245 db_load;
2259 load_extensions; 2246 load_extensions;
… …
2282 warn "enter emergency perl save\n"; 2269 warn "enter emergency perl save\n";
2283 2270
2284 cf::sync_job { 2271 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2272 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2273 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2274 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2275 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2276 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2277 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2278 $pl->valid or next;
2292 $pl->save; 2279 $pl->save;
… …
2407 } 2394 }
2408 2395
2409 warn "reloaded"; 2396 warn "reloaded";
2410}; 2397};
2411 2398
2412############################################################################# 2399our $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 2400
2455register_command "reload" => sub { 2401register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2402 my ($who, $arg) = @_;
2457 2403
2458 if ($who->flag (FLAG_WIZ)) { 2404 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload."); 2405 $who->message ("reloading server.");
2406
2407 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here.
2409
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2460 reload; 2411 reload;
2461 $who->message ("end of reload."); 2412 undef $RELOAD_WATCHER;
2413 });
2462 } 2414 }
2463}; 2415};
2464 2416
2465unshift @INC, $LIBDIR; 2417unshift @INC, $LIBDIR;
2466 2418
… …
2487 }, 2439 },
2488); 2440);
2489 2441
2490IO::AIO::max_poll_time $TICK * 0.2; 2442IO::AIO::max_poll_time $TICK * 0.2;
2491 2443
2492Event->io ( 2444$AIO_POLL_WATCHER = Event->io (
2493 fd => IO::AIO::poll_fileno, 2445 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2446 poll => 'r',
2495 prio => 5, 2447 prio => 5,
2496 data => WF_AUTOCANCEL, 2448 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2449 cb => \&IO::AIO::poll_cb,
2498); 2450);
2499 2451
2500Event->timer ( 2452$WRITE_RUNTIME_WATCHER = Event->timer (
2501 data => WF_AUTOCANCEL, 2453 data => WF_AUTOCANCEL,
2502 after => 0, 2454 after => 0,
2503 interval => 10, 2455 interval => 10,
2504 cb => sub { 2456 cb => sub {
2505 (Coro::unblock_sub { 2457 (Coro::unblock_sub {

Diff Legend

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