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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.156 by root, Tue Jan 9 22:07:08 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 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;
44our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
45our $NEXT_TICK; 51our $NEXT_TICK;
46our $NOW; 52our $NOW;
47 53
48our %CFG; 54our %CFG;
49 55
50our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 57our $RUNTIME;
52 58
53our %PLAYER; # all users 59our %PLAYER; # all users
54our %MAP; # all maps 60our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions
58 63
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $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
61 69
62binmode STDOUT; 70binmode STDOUT;
63binmode STDERR; 71binmode STDERR;
64 72
65# read virtual server time, if available 73# read virtual server time, if available
… …
73mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
77 85
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
81 87
82############################################################################# 88#############################################################################
83 89
84=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
156} 162}
157 163
158$Event::DIED = sub { 164$Event::DIED = sub {
159 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
160}; 166};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 167
166=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
167 169
168=over 4 170=over 4
169 171
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 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;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
319 } 325 }
320} 326}
321 327
322=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
323 329
324Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 331extension calling this is being unloaded.
326 332
327=cut 333=cut
328 334
329sub async_ext(&) { 335sub async_ext(&) {
… …
362} 368}
363 369
364=back 370=back
365 371
366=cut 372=cut
367
368#############################################################################
369
370package cf::path;
371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
375sub new {
376 my ($class, $path, $base) = @_;
377
378 $path = $path->as_string if ref $path;
379
380 my $self = bless { }, $class;
381
382 # {... are special paths that are not touched
383 # ?xxx/... are special absolute paths
384 # ?random/... random maps
385 # /! non-realised random map exit
386 # /... normal maps
387 # ~/... per-player maps without a specific player (DO NOT USE)
388 # ~user/... per-player map of a specific user
389
390 if ($path =~ /^{/) {
391 # fine as it is
392 } elsif ($path =~ s{^\?random/}{}) {
393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
394 $self->{random} = cf::from_json $data;
395 } else {
396 if ($path =~ s{^~([^/]+)?}{}) {
397 $self->{user_rel} = 1;
398
399 if (defined $1) {
400 $self->{user} = $1;
401 } elsif ($base =~ m{^~([^/]+)/}) {
402 $self->{user} = $1;
403 } else {
404 warn "cannot resolve user-relative path without user <$path,$base>\n";
405 }
406 } elsif ($path =~ /^\//) {
407 # already absolute
408 } else {
409 $base =~ s{[^/]+/?$}{};
410 return $class->new ("$base/$path");
411 }
412
413 for ($path) {
414 redo if s{/\.?/}{/};
415 redo if s{/[^/]+/\.\./}{/};
416 }
417 }
418
419 $self->{path} = $path;
420
421 $self
422}
423
424# the name / primary key / in-game path
425sub as_string {
426 my ($self) = @_;
427
428 $self->{user_rel} ? "~$self->{user}$self->{path}"
429 : $self->{random} ? "?random/$self->{path}"
430 : $self->{path}
431}
432
433# the displayed name, this is a one way mapping
434sub visible_name {
435 my ($self) = @_;
436
437# if (my $rmp = $self->{random}) {
438# # todo: be more intelligent about this
439# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
440# } else {
441 $self->as_string
442# }
443}
444
445# escape the /'s in the path
446sub _escaped_path {
447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
448 $path
449}
450
451# the original (read-only) location
452sub load_path {
453 my ($self) = @_;
454
455 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
456}
457
458# the temporary/swap location
459sub save_path {
460 my ($self) = @_;
461
462 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
463 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
464 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
465}
466
467# the unique path, might be eq to save_path
468sub uniq_path {
469 my ($self) = @_;
470
471 $self->{user_rel} || $self->{random}
472 ? undef
473 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
474}
475
476# return random map parameters, or undef
477sub random_map_params {
478 my ($self) = @_;
479
480 $self->{random}
481}
482
483# this is somewhat ugly, but style maps do need special treatment
484sub is_style_map {
485 $_[0]{path} =~ m{^/styles/}
486}
487
488package cf;
489 373
490############################################################################# 374#############################################################################
491 375
492=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
493 377
… …
940=cut 824=cut
941 825
942sub register_extcmd { 826sub register_extcmd {
943 my ($name, $cb) = @_; 827 my ($name, $cb) = @_;
944 828
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 829 $EXTCMD{$name} = $cb;
949} 830}
950 831
951cf::player->attach ( 832cf::player->attach (
952 on_command => sub { 833 on_command => sub {
953 my ($pl, $name, $params) = @_; 834 my ($pl, $name, $params) = @_;
… …
966 847
967 my $msg = eval { from_json $buf }; 848 my $msg = eval { from_json $buf };
968 849
969 if (ref $msg) { 850 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 851 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 852 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 853 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 854 }
974 } 855 }
975 } else { 856 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 857 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 859
979 cf::override; 860 cf::override;
980 }, 861 },
981); 862);
982 863
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 864sub load_extension {
990 my ($path) = @_; 865 my ($path) = @_;
991 866
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 867 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 868 my $base = $1;
994 my $pkg = $1; 869 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 870 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 871 $pkg = "ext::$pkg";
997 872
998 warn "loading '$path' into '$pkg'\n"; 873 warn "... loading '$path' into '$pkg'\n";
999 874
1000 open my $fh, "<:utf8", $path 875 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 876 or die "$path: $!";
1002 877
1003 my $source = 878 my $source =
1004 "package $pkg; use strict; use utf8;\n" 879 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 880 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 881 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 882 . "\n};\n1";
1008 883
1009 eval $source 884 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 885 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 886 : "extension disabled.\n";
1012 887 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 888 warn $@;
1014 $ext_pkg{$base} = $pkg; 889 warn "mandatory extension failed to load, exiting.\n";
1015 890 exit 1;
1016# no strict 'refs'; 891 }
1017# @{"$pkg\::ISA"} = ext::; 892 die $@;
1018
1019 register $base, $pkg;
1020}
1021
1022sub unload_extension {
1023 my ($pkg) = @_;
1024
1025 warn "removing extension $pkg\n";
1026
1027 # remove hooks
1028 #TODO
1029# for my $idx (0 .. $#PLUGIN_EVENT) {
1030# delete $hook[$idx]{$pkg};
1031# } 893 }
1032 894
1033 # remove commands 895 push @EXTS, $pkg;
1034 for my $name (keys %COMMAND) {
1035 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1036
1037 if (@cb) {
1038 $COMMAND{$name} = \@cb;
1039 } else {
1040 delete $COMMAND{$name};
1041 }
1042 }
1043
1044 # remove extcmds
1045 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1046 delete $EXTCMD{$name};
1047 }
1048
1049 if (my $cb = $pkg->can ("unload")) {
1050 eval {
1051 $cb->($pkg);
1052 1
1053 } or warn "$pkg unloaded, but with errors: $@";
1054 }
1055
1056 Symbol::delete_package $pkg;
1057} 896}
1058 897
1059sub load_extensions { 898sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 899 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 900 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 904 } or warn "$ext not loaded: $@";
1066 } 905 }
1067} 906}
1068 907
1069############################################################################# 908#############################################################################
1070# load/save/clean perl data associated with a map
1071
1072*cf::mapsupport::on_clean = sub {
1073 my ($map) = @_;
1074
1075 my $path = $map->tmpname;
1076 defined $path or return;
1077
1078 unlink "$path.pst";
1079};
1080
1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1082
1083#############################################################################
1084 909
1085=head2 CORE EXTENSIONS 910=head2 CORE EXTENSIONS
1086 911
1087Functions and methods that extend core crossfire objects. 912Functions and methods that extend core crossfire objects.
1088 913
… …
1224 \@logins 1049 \@logins
1225} 1050}
1226 1051
1227=item $player->maps 1052=item $player->maps
1228 1053
1229Returns an arrayref of cf::path's of all maps that are private for this 1054Returns an arrayref of map paths that are private for this
1230player. May block. 1055player. May block.
1231 1056
1232=cut 1057=cut
1233 1058
1234sub maps($) { 1059sub maps($) {
… …
1240 my @paths; 1065 my @paths;
1241 1066
1242 for (@$files) { 1067 for (@$files) {
1243 utf8::decode $_; 1068 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1069 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1070 next unless /^$PATH_SEP/o;
1246 1071
1247 s/$PATH_SEP/\//g; 1072 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1074 }
1250 1075
1251 \@paths 1076 \@paths
1252} 1077}
1253 1078
… …
1279package cf::map; 1104package cf::map;
1280 1105
1281use Fcntl; 1106use Fcntl;
1282use Coro::AIO; 1107use Coro::AIO;
1283 1108
1109use overload
1110 '""' => \&as_string;
1111
1284our $MAX_RESET = 3600; 1112our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1113our $DEFAULT_RESET = 3000;
1286 1114
1287sub generate_random_map { 1115sub generate_random_map {
1288 my ($path, $rmp) = @_; 1116 my ($self, $rmp) = @_;
1289 1117
1290 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1119 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1123 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1124 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1125 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1126 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1127 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1128 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}) 1130 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 )
1132}
1133
1134sub register {
1135 my (undef, $regex) = @_;
1136 my $pkg = caller;
1137
1138 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__;
1140
1141 $EXT_MAP{$pkg} = qr<$regex>;
1142}
1143
1144# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146
1147sub normalise {
1148 my ($path, $base) = @_;
1149
1150 # map plan:
1151 #
1152 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched
1154 # ?xxx/... are special absolute paths
1155 # ?random/... random maps
1156 # /... normal maps
1157 # ~user/... per-player map of a specific user
1158
1159 $path =~ s/$PATH_SEP/\//go;
1160
1161 # treat it as relative path if it starts with
1162 # something that looks reasonable
1163 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1164 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1165
1166 $base =~ s{[^/]+/?$}{};
1167 $path = "$base/$path";
1168 }
1169
1170 for ($path) {
1171 redo if s{//}{/};
1172 redo if s{/\.?/}{/};
1173 redo if s{/[^/]+/\.\./}{/};
1174 }
1175
1176 $path
1177}
1178
1179sub new_from_path {
1180 my (undef, $path, $base) = @_;
1181
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183
1184 $path = normalise $path, $base;
1185
1186 for my $pkg (keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) {
1188 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc.
1191 return $self;
1192 }
1193 }
1194
1195 Carp::carp "unable to resolve path '$path'.";
1196 ()
1197}
1198
1199sub init {
1200 my ($self) = @_;
1201
1202 $self
1203}
1204
1205sub as_string {
1206 my ($self) = @_;
1207
1208 "$self->{path}"
1209}
1210
1211# the displayed name, this is a one way mapping
1212sub visible_name {
1213 &as_string
1214}
1215
1216# the original (read-only) location
1217sub load_path {
1218 my ($self) = @_;
1219
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1221}
1222
1223# the temporary/swap location
1224sub save_path {
1225 my ($self) = @_;
1226
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1229}
1230
1231# the unique path, undef == no special unique path
1232sub uniq_path {
1233 my ($self) = @_;
1234
1235 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1236 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304} 1237}
1305 1238
1306# and all this just because we cannot iterate over 1239# and all this just because we cannot iterate over
1307# all maps in C++... 1240# all maps in C++...
1308sub change_all_map_light { 1241sub change_all_map_light {
… …
1310 1243
1311 $_->change_map_light ($change) 1244 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1245 for grep $_->outdoor, values %cf::MAP;
1313} 1246}
1314 1247
1248sub unlink_save {
1249 my ($self) = @_;
1250
1251 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1254}
1255
1315sub try_load_header($) { 1256sub load_header_from($) {
1316 my ($path) = @_; 1257 my ($self, $path) = @_;
1317 1258
1318 utf8::encode $path; 1259 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1260 aio_open $path, O_RDONLY, 0
1320 or return; 1261 or return;
1321 1262
1322 my $map = cf::map::new 1263 $self->_load_header ($path)
1323 or return; 1264 or return;
1324 1265
1325 # for better error messages only, will be overwritten 1266 $self->{load_path} = $path;
1326 $map->path ($path);
1327 1267
1328 $map->load_header ($path) 1268 1
1269}
1270
1271sub load_orig {
1272 my ($self) = @_;
1273
1274 $self->load_header_from ($self->load_path)
1275}
1276
1277sub load_temp {
1278 my ($self) = @_;
1279
1280 $self->load_header_from ($self->save_path)
1281}
1282
1283sub load_header {
1284 my ($self) = @_;
1285
1286 if ($self->load_temp) {
1287 $self->last_access ((delete $self->{last_access})
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else {
1293 $self->load_orig
1329 or return; 1294 or return;
1330 1295
1331 $map->{load_path} = $path; 1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 }
1332 1301
1333 $map 1302 1
1334} 1303}
1335 1304
1336sub find; 1305sub find;
1337sub find { 1306sub find {
1338 my ($path, $origin) = @_; 1307 my ($path, $origin) = @_;
1339 1308
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1309 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1310
1345 cf::lock_wait "map_find:$key"; 1311 cf::lock_wait "map_find:$path";
1346 1312
1347 $cf::MAP{$key} || do { 1313 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1314 my $guard = cf::lock_acquire "map_find:$path";
1349 1315 my $map = new_from_path cf::map $path
1350 # do it the slow way
1351 my $map = try_load_header $path->save_path;
1352
1353 Coro::cede;
1354
1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1358 # safety
1359 $map->{instantiate_time} = $cf::RUNTIME
1360 if $map->{instantiate_time} > $cf::RUNTIME;
1361 } else {
1362 if (my $rmp = $path->random_map_params) {
1363 $map = generate_random_map $key, $rmp;
1364 } else {
1365 $map = try_load_header $path->load_path;
1366 }
1367
1368 $map or return; 1316 or return;
1369 1317
1370 $map->{load_original} = 1;
1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1373 $map->instantiate;
1374
1375 # per-player maps become, after loading, normal maps
1376 $map->per_player (0) if $path->{user_rel};
1377 }
1378
1379 $map->path ($key);
1380 $map->{path} = $path;
1381 $map->{last_save} = $cf::RUNTIME; 1318 $map->{last_save} = $cf::RUNTIME;
1382 1319
1383 Coro::cede; 1320 $map->load_header
1321 or return;
1384 1322
1385 if ($map->should_reset) { 1323 if ($map->should_reset) {
1386 $map->reset; 1324 $map->reset;
1387 undef $guard; 1325 undef $guard;
1388 $map = find $path 1326 $map = find $path
1389 or return; 1327 or return;
1390 } 1328 }
1391 1329
1392 $cf::MAP{$key} = $map 1330 $cf::MAP{$path} = $map
1393 } 1331 }
1394} 1332}
1395 1333
1396sub load { 1334sub load {
1397 my ($self) = @_; 1335 my ($self) = @_;
1398 1336
1399 my $path = $self->{path}; 1337 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1338 my $guard = cf::lock_acquire "map_load:$path";
1401 1339
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1340 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1341
1404 $self->in_memory (cf::MAP_LOADING); 1342 $self->in_memory (cf::MAP_LOADING);
1405 1343
1406 $self->alloc; 1344 $self->alloc;
1407 $self->load_objects ($self->{load_path}, 1) 1345 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1346 or return;
1409 1347
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1349 if delete $self->{load_original};
1412 1350
1413 if (my $uniq = $path->uniq_path) { 1351 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1352 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1353 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1354 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1355 $self->_load_objects ($uniq, 0);
1418 } 1356 }
1419 } 1357 }
1420 1358
1421 Coro::cede; 1359 Coro::cede;
1422 1360
1423 # now do the right thing for maps 1361 # now do the right thing for maps
1424 $self->link_multipart_objects; 1362 $self->link_multipart_objects;
1425 1363
1426 if ($self->{path}->is_style_map) { 1364 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1365 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1366 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1367 $self->update_buttons;
1368 Coro::cede;
1433 $self->set_darkness_map; 1369 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1370 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1371 unless $self->difficulty;
1372 Coro::cede;
1436 $self->activate; 1373 $self->activate;
1437 } 1374 }
1438 1375
1439 Coro::cede;
1440
1441 $self->in_memory (cf::MAP_IN_MEMORY); 1376 $self->in_memory (cf::MAP_IN_MEMORY);
1377}
1378
1379sub customise_for {
1380 my ($self, $ob) = @_;
1381
1382 return find "~" . $ob->name . "/" . $self->{path}
1383 if $self->per_player;
1384
1385 $self
1386}
1387
1388# find and load all maps in the 3x3 area around a map
1389sub load_diag {
1390 my ($map) = @_;
1391
1392 my @diag; # diagonal neighbours
1393
1394 for (0 .. 3) {
1395 my $neigh = $map->tile_path ($_)
1396 or next;
1397 $neigh = find $neigh, $map
1398 or next;
1399 $neigh->load;
1400
1401 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1402 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1403 }
1404
1405 for (@diag) {
1406 my $neigh = find @$_
1407 or next;
1408 $neigh->load;
1409 }
1442} 1410}
1443 1411
1444sub find_sync { 1412sub find_sync {
1445 my ($path, $origin) = @_; 1413 my ($path, $origin) = @_;
1446 1414
1447 cf::sync_job { cf::map::find $path, $origin } 1415 cf::sync_job { find $path, $origin }
1448} 1416}
1449 1417
1450sub do_load_sync { 1418sub do_load_sync {
1451 my ($map) = @_; 1419 my ($map) = @_;
1452 1420
1453 cf::sync_job { $map->load }; 1421 cf::sync_job { $map->load };
1454} 1422}
1455 1423
1424our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async {
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437
1438sub find_async {
1439 my ($path, $origin) = @_;
1440
1441 $path = normalise $path, $origin && $origin->{path};
1442
1443 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 }
1446
1447 $MAP_PREFETCH{$path} = 0;
1448 $MAP_PREFETCHER->ready;
1449
1450 ()
1451}
1452
1456sub save { 1453sub save {
1457 my ($self) = @_; 1454 my ($self) = @_;
1458 1455
1459 my $lock = cf::lock_acquire "map_data:" . $self->path; 1456 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460 1457
1461 $self->{last_save} = $cf::RUNTIME; 1458 $self->{last_save} = $cf::RUNTIME;
1462 1459
1463 return unless $self->dirty; 1460 return unless $self->dirty;
1464 1461
1465 my $save = $self->{path}->save_path; utf8::encode $save; 1462 my $save = $self->save_path; utf8::encode $save;
1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1463 my $uniq = $self->uniq_path; utf8::encode $uniq;
1467 1464
1468 $self->{load_path} = $save; 1465 $self->{load_path} = $save;
1469 1466
1470 return if $self->{deny_save}; 1467 return if $self->{deny_save};
1471 1468
… …
1474 cf::async { 1471 cf::async {
1475 $_->contr->save for $self->players; 1472 $_->contr->save for $self->players;
1476 }; 1473 };
1477 1474
1478 if ($uniq) { 1475 if ($uniq) {
1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1476 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1480 $self->save_objects ($uniq, cf::IO_UNIQUES); 1477 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1481 } else { 1478 } else {
1482 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1479 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1483 } 1480 }
1484} 1481}
1485 1482
1486sub swap_out { 1483sub swap_out {
1487 my ($self) = @_; 1484 my ($self) = @_;
… …
1501 1498
1502sub reset_at { 1499sub reset_at {
1503 my ($self) = @_; 1500 my ($self) = @_;
1504 1501
1505 # TODO: safety, remove and allow resettable per-player maps 1502 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel}; 1503 return 1e99 if $self->isa ("ext::map_per_player");
1507 return 1e99 if $self->{deny_reset}; 1504 return 1e99 if $self->{deny_reset};
1508 1505
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1511 1508
… …
1516 my ($self) = @_; 1513 my ($self) = @_;
1517 1514
1518 $self->reset_at <= $cf::RUNTIME 1515 $self->reset_at <= $cf::RUNTIME
1519} 1516}
1520 1517
1521sub unlink_save {
1522 my ($self) = @_;
1523
1524 utf8::encode (my $save = $self->{path}->save_path);
1525 aioreq_pri 3; IO::AIO::aio_unlink $save;
1526 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1527}
1528
1529sub rename { 1518sub rename {
1530 my ($self, $new_path) = @_; 1519 my ($self, $new_path) = @_;
1531 1520
1521 normalise $new_path;
1522
1532 $self->unlink_save; 1523 $self->unlink_save;
1533 1524
1534 delete $cf::MAP{$self->path}; 1525 delete $cf::MAP{$self->path};
1535 $self->{path} = new cf::path $new_path; 1526 $self->{path} = $new_path; $self->path ($self->{path});
1536 $self->path ($self->{path}->as_string);
1537 $cf::MAP{$self->path} = $self; 1527 $cf::MAP{$self->path} = $self;
1538 1528
1539 $self->save; 1529 $self->save;
1540} 1530}
1541 1531
1542sub reset { 1532sub reset {
1543 my ($self) = @_; 1533 my ($self) = @_;
1544 1534
1545 my $lock = cf::lock_acquire "map_data:" . $self->path; 1535 my $lock = cf::lock_acquire "map_data:$self->{path}";
1546 1536
1547 return if $self->players; 1537 return if $self->players;
1548 return if $self->{path}{user_rel};#d# 1538 return if $self->isa ("ext::map_per_player");#d#
1549 1539
1550 warn "resetting map ", $self->path;#d# 1540 warn "resetting map ", $self->path;#d#
1551 1541
1552 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1543
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear;
1553 1546
1554 $_->clear_links_to ($self) for values %cf::MAP; 1547 $_->clear_links_to ($self) for values %cf::MAP;
1555 1548
1556 $self->unlink_save; 1549 $self->unlink_save;
1557 $self->destroy; 1550 $self->destroy;
… …
1566 $self->reset_timeout (1); 1559 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++)); 1560 $self->rename ("{nuke}/" . ($nuke_counter++));
1568 $self->reset; # polite request, might not happen 1561 $self->reset; # polite request, might not happen
1569} 1562}
1570 1563
1571sub customise_for { 1564=item cf::map::unique_maps
1572 my ($map, $ob) = @_;
1573 1565
1574 if ($map->per_player) { 1566Returns an arrayref of paths of all shared maps that have
1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1567instantiated unique items. May block.
1576 }
1577 1568
1578 $map 1569=cut
1570
1571sub unique_maps() {
1572 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1573 or return;
1574
1575 my @paths;
1576
1577 for (@$files) {
1578 utf8::decode $_;
1579 next if /\.pst$/;
1580 next unless /^$PATH_SEP/o;
1581
1582 s/\.map$//;
1583 push @paths, $_;
1584 }
1585
1586 \@paths
1579} 1587}
1580 1588
1581package cf; 1589package cf;
1582 1590
1583=back 1591=back
… …
1655 1663
1656=item $player_object->enter_link 1664=item $player_object->enter_link
1657 1665
1658Freezes the player and moves him/her to a special map (C<{link}>). 1666Freezes the player and moves him/her to a special map (C<{link}>).
1659 1667
1660The player should be reaosnably safe there for short amounts of time. You 1668The player should be reasonably safe there for short amounts of time. You
1661I<MUST> call C<leave_link> as soon as possible, though. 1669I<MUST> call C<leave_link> as soon as possible, though.
1662 1670
1671Will never block.
1672
1663=item $player_object->leave_link ($map, $x, $y) 1673=item $player_object->leave_link ($map, $x, $y)
1664 1674
1665Moves the player out of the specila link map onto the given map. If the 1675Moves the player out of the special C<{link}> map onto the specified
1666map is not valid (or omitted), the player will be moved back to the 1676map. If the map is not valid (or omitted), the player will be moved back
1667location he/she was before the call to C<enter_link>, or, if that fails, 1677to the location he/she was before the call to C<enter_link>, or, if that
1668to the emergency map position. 1678fails, to the emergency map position.
1669 1679
1670Might block. 1680Might block.
1671 1681
1672=cut 1682=cut
1683
1684sub link_map {
1685 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1688 $LINK_MAP->load;
1689 }
1690
1691 $LINK_MAP
1692}
1673 1693
1674sub cf::object::player::enter_link { 1694sub cf::object::player::enter_link {
1675 my ($self) = @_; 1695 my ($self) = @_;
1676 1696
1677 $self->deactivate_recursive; 1697 $self->deactivate_recursive;
1678 1698
1679 return if $self->map == $LINK_MAP; 1699 return if UNIVERSAL::isa $self->map, "ext::map_link";
1680 1700
1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1682 if $self->map; 1702 if $self->map;
1683 1703
1684 $self->enter_map ($LINK_MAP, 20, 20); 1704 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1685} 1705}
1686 1706
1687sub cf::object::player::leave_link { 1707sub cf::object::player::leave_link {
1688 my ($self, $map, $x, $y) = @_; 1708 my ($self, $map, $x, $y) = @_;
1689 1709
… …
1707 # use -1 or undef as default coordinates, not 0, 0 1727 # use -1 or undef as default coordinates, not 0, 0
1708 ($x, $y) = ($map->enter_x, $map->enter_y) 1728 ($x, $y) = ($map->enter_x, $map->enter_y)
1709 if $x <=0 && $y <= 0; 1729 if $x <=0 && $y <= 0;
1710 1730
1711 $map->load; 1731 $map->load;
1732 $map->load_diag;
1712 1733
1713 return unless $self->contr->active; 1734 return unless $self->contr->active;
1714 $self->activate_recursive; 1735 $self->activate_recursive;
1715 $self->enter_map ($map, $x, $y); 1736 $self->enter_map ($map, $x, $y);
1716} 1737}
… …
1752=cut 1773=cut
1753 1774
1754sub cf::object::player::goto { 1775sub cf::object::player::goto {
1755 my ($self, $path, $x, $y) = @_; 1776 my ($self, $path, $x, $y) = @_;
1756 1777
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1760 $self->enter_link; 1778 $self->enter_link;
1761 1779
1762 (async { 1780 (async {
1763 my $map = cf::map::find $path->as_string; 1781 my $map = cf::map::find $path;
1764 $map = $map->customise_for ($self) if $map; 1782 $map = $map->customise_for ($self) if $map;
1765 1783
1766# warn "entering ", $map->path, " at ($x, $y)\n" 1784# warn "entering ", $map->path, " at ($x, $y)\n"
1767# if $map; 1785# if $map;
1768 1786
… …
1833 $self->deactivate_recursive; # just to be sure 1851 $self->deactivate_recursive; # just to be sure
1834 unless (eval { 1852 unless (eval {
1835 prepare_random_map $exit 1853 prepare_random_map $exit
1836 if $exit->slaying eq "/!"; 1854 if $exit->slaying eq "/!";
1837 1855
1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1840 1858
1841 1; 1859 1;
1842 }) { 1860 }) {
1843 $self->message ("Something went wrong deep within the crossfire server. " 1861 $self->message ("Something went wrong deep within the crossfire server. "
1844 . "I'll try to bring you back to the map you were before. " 1862 . "I'll try to bring you back to the map you were before. "
1845 . "Please report this to the dungeon master", 1863 . "Please report this to the dungeon master!",
1846 cf::NDI_UNIQUE | cf::NDI_RED); 1864 cf::NDI_UNIQUE | cf::NDI_RED);
1847 1865
1848 warn "ERROR in enter_exit: $@"; 1866 warn "ERROR in enter_exit: $@";
1849 $self->leave_link; 1867 $self->leave_link;
1850 } 1868 }
… …
2226 warn "enter emergency perl save\n"; 2244 warn "enter emergency perl save\n";
2227 2245
2228 cf::sync_job { 2246 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl 2247 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players 2248 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously. 2249 # and maps saved/destroyed asynchronously.
2232 warn "begin emergency player save\n"; 2250 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) { 2251 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next; 2252 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next; 2253 $pl->valid or next;
2236 $pl->save; 2254 $pl->save;
… …
2256 return; 2274 return;
2257 } 2275 }
2258 2276
2259 warn "reloading..."; 2277 warn "reloading...";
2260 2278
2279 warn "freezing server";
2261 my $guard = freeze_mainloop; 2280 my $guard = freeze_mainloop;
2262 cf::emergency_save; 2281 cf::emergency_save;
2263 2282
2283 warn "sync database to disk";
2284 cf::db_sync;
2285 IO::AIO::flush;
2286
2264 eval { 2287 eval {
2265 # if anything goes wrong in here, we should simply crash as we already saved 2288 # if anything goes wrong in here, we should simply crash as we already saved
2266 2289
2267 # cancel all watchers 2290 warn "cancel all watchers";
2268 for (Event::all_watchers) { 2291 for (Event::all_watchers) {
2269 $_->cancel if $_->data & WF_AUTOCANCEL; 2292 $_->cancel if $_->data & WF_AUTOCANCEL;
2270 } 2293 }
2271 2294
2272 # cancel all extension coros 2295 warn "cancel all extension coros";
2273 $_->cancel for values %EXT_CORO; 2296 $_->cancel for values %EXT_CORO;
2274 %EXT_CORO = (); 2297 %EXT_CORO = ();
2275 2298
2299 warn "remove commands";
2300 %COMMAND = ();
2301
2302 warn "remove ext commands";
2303 %EXTCMD = ();
2304
2276 # unload all extensions 2305 warn "unload/nuke all extensions";
2277 for (@exts) { 2306 for my $pkg (@EXTS) {
2278 warn "unloading <$_>"; 2307 warn "... unloading $pkg";
2279 unload_extension $_; 2308
2309 if (my $cb = $pkg->can ("unload")) {
2310 eval {
2311 $cb->($pkg);
2312 1
2313 } or warn "$pkg unloaded, but with errors: $@";
2280 } 2314 }
2281 2315
2316 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg;
2318 }
2319
2282 # unload all modules loaded from $LIBDIR 2320 warn "unload all perl modules loaded from $LIBDIR";
2283 while (my ($k, $v) = each %INC) { 2321 while (my ($k, $v) = each %INC) {
2284 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2285 2323
2286 warn "removing <$k>"; 2324 warn "removing <$k>";
2287 delete $INC{$k}; 2325 delete $INC{$k};
… …
2294 } 2332 }
2295 2333
2296 Symbol::delete_package $k; 2334 Symbol::delete_package $k;
2297 } 2335 }
2298 2336
2299 # sync database to disk
2300 cf::db_sync;
2301 IO::AIO::flush;
2302
2303 # get rid of safe::, as good as possible 2337 warn "get rid of safe::, as good as possible";
2304 Symbol::delete_package "safe::$_" 2338 Symbol::delete_package "safe::$_"
2305 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2339 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2306 2340
2307 # remove register_script_function callbacks
2308 # TODO
2309
2310 # unload cf.pm "a bit" 2341 warn "unload cf.pm \"a bit\"";
2311 delete $INC{"cf.pm"}; 2342 delete $INC{"cf.pm"};
2312 2343
2313 # don't, removes xs symbols, too, 2344 # don't, removes xs symbols, too,
2314 # and global variables created in xs 2345 # and global variables created in xs
2315 #Symbol::delete_package __PACKAGE__; 2346 #Symbol::delete_package __PACKAGE__;
2316 2347
2317 # reload cf.pm
2318 warn "reloading cf.pm"; 2348 warn "reloading cf.pm";
2319 require cf; 2349 require cf;
2320 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2321 2351
2322 # load config and database again 2352 warn "load config and database again";
2323 cf::cfg_load; 2353 cf::cfg_load;
2324 cf::db_load; 2354 cf::db_load;
2325 2355
2326 # load extensions
2327 warn "load extensions"; 2356 warn "load extensions";
2328 cf::load_extensions; 2357 cf::load_extensions;
2329 2358
2330 # reattach attachments to objects 2359 warn "reattach attachments to objects/players";
2331 warn "reattach";
2332 _global_reattach; 2360 _global_reattach;
2361 warn "reattach attachments to maps";
2333 reattach $_ for values %MAP; 2362 reattach $_ for values %MAP;
2334 }; 2363 };
2335 2364
2336 if ($@) { 2365 if ($@) {
2337 warn $@; 2366 warn $@;
2338 warn "error while reloading, exiting."; 2367 warn "error while reloading, exiting.";
2339 exit 1; 2368 exit 1;
2340 } 2369 }
2341 2370
2342 warn "reloaded successfully"; 2371 warn "reloaded";
2343}; 2372};
2344
2345#############################################################################
2346
2347unless ($LINK_MAP) {
2348 $LINK_MAP = cf::map::new;
2349
2350 $LINK_MAP->width (41);
2351 $LINK_MAP->height (41);
2352 $LINK_MAP->alloc;
2353 $LINK_MAP->path ("{link}");
2354 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2355 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2356
2357 # dirty hack because... archetypes are not yet loaded
2358 Event->timer (
2359 after => 10,
2360 cb => sub {
2361 $_[0]->w->cancel;
2362
2363 # provide some exits "home"
2364 my $exit = cf::object::new "exit";
2365
2366 $exit->slaying ($EMERGENCY_POSITION->[0]);
2367 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2368 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2369
2370 $LINK_MAP->insert ($exit->clone, 19, 19);
2371 $LINK_MAP->insert ($exit->clone, 19, 20);
2372 $LINK_MAP->insert ($exit->clone, 19, 21);
2373 $LINK_MAP->insert ($exit->clone, 20, 19);
2374 $LINK_MAP->insert ($exit->clone, 20, 21);
2375 $LINK_MAP->insert ($exit->clone, 21, 19);
2376 $LINK_MAP->insert ($exit->clone, 21, 20);
2377 $LINK_MAP->insert ($exit->clone, 21, 21);
2378
2379 $exit->destroy;
2380 });
2381
2382 $LINK_MAP->{deny_save} = 1;
2383 $LINK_MAP->{deny_reset} = 1;
2384
2385 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2386}
2387
2388register "<global>", __PACKAGE__;
2389 2373
2390register_command "reload" => sub { 2374register_command "reload" => sub {
2391 my ($who, $arg) = @_; 2375 my ($who, $arg) = @_;
2392 2376
2393 if ($who->flag (FLAG_WIZ)) { 2377 if ($who->flag (FLAG_WIZ)) {
… …
2403 reentrant => 0, 2387 reentrant => 0,
2404 prio => 0, 2388 prio => 0,
2405 at => $NEXT_TICK || $TICK, 2389 at => $NEXT_TICK || $TICK,
2406 data => WF_AUTOCANCEL, 2390 data => WF_AUTOCANCEL,
2407 cb => sub { 2391 cb => sub {
2392 $NOW = Event::time;
2393
2408 cf::server_tick; # one server iteration 2394 cf::server_tick; # one server iteration
2409 $RUNTIME += $TICK; 2395 $RUNTIME += $TICK;
2410 $NEXT_TICK += $TICK; 2396 $NEXT_TICK += $TICK;
2411 2397
2412 $WAIT_FOR_TICK->broadcast; 2398 $WAIT_FOR_TICK->broadcast;
… …
2420 }, 2406 },
2421); 2407);
2422 2408
2423IO::AIO::max_poll_time $TICK * 0.2; 2409IO::AIO::max_poll_time $TICK * 0.2;
2424 2410
2425Event->io ( 2411$AIO_POLL_WATCHER = Event->io (
2426 fd => IO::AIO::poll_fileno, 2412 fd => IO::AIO::poll_fileno,
2427 poll => 'r', 2413 poll => 'r',
2428 prio => 5, 2414 prio => 5,
2429 data => WF_AUTOCANCEL, 2415 data => WF_AUTOCANCEL,
2430 cb => \&IO::AIO::poll_cb, 2416 cb => \&IO::AIO::poll_cb,
2431); 2417);
2432 2418
2433Event->timer ( 2419$WRITE_RUNTIME_WATCHER = Event->timer (
2434 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2435 after => 0, 2421 after => 0,
2436 interval => 10, 2422 interval => 10,
2437 cb => sub { 2423 cb => sub {
2438 (Coro::unblock_sub { 2424 (Coro::unblock_sub {

Diff Legend

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