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.162 by root, Thu Jan 11 00:41:08 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 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 373
523############################################################################# 374#############################################################################
524 375
525=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
526 377
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 504our @CB_MAP = ();
654 505
655my %attachment; 506my %attachment;
656 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
657sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
659 516
660 use sort 'stable'; 517 use sort 'stable';
661 518
… …
832# object support 689# object support
833 690
834sub reattach { 691sub reattach {
835 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 696
838 my $registry = $obj->registry; 697 my $registry = $obj->registry;
839 698
840 @$registry = (); 699 @$registry = ();
841 700
… …
1028 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 890 . "\n};\n1";
1032 891
1033 eval $source 892 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1035 : "extension disabled.\n"; 894 : "extension disabled.\n";
895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
896 warn $@;
897 warn "mandatory extension failed to load, exiting.\n";
898 exit 1;
899 }
900 die $@;
901 }
1036 902
1037 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1038} 904}
1039 905
1040sub load_extensions { 906sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1047 } 913 }
1048} 914}
1049 915
1050############################################################################# 916#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 917
1066=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1067 919
1068Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1069 921
… …
1205 \@logins 1057 \@logins
1206} 1058}
1207 1059
1208=item $player->maps 1060=item $player->maps
1209 1061
1210Returns an arrayref of cf::path's of all maps that are private for this 1062Returns an arrayref of map paths that are private for this
1211player. May block. 1063player. May block.
1212 1064
1213=cut 1065=cut
1214 1066
1215sub maps($) { 1067sub maps($) {
… …
1223 for (@$files) { 1075 for (@$files) {
1224 utf8::decode $_; 1076 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1227 1079
1080 s/\.map$//;
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1229 } 1082 }
1230 1083
1231 \@paths 1084 \@paths
1232} 1085}
1233 1086
… …
1259package cf::map; 1112package cf::map;
1260 1113
1261use Fcntl; 1114use Fcntl;
1262use Coro::AIO; 1115use Coro::AIO;
1263 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1264our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1266 1123
1267sub generate_random_map { 1124sub generate_random_map {
1268 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1269
1270 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1127 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1139 )
1285} 1140}
1286 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
1287# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1288# all maps in C++... 1260# all maps in C++...
1289sub change_all_map_light { 1261sub change_all_map_light {
1290 my ($change) = @_; 1262 my ($change) = @_;
1291 1263
1292 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1294} 1266}
1295 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
1296sub load_map_header($) { 1276sub load_header_from($) {
1297 my ($path) = @_; 1277 my ($self, $path) = @_;
1298 1278
1299 utf8::encode $path; 1279 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1301 or return; 1281 or return;
1302 1282
1303 my $map = cf::map::new 1283 $self->_load_header ($path)
1304 or return; 1284 or return;
1305 1285
1306 # for better error messages only, will be overwritten later 1286 $self->{load_path} = $path;
1307 $map->path ($path);
1308 1287
1309 $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
1310 or return; 1314 or return;
1311 1315
1312 $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 }
1313 1321
1314 $map 1322 1
1315} 1323}
1316 1324
1317sub find; 1325sub find;
1318sub find { 1326sub find {
1319 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1320 1328
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1330
1326 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1327 1332
1328 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1330 1335 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1336 or return;
1345 1337
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1338 $map->{last_save} = $cf::RUNTIME;
1358 1339
1359 Coro::cede; 1340 $map->load_header
1341 or return;
1360 1342
1361 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1362 $map->reset; 1345 $map->reset;
1363 undef $guard; 1346 undef $guard;
1364 $map = find $path 1347 $map = find $path
1365 or return; 1348 or return;
1366 } 1349 }
1367 1350
1368 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1369 } 1352 }
1370} 1353}
1371 1354
1372sub load { 1355sub load {
1373 my ($self) = @_; 1356 my ($self) = @_;
1374 1357
1375 my $path = $self->{path}; 1358 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1377 1360
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1362
1380 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1381 1364
1382 $self->alloc; 1365 $self->alloc;
1383 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1367 or return;
1385 1368
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1388 1371
1389 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1373 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1375 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1394 } 1377 }
1395 } 1378 }
1396 1379
1397 Coro::cede; 1380 Coro::cede;
1398 1381
1399 # now do the right thing for maps 1382 # now do the right thing for maps
1400 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1401 1384
1402 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1386 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1409 $self->set_darkness_map; 1390 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1412 $self->activate; 1394 $self->activate;
1413 } 1395 }
1414 1396
1415 Coro::cede;
1416
1417 $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
1418} 1407}
1419 1408
1420# 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
1421sub load_diag { 1410sub load_diag {
1422 my ($map) = @_; 1411 my ($map) = @_;
… …
1454} 1443}
1455 1444
1456our %MAP_PREFETCH; 1445our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1446our $MAP_PREFETCHER = Coro::async {
1458 while () { 1447 while () {
1459 while (%MAP_PREFETCH) { 1448 for my $path (keys %MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path 1449 my $map = find $path
1465 or next; 1450 or next;
1466 $map->load; 1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1467 } 1454 }
1468 Coro::schedule; 1455 Coro::schedule;
1469 } 1456 }
1470}; 1457};
1471 1458
1472sub find_async { 1459sub find_async {
1473 my ($path, $origin) = @_; 1460 my ($path, $origin) = @_;
1474 1461
1475 $path = new cf::path $path, $origin && $origin->path; 1462 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1463
1478 if (my $map = $cf::MAP{$key}) { 1464 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1466 }
1481 1467
1482 $MAP_PREFETCH{$key} = $path; 1468 $MAP_PREFETCH{$path} = 0;
1483 $MAP_PREFETCHER->ready; 1469 $MAP_PREFETCHER->ready;
1484 1470
1485 () 1471 ()
1486} 1472}
1487 1473
… …
1492 1478
1493 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1494 1480
1495 return unless $self->dirty; 1481 return unless $self->dirty;
1496 1482
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1485
1500 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1501 1487
1502 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1503 1489
… …
1506 cf::async { 1492 cf::async {
1507 $_->contr->save for $self->players; 1493 $_->contr->save for $self->players;
1508 }; 1494 };
1509 1495
1510 if ($uniq) { 1496 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1499 } else {
1514 $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);
1515 } 1501 }
1516} 1502}
1517 1503
1518sub swap_out { 1504sub swap_out {
1519 my ($self) = @_; 1505 my ($self) = @_;
… …
1533 1519
1534sub reset_at { 1520sub reset_at {
1535 my ($self) = @_; 1521 my ($self) = @_;
1536 1522
1537 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1540 1526
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 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;
1543 1529
… …
1548 my ($self) = @_; 1534 my ($self) = @_;
1549 1535
1550 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1551} 1537}
1552 1538
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 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};
1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1585 1553
1586 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1587 1555
1588 $self->unlink_save; 1556 $self->unlink_save;
1589 $self->destroy; 1557 $self->destroy;
… …
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 => -1,
1840 ysize => 10, 1818 ysize => -1,
1841 }; 1819 };
1842 1820
1843 for (split /\n/, $spec) { 1821 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1822 my ($k, $v) = split /\s+/, $_, 2;
1845 1823
… …
1867 1845
1868 $rmp->{random_seed} ||= $exit->random_seed; 1846 $rmp->{random_seed} ||= $exit->random_seed;
1869 1847
1870 my $data = cf::to_json $rmp; 1848 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1849 my $md5 = Digest::MD5::md5_hex $data;
1850 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1851
1873 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) {
1874 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;
1875 1856
1876 $exit->slaying ("?random/$md5"); 1857 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1858 $exit->msg (undef);
1878 } 1859 }
1879} 1860}
… …
1889 $self->deactivate_recursive; # just to be sure 1870 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1871 unless (eval {
1891 prepare_random_map $exit 1872 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1873 if $exit->slaying eq "/!";
1893 1874
1894 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;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1876 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1877
1897 1; 1878 1;
1898 }) { 1879 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1880 $self->message ("Something went wrong deep within the crossfire server. "
… …
2249 2230
2250sub main { 2231sub main {
2251 # we must not ever block the main coroutine 2232 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2233 local $Coro::idle = sub {
2253 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 {
2254 async { Event::one_event }; 2236 Event::one_event;
2237 })->prio (Coro::PRIO_MAX);
2255 }; 2238 };
2256 2239
2257 cfg_load; 2240 cfg_load;
2258 db_load; 2241 db_load;
2259 load_extensions; 2242 load_extensions;
… …
2282 warn "enter emergency perl save\n"; 2265 warn "enter emergency perl save\n";
2283 2266
2284 cf::sync_job { 2267 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2268 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2269 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2270 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2271 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2272 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2273 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2274 $pl->valid or next;
2292 $pl->save; 2275 $pl->save;
… …
2407 } 2390 }
2408 2391
2409 warn "reloaded"; 2392 warn "reloaded";
2410}; 2393};
2411 2394
2412############################################################################# 2395our $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 2396
2455register_command "reload" => sub { 2397register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2398 my ($who, $arg) = @_;
2457 2399
2458 if ($who->flag (FLAG_WIZ)) { 2400 if ($who->flag (FLAG_WIZ)) {
2459 $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 {
2460 reload; 2407 reload;
2461 $who->message ("end of reload."); 2408 undef $RELOAD_WATCHER;
2409 });
2462 } 2410 }
2463}; 2411};
2464 2412
2465unshift @INC, $LIBDIR; 2413unshift @INC, $LIBDIR;
2466 2414
… …
2468 reentrant => 0, 2416 reentrant => 0,
2469 prio => 0, 2417 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2418 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2419 data => WF_AUTOCANCEL,
2472 cb => sub { 2420 cb => sub {
2421 $NOW = Event::time;
2422
2473 cf::server_tick; # one server iteration 2423 cf::server_tick; # one server iteration
2474 $RUNTIME += $TICK; 2424 $RUNTIME += $TICK;
2475 $NEXT_TICK += $TICK; 2425 $NEXT_TICK += $TICK;
2476 2426
2477 $WAIT_FOR_TICK->broadcast; 2427 $WAIT_FOR_TICK->broadcast;
… …
2485 }, 2435 },
2486); 2436);
2487 2437
2488IO::AIO::max_poll_time $TICK * 0.2; 2438IO::AIO::max_poll_time $TICK * 0.2;
2489 2439
2490Event->io ( 2440$AIO_POLL_WATCHER = Event->io (
2491 fd => IO::AIO::poll_fileno, 2441 fd => IO::AIO::poll_fileno,
2492 poll => 'r', 2442 poll => 'r',
2493 prio => 5, 2443 prio => 5,
2494 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2495 cb => \&IO::AIO::poll_cb, 2445 cb => \&IO::AIO::poll_cb,
2496); 2446);
2497 2447
2498Event->timer ( 2448$WRITE_RUNTIME_WATCHER = Event->timer (
2499 data => WF_AUTOCANCEL, 2449 data => WF_AUTOCANCEL,
2500 after => 0, 2450 after => 0,
2501 interval => 10, 2451 interval => 10,
2502 cb => sub { 2452 cb => sub {
2503 (Coro::unblock_sub { 2453 (Coro::unblock_sub {

Diff Legend

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