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.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC

… …
33 33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
… …
50our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 55our $RUNTIME;
52 56
53our %PLAYER; # all users 57our %PLAYER; # all users
54our %MAP; # all maps 58our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions
58 61
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64
65# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61 67
62binmode STDOUT; 68binmode STDOUT;
63binmode STDERR; 69binmode STDERR;
64 70
65# read virtual server time, if available 71# read virtual server time, if available
… …
73mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
77 83
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 84our $EMERGENCY_POSITION;
81 85
82############################################################################# 86#############################################################################
83 87
84=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
… …
156} 160}
157 161
158$Event::DIED = sub { 162$Event::DIED = sub {
159 warn "error in event callback: @_"; 163 warn "error in event callback: @_";
160}; 164};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 165
166=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
167 167
168=over 4 168=over 4
169 169
… …
319 } 319 }
320} 320}
321 321
322=item $coro = cf::async_ext { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
323 323
324Like async, but this coro is automcatially being canceled when the 324Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 325extension calling this is being unloaded.
326 326
327=cut 327=cut
328 328
329sub async_ext(&) { 329sub async_ext(&) {
… …
338 338
339 $coro 339 $coro
340} 340}
341 341
342sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
343 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
344 346
345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
346 or return; 348 or return;
347 349
… …
362} 364}
363 365
364=back 366=back
365 367
366=cut 368=cut
367
368#############################################################################
369
370package cf::path;
371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378sub new {
379 my ($class, $path, $base) = @_;
380
381 $path = $path->as_string if ref $path;
382
383 my $self = bless { }, $class;
384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else {
401 if ($path =~ s{^~([^/]+)?}{}) {
402 $self->{user_rel} = 1;
403
404 if (defined $1) {
405 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1;
408 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 }
411 } elsif ($path =~ /^\//) {
412 # already absolute
413 } else {
414 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path");
416 }
417
418 for ($path) {
419 redo if s{/\.?/}{/};
420 redo if s{/[^/]+/\.\./}{/};
421 }
422 }
423
424 $self->{path} = $path;
425
426 $self
427}
428
429# the name / primary key / in-game path
430sub as_string {
431 my ($self) = @_;
432
433 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}"
435 : $self->{path}
436}
437
438# the displayed name, this is a one way mapping
439sub visible_name {
440 my ($self) = @_;
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448}
449
450# escape the /'s in the path
451sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453 $path
454}
455
456# the original (read-only) location
457sub load_path {
458 my ($self) = @_;
459
460 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461}
462
463# the temporary/swap location
464sub save_path {
465 my ($self) = @_;
466
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470}
471
472# the unique path, might be eq to save_path
473sub uniq_path {
474 my ($self) = @_;
475
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486}
487
488# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map {
490 $_[0]{path} =~ m{^/styles/}
491}
492
493package cf;
494 369
495############################################################################# 370#############################################################################
496 371
497=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
498 373
… …
945=cut 820=cut
946 821
947sub register_extcmd { 822sub register_extcmd {
948 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
949 824
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
954} 826}
955 827
956cf::player->attach ( 828cf::player->attach (
957 on_command => sub { 829 on_command => sub {
958 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
… …
971 843
972 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
973 845
974 if (ref $msg) { 846 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 850 }
979 } 851 }
980 } else { 852 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 855
984 cf::override; 856 cf::override;
985 }, 857 },
986); 858);
987 859
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 860sub load_extension {
995 my ($path) = @_; 861 my ($path) = @_;
996 862
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 864 my $base = $1;
999 my $pkg = $1; 865 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
1002 868
1003 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
1004 870
1005 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 872 or die "$path: $!";
1007 873
1008 my $source = 874 my $source =
1009 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 878 . "\n};\n1";
1013 879
1014 eval $source 880 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 882 : "extension disabled.\n";
1017 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 884 warn $@;
1019 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
1020 886 exit 1;
1021# no strict 'refs'; 887 }
1022# @{"$pkg\::ISA"} = ext::; 888 die $@;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# } 889 }
1037 890
1038 # remove commands 891 push @EXTS, $pkg;
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 892}
1063 893
1064sub load_extensions { 894sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 896 next unless -r $ext;
… …
1229 \@logins 1059 \@logins
1230} 1060}
1231 1061
1232=item $player->maps 1062=item $player->maps
1233 1063
1234Returns an arrayref of cf::path's of all maps that are private for this 1064Returns an arrayref of map paths that are private for this
1235player. May block. 1065player. May block.
1236 1066
1237=cut 1067=cut
1238 1068
1239sub maps($) { 1069sub maps($) {
… …
1247 for (@$files) { 1077 for (@$files) {
1248 utf8::decode $_; 1078 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1079 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1080 next unless /^$PATH_SEP/o;
1251 1081
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1082 push @paths, "~" . $pl->ob->name . "/" . $_;
1253 } 1083 }
1254 1084
1255 \@paths 1085 \@paths
1256} 1086}
1257 1087
… …
1283package cf::map; 1113package cf::map;
1284 1114
1285use Fcntl; 1115use Fcntl;
1286use Coro::AIO; 1116use Coro::AIO;
1287 1117
1118use overload
1119 '""' => \&as_string;
1120
1288our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1290 1123
1291sub generate_random_map { 1124sub generate_random_map {
1292 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1293 1126
1294 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1128 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1137 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region}) 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 )
1141}
1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub normalise {
1157 my ($path, $base) = @_;
1158
1159 # map plan:
1160 #
1161 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched
1163 # ?xxx/... are special absolute paths
1164 # ?random/... random maps
1165 # /... normal maps
1166 # ~user/... per-player map of a specific user
1167
1168 $path =~ s/$PATH_SEP/\//go;
1169
1170 # treat it as relative path if it starts with
1171 # something that looks reasonable
1172 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1173 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1174
1175 $base =~ s{[^/]+/?$}{};
1176 $path = "$base/$path";
1177 }
1178
1179 for ($path) {
1180 redo if s{//}{/};
1181 redo if s{/\.?/}{/};
1182 redo if s{/[^/]+/\.\./}{/};
1183 }
1184
1185 $path
1186}
1187
1188sub new_from_path {
1189 my (undef, $path, $base) = @_;
1190
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192
1193 $path = normalise $path, $base;
1194
1195 for my $pkg (keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) {
1197 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc.
1200 return $self;
1201 }
1202 }
1203
1204 Carp::carp "unable to resolve path '$path'.";
1205 ()
1206}
1207
1208sub init {
1209 my ($self) = @_;
1210
1211 $self
1212}
1213
1214sub as_string {
1215 my ($self) = @_;
1216
1217 "$self->{path}"
1218}
1219
1220# the displayed name, this is a one way mapping
1221sub visible_name {
1222 &as_string
1223}
1224
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location
1233sub load_path {
1234 my ($self) = @_;
1235
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1237}
1238
1239# the temporary/swap location
1240sub save_path {
1241 my ($self) = @_;
1242
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path
1244}
1245
1246# the unique path, undef == no special unique path
1247sub uniq_path {
1248 my ($self) = @_;
1249
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
1308} 1251}
1309 1252
1310# and all this just because we cannot iterate over 1253# and all this just because we cannot iterate over
1311# all maps in C++... 1254# all maps in C++...
1312sub change_all_map_light { 1255sub change_all_map_light {
… …
1314 1257
1315 $_->change_map_light ($change) 1258 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1259 for grep $_->outdoor, values %cf::MAP;
1317} 1260}
1318 1261
1262sub unlink_save {
1263 my ($self) = @_;
1264
1265 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1268}
1269
1319sub try_load_header($) { 1270sub load_header_from($) {
1320 my ($path) = @_; 1271 my ($self, $path) = @_;
1321 1272
1322 utf8::encode $path; 1273 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1274 aio_open $path, O_RDONLY, 0
1324 or return; 1275 or return;
1325 1276
1326 my $map = cf::map::new 1277 $self->_load_header ($path)
1327 or return; 1278 or return;
1328 1279
1329 # for better error messages only, will be overwritten 1280 $self->{load_path} = $path;
1330 $map->path ($path);
1331 1281
1332 $map->load_header ($path) 1282 1
1283}
1284
1285sub load_orig {
1286 my ($self) = @_;
1287
1288 $self->load_header_from ($self->load_path)
1289}
1290
1291sub load_temp {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->save_path)
1295}
1296
1297sub load_header {
1298 my ($self) = @_;
1299
1300 if ($self->load_temp) {
1301 $self->last_access ((delete $self->{last_access})
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else {
1307 $self->load_orig
1333 or return; 1308 or return;
1334 1309
1335 $map->{load_path} = $path; 1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 }
1336 1315
1337 $map 1316 1
1338} 1317}
1339 1318
1340sub find; 1319sub find;
1341sub find { 1320sub find {
1342 my ($path, $origin) = @_; 1321 my ($path, $origin) = @_;
1343 1322
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1323 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1324
1349 cf::lock_wait "map_find:$key"; 1325 cf::lock_wait "map_find:$path";
1350 1326
1351 $cf::MAP{$key} || do { 1327 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1328 my $guard = cf::lock_acquire "map_find:$path";
1353 1329 my $map = new_from_path cf::map $path
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1330 or return;
1373 1331
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME; 1332 $map->{last_save} = $cf::RUNTIME;
1386 1333
1387 Coro::cede; 1334 $map->load_header
1335 or return;
1388 1336
1389 if ($map->should_reset) { 1337 if ($map->should_reset) {
1390 $map->reset; 1338 $map->reset;
1391 undef $guard; 1339 undef $guard;
1392 $map = find $path 1340 $map = find $path
1393 or return; 1341 or return;
1394 } 1342 }
1395 1343
1396 $cf::MAP{$key} = $map 1344 $cf::MAP{$path} = $map
1397 } 1345 }
1398} 1346}
1399 1347
1400sub load { 1348sub load {
1401 my ($self) = @_; 1349 my ($self) = @_;
1402 1350
1403 my $path = $self->{path}; 1351 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1352 my $guard = cf::lock_acquire "map_load:$path";
1405 1353
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1354 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1355
1408 $self->in_memory (cf::MAP_LOADING); 1356 $self->in_memory (cf::MAP_LOADING);
1409 1357
1410 $self->alloc; 1358 $self->alloc;
1411 $self->load_objects ($self->{load_path}, 1) 1359 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1360 or return;
1413 1361
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1363 if delete $self->{load_original};
1416 1364
1417 if (my $uniq = $path->uniq_path) { 1365 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1366 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1367 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1368 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1369 $self->_load_objects ($uniq, 0);
1422 } 1370 }
1423 } 1371 }
1424 1372
1425 Coro::cede; 1373 Coro::cede;
1426 1374
1427 # now do the right thing for maps 1375 # now do the right thing for maps
1428 $self->link_multipart_objects; 1376 $self->link_multipart_objects;
1429 1377
1430 if ($self->{path}->is_style_map) { 1378 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1379 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1380 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1381 $self->update_buttons;
1382 Coro::cede;
1437 $self->set_darkness_map; 1383 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1385 unless $self->difficulty;
1386 Coro::cede;
1440 $self->activate; 1387 $self->activate;
1441 } 1388 }
1442 1389
1443 Coro::cede;
1444
1445 $self->in_memory (cf::MAP_IN_MEMORY); 1390 $self->in_memory (cf::MAP_IN_MEMORY);
1391}
1392
1393sub customise_for {
1394 my ($self, $ob) = @_;
1395
1396 return find "~" . $ob->name . "/" . $self->{path}
1397 if $self->per_player;
1398
1399 $self
1446} 1400}
1447 1401
1448# find and load all maps in the 3x3 area around a map 1402# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1403sub load_diag {
1450 my ($map) = @_; 1404 my ($map) = @_;
… …
1482} 1436}
1483 1437
1484our %MAP_PREFETCH; 1438our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1439our $MAP_PREFETCHER = Coro::async {
1486 while () { 1440 while () {
1487 while (%MAP_PREFETCH) { 1441 for my $path (keys %MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path 1442 my $map = find $path
1493 or next; 1443 or next;
1494 $map->load; 1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1495 } 1447 }
1496 Coro::schedule; 1448 Coro::schedule;
1497 } 1449 }
1498}; 1450};
1499 1451
1500sub find_async { 1452sub find_async {
1501 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1502 1454
1503 $path = new cf::path $path, $origin && $origin->path; 1455 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1456
1506 if (my $map = $cf::MAP{$key}) { 1457 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1459 }
1509 1460
1510 $MAP_PREFETCH{$key} = $path; 1461 $MAP_PREFETCH{$path} = 0;
1511 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER->ready;
1512 1463
1513 () 1464 ()
1514} 1465}
1515 1466
… …
1520 1471
1521 $self->{last_save} = $cf::RUNTIME; 1472 $self->{last_save} = $cf::RUNTIME;
1522 1473
1523 return unless $self->dirty; 1474 return unless $self->dirty;
1524 1475
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1476 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1477 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1478
1528 $self->{load_path} = $save; 1479 $self->{load_path} = $save;
1529 1480
1530 return if $self->{deny_save}; 1481 return if $self->{deny_save};
1531 1482
… …
1534 cf::async { 1485 cf::async {
1535 $_->contr->save for $self->players; 1486 $_->contr->save for $self->players;
1536 }; 1487 };
1537 1488
1538 if ($uniq) { 1489 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1490 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1491 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1492 } else {
1542 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1543 } 1494 }
1544} 1495}
1545 1496
1546sub swap_out { 1497sub swap_out {
1547 my ($self) = @_; 1498 my ($self) = @_;
… …
1561 1512
1562sub reset_at { 1513sub reset_at {
1563 my ($self) = @_; 1514 my ($self) = @_;
1564 1515
1565 # TODO: safety, remove and allow resettable per-player maps 1516 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1517 return 1e99 if $self->isa ("ext::map_per_player");
1567 return 1e99 if $self->{deny_reset}; 1518 return 1e99 if $self->{deny_reset};
1568 1519
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1571 1522
… …
1576 my ($self) = @_; 1527 my ($self) = @_;
1577 1528
1578 $self->reset_at <= $cf::RUNTIME 1529 $self->reset_at <= $cf::RUNTIME
1579} 1530}
1580 1531
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename { 1532sub rename {
1590 my ($self, $new_path) = @_; 1533 my ($self, $new_path) = @_;
1591 1534
1535 normalise $new_path;
1536
1592 $self->unlink_save; 1537 $self->unlink_save;
1593 1538
1594 delete $cf::MAP{$self->path}; 1539 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path; 1540 $self->{path} = $new_path; $self->path ($self->{path});
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self; 1541 $cf::MAP{$self->path} = $self;
1598 1542
1599 $self->save; 1543 $self->save;
1600} 1544}
1601 1545
… …
1603 my ($self) = @_; 1547 my ($self) = @_;
1604 1548
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1549 my $lock = cf::lock_acquire "map_data:" . $self->path;
1606 1550
1607 return if $self->players; 1551 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1552 return if $self->isa ("ext::map_per_player");#d#
1609 1553
1610 warn "resetting map ", $self->path;#d# 1554 warn "resetting map ", $self->path;#d#
1611 1555
1612 delete $cf::MAP{$self->path}; 1556 delete $cf::MAP{$self->path};
1613 1557
… …
1626 $self->reset_timeout (1); 1570 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1571 $self->rename ("{nuke}/" . ($nuke_counter++));
1628 $self->reset; # polite request, might not happen 1572 $self->reset; # polite request, might not happen
1629} 1573}
1630 1574
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps 1575=item cf::map::unique_maps
1642 1576
1643Returns an arrayref of cf::path's of all shared maps that have 1577Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1578instantiated unique items. May block.
1645 1579
1646=cut 1580=cut
1647 1581
1648sub unique_maps() { 1582sub unique_maps() {
… …
1654 for (@$files) { 1588 for (@$files) {
1655 utf8::decode $_; 1589 utf8::decode $_;
1656 next if /\.pst$/; 1590 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1591 next unless /^$PATH_SEP/o;
1658 1592
1659 push @paths, new cf::path $_; 1593 push @paths, $_;
1660 } 1594 }
1661 1595
1662 \@paths 1596 \@paths
1663} 1597}
1664 1598
… …
1739 1673
1740=item $player_object->enter_link 1674=item $player_object->enter_link
1741 1675
1742Freezes the player and moves him/her to a special map (C<{link}>). 1676Freezes the player and moves him/her to a special map (C<{link}>).
1743 1677
1744The player should be reaosnably safe there for short amounts of time. You 1678The player should be reasonably safe there for short amounts of time. You
1745I<MUST> call C<leave_link> as soon as possible, though. 1679I<MUST> call C<leave_link> as soon as possible, though.
1746 1680
1681Will never block.
1682
1747=item $player_object->leave_link ($map, $x, $y) 1683=item $player_object->leave_link ($map, $x, $y)
1748 1684
1749Moves the player out of the specila link map onto the given map. If the 1685Moves the player out of the special C<{link}> map onto the specified
1750map is not valid (or omitted), the player will be moved back to the 1686map. If the map is not valid (or omitted), the player will be moved back
1751location he/she was before the call to C<enter_link>, or, if that fails, 1687to the location he/she was before the call to C<enter_link>, or, if that
1752to the emergency map position. 1688fails, to the emergency map position.
1753 1689
1754Might block. 1690Might block.
1755 1691
1756=cut 1692=cut
1693
1694sub link_map {
1695 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1698 $LINK_MAP->load;
1699 }
1700
1701 $LINK_MAP
1702}
1757 1703
1758sub cf::object::player::enter_link { 1704sub cf::object::player::enter_link {
1759 my ($self) = @_; 1705 my ($self) = @_;
1760 1706
1761 $self->deactivate_recursive; 1707 $self->deactivate_recursive;
1762 1708
1763 return if $self->map == $LINK_MAP; 1709 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1710
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1712 if $self->map;
1767 1713
1768 $self->enter_map ($LINK_MAP, 20, 20); 1714 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1769} 1715}
1770 1716
1771sub cf::object::player::leave_link { 1717sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1718 my ($self, $map, $x, $y) = @_;
1773 1719
… …
1837=cut 1783=cut
1838 1784
1839sub cf::object::player::goto { 1785sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1841 1787
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1788 $self->enter_link;
1845 1789
1846 (async { 1790 (async {
1847 my $map = cf::map::find $path->as_string; 1791 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1792 $map = $map->customise_for ($self) if $map;
1849 1793
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1794# warn "entering ", $map->path, " at ($x, $y)\n"
1851# if $map; 1795# if $map;
1852 1796
… …
1917 $self->deactivate_recursive; # just to be sure 1861 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1862 unless (eval {
1919 prepare_random_map $exit 1863 prepare_random_map $exit
1920 if $exit->slaying eq "/!"; 1864 if $exit->slaying eq "/!";
1921 1865
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1868
1925 1; 1869 1;
1926 }) { 1870 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1871 $self->message ("Something went wrong deep within the crossfire server. "
… …
2340 return; 2284 return;
2341 } 2285 }
2342 2286
2343 warn "reloading..."; 2287 warn "reloading...";
2344 2288
2289 warn "freezing server";
2345 my $guard = freeze_mainloop; 2290 my $guard = freeze_mainloop;
2346 cf::emergency_save; 2291 cf::emergency_save;
2347 2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
2296
2348 eval { 2297 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2298 # if anything goes wrong in here, we should simply crash as we already saved
2350 2299
2351 # cancel all watchers 2300 warn "cancel all watchers";
2352 for (Event::all_watchers) { 2301 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2302 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2303 }
2355 2304
2356 # cancel all extension coros 2305 warn "cancel all extension coros";
2357 $_->cancel for values %EXT_CORO; 2306 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2307 %EXT_CORO = ();
2359 2308
2309 warn "remove commands";
2310 %COMMAND = ();
2311
2312 warn "remove ext commands";
2313 %EXTCMD = ();
2314
2360 # unload all extensions 2315 warn "unload/nuke all extensions";
2361 for (@exts) { 2316 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2317 warn "... unloading $pkg";
2363 unload_extension $_; 2318
2319 if (my $cb = $pkg->can ("unload")) {
2320 eval {
2321 $cb->($pkg);
2322 1
2323 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2324 }
2365 2325
2326 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg;
2328 }
2329
2366 # unload all modules loaded from $LIBDIR 2330 warn "unload all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2331 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2333
2370 warn "removing <$k>"; 2334 warn "removing <$k>";
2371 delete $INC{$k}; 2335 delete $INC{$k};
… …
2378 } 2342 }
2379 2343
2380 Symbol::delete_package $k; 2344 Symbol::delete_package $k;
2381 } 2345 }
2382 2346
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2347 warn "get rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2348 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2350
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2351 warn "unload cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2352 delete $INC{"cf.pm"};
2396 2353
2397 # don't, removes xs symbols, too, 2354 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2355 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2356 #Symbol::delete_package __PACKAGE__;
2400 2357
2401 # reload cf.pm
2402 warn "reloading cf.pm"; 2358 warn "reloading cf.pm";
2403 require cf; 2359 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2361
2406 # load config and database again 2362 warn "load config and database again";
2407 cf::cfg_load; 2363 cf::cfg_load;
2408 cf::db_load; 2364 cf::db_load;
2409 2365
2410 # load extensions
2411 warn "load extensions"; 2366 warn "load extensions";
2412 cf::load_extensions; 2367 cf::load_extensions;
2413 2368
2414 # reattach attachments to objects 2369 warn "reattach attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2370 _global_reattach;
2371 warn "reattach attachments to maps";
2417 reattach $_ for values %MAP; 2372 reattach $_ for values %MAP;
2418 }; 2373 };
2419 2374
2420 if ($@) { 2375 if ($@) {
2421 warn $@; 2376 warn $@;
2422 warn "error while reloading, exiting."; 2377 warn "error while reloading, exiting.";
2423 exit 1; 2378 exit 1;
2424 } 2379 }
2425 2380
2426 warn "reloaded successfully"; 2381 warn "reloaded";
2427}; 2382};
2428
2429#############################################################################
2430
2431unless ($LINK_MAP) {
2432 $LINK_MAP = cf::map::new;
2433
2434 $LINK_MAP->width (41);
2435 $LINK_MAP->height (41);
2436 $LINK_MAP->alloc;
2437 $LINK_MAP->path ("{link}");
2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470}
2471
2472register "<global>", __PACKAGE__;
2473 2383
2474register_command "reload" => sub { 2384register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2385 my ($who, $arg) = @_;
2476 2386
2477 if ($who->flag (FLAG_WIZ)) { 2387 if ($who->flag (FLAG_WIZ)) {
… …
2487 reentrant => 0, 2397 reentrant => 0,
2488 prio => 0, 2398 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2399 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2400 data => WF_AUTOCANCEL,
2491 cb => sub { 2401 cb => sub {
2402 $NOW = Event::time;
2403
2492 cf::server_tick; # one server iteration 2404 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2405 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2406 $NEXT_TICK += $TICK;
2495 2407
2496 $WAIT_FOR_TICK->broadcast; 2408 $WAIT_FOR_TICK->broadcast;

Diff Legend

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