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.158 by root, Wed Jan 10 19:52:43 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
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 373
495############################################################################# 374#############################################################################
496 375
497=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
498 377
… …
945=cut 824=cut
946 825
947sub register_extcmd { 826sub register_extcmd {
948 my ($name, $cb) = @_; 827 my ($name, $cb) = @_;
949 828
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 829 $EXTCMD{$name} = $cb;
954} 830}
955 831
956cf::player->attach ( 832cf::player->attach (
957 on_command => sub { 833 on_command => sub {
958 my ($pl, $name, $params) = @_; 834 my ($pl, $name, $params) = @_;
… …
971 847
972 my $msg = eval { from_json $buf }; 848 my $msg = eval { from_json $buf };
973 849
974 if (ref $msg) { 850 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 851 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 852 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 853 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 854 }
979 } 855 }
980 } else { 856 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 857 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 859
984 cf::override; 860 cf::override;
985 }, 861 },
986); 862);
987 863
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 864sub load_extension {
995 my ($path) = @_; 865 my ($path) = @_;
996 866
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 867 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 868 my $base = $1;
999 my $pkg = $1; 869 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 870 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 871 $pkg = "ext::$pkg";
1002 872
1003 warn "loading '$path' into '$pkg'\n"; 873 warn "... loading '$path' into '$pkg'\n";
1004 874
1005 open my $fh, "<:utf8", $path 875 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 876 or die "$path: $!";
1007 877
1008 my $source = 878 my $source =
1009 "package $pkg; use strict; use utf8;\n" 879 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 880 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 881 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 882 . "\n};\n1";
1013 883
1014 eval $source 884 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 885 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 886 : "extension disabled.\n";
1017 887 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 888 warn $@;
1019 $ext_pkg{$base} = $pkg; 889 warn "mandatory extension failed to load, exiting.\n";
1020 890 exit 1;
1021# no strict 'refs'; 891 }
1022# @{"$pkg\::ISA"} = ext::; 892 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# } 893 }
1037 894
1038 # remove commands 895 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} 896}
1063 897
1064sub load_extensions { 898sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 899 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 900 next unless -r $ext;
… …
1070 } or warn "$ext not loaded: $@"; 904 } or warn "$ext not loaded: $@";
1071 } 905 }
1072} 906}
1073 907
1074############################################################################# 908#############################################################################
1075# load/save/clean perl data associated with a map
1076
1077*cf::mapsupport::on_clean = sub {
1078 my ($map) = @_;
1079
1080 my $path = $map->tmpname;
1081 defined $path or return;
1082
1083 unlink "$path.pst";
1084};
1085
1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088#############################################################################
1089 909
1090=head2 CORE EXTENSIONS 910=head2 CORE EXTENSIONS
1091 911
1092Functions and methods that extend core crossfire objects. 912Functions and methods that extend core crossfire objects.
1093 913
… …
1229 \@logins 1049 \@logins
1230} 1050}
1231 1051
1232=item $player->maps 1052=item $player->maps
1233 1053
1234Returns 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
1235player. May block. 1055player. May block.
1236 1056
1237=cut 1057=cut
1238 1058
1239sub maps($) { 1059sub maps($) {
… …
1247 for (@$files) { 1067 for (@$files) {
1248 utf8::decode $_; 1068 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1069 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1070 next unless /^$PATH_SEP/o;
1251 1071
1072 s/\.map$//;
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1253 } 1074 }
1254 1075
1255 \@paths 1076 \@paths
1256} 1077}
1257 1078
… …
1283package cf::map; 1104package cf::map;
1284 1105
1285use Fcntl; 1106use Fcntl;
1286use Coro::AIO; 1107use Coro::AIO;
1287 1108
1109use overload
1110 '""' => \&as_string;
1111
1288our $MAX_RESET = 3600; 1112our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1113our $DEFAULT_RESET = 3000;
1290 1114
1291sub generate_random_map { 1115sub generate_random_map {
1292 my ($path, $rmp) = @_; 1116 my ($self, $rmp) = @_;
1293 1117
1294 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1119 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1123 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1124 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1125 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1126 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1127 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $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},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (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
1308} 1237}
1309 1238
1310# and all this just because we cannot iterate over 1239# and all this just because we cannot iterate over
1311# all maps in C++... 1240# all maps in C++...
1312sub change_all_map_light { 1241sub change_all_map_light {
… …
1314 1243
1315 $_->change_map_light ($change) 1244 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1245 for grep $_->outdoor, values %cf::MAP;
1317} 1246}
1318 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
1319sub try_load_header($) { 1256sub load_header_from($) {
1320 my ($path) = @_; 1257 my ($self, $path) = @_;
1321 1258
1322 utf8::encode $path; 1259 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1260 aio_open $path, O_RDONLY, 0
1324 or return; 1261 or return;
1325 1262
1326 my $map = cf::map::new 1263 $self->_load_header ($path)
1327 or return; 1264 or return;
1328 1265
1329 # for better error messages only, will be overwritten 1266 $self->{load_path} = $path;
1330 $map->path ($path);
1331 1267
1332 $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
1333 or return; 1294 or return;
1334 1295
1335 $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 }
1336 1301
1337 $map 1302 1
1338} 1303}
1339 1304
1340sub find; 1305sub find;
1341sub find { 1306sub find {
1342 my ($path, $origin) = @_; 1307 my ($path, $origin) = @_;
1343 1308
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1309 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1310
1349 cf::lock_wait "map_find:$key"; 1311 cf::lock_wait "map_find:$path";
1350 1312
1351 $cf::MAP{$key} || do { 1313 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1314 my $guard = cf::lock_acquire "map_find:$path";
1353 1315 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; 1316 or return;
1373 1317
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; 1318 $map->{last_save} = $cf::RUNTIME;
1386 1319
1387 Coro::cede; 1320 $map->load_header
1321 or return;
1388 1322
1389 if ($map->should_reset) { 1323 if ($map->should_reset) {
1390 $map->reset; 1324 $map->reset;
1391 undef $guard; 1325 undef $guard;
1392 $map = find $path 1326 $map = find $path
1393 or return; 1327 or return;
1394 } 1328 }
1395 1329
1396 $cf::MAP{$key} = $map 1330 $cf::MAP{$path} = $map
1397 } 1331 }
1398} 1332}
1399 1333
1400sub load { 1334sub load {
1401 my ($self) = @_; 1335 my ($self) = @_;
1402 1336
1403 my $path = $self->{path}; 1337 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1338 my $guard = cf::lock_acquire "map_load:$path";
1405 1339
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1340 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1341
1408 $self->in_memory (cf::MAP_LOADING); 1342 $self->in_memory (cf::MAP_LOADING);
1409 1343
1410 $self->alloc; 1344 $self->alloc;
1411 $self->load_objects ($self->{load_path}, 1) 1345 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1346 or return;
1413 1347
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1349 if delete $self->{load_original};
1416 1350
1417 if (my $uniq = $path->uniq_path) { 1351 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1352 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1353 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1354 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1355 $self->_load_objects ($uniq, 0);
1422 } 1356 }
1423 } 1357 }
1424 1358
1425 Coro::cede; 1359 Coro::cede;
1426 1360
1427 # now do the right thing for maps 1361 # now do the right thing for maps
1428 $self->link_multipart_objects; 1362 $self->link_multipart_objects;
1429 1363
1430 if ($self->{path}->is_style_map) { 1364 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1365 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1366 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1367 $self->update_buttons;
1368 Coro::cede;
1437 $self->set_darkness_map; 1369 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1370 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1371 unless $self->difficulty;
1372 Coro::cede;
1440 $self->activate; 1373 $self->activate;
1441 } 1374 }
1442 1375
1443 Coro::cede;
1444
1445 $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
1446} 1386}
1447 1387
1448# find and load all maps in the 3x3 area around a map 1388# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1389sub load_diag {
1450 my ($map) = @_; 1390 my ($map) = @_;
… …
1482} 1422}
1483 1423
1484our %MAP_PREFETCH; 1424our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1425our $MAP_PREFETCHER = Coro::async {
1486 while () { 1426 while () {
1487 while (%MAP_PREFETCH) { 1427 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 1428 my $map = find $path
1493 or next; 1429 or next;
1494 $map->load; 1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1495 } 1433 }
1496 Coro::schedule; 1434 Coro::schedule;
1497 } 1435 }
1498}; 1436};
1499 1437
1500sub find_async { 1438sub find_async {
1501 my ($path, $origin) = @_; 1439 my ($path, $origin) = @_;
1502 1440
1503 $path = new cf::path $path, $origin && $origin->path; 1441 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1442
1506 if (my $map = $cf::MAP{$key}) { 1443 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1445 }
1509 1446
1510 $MAP_PREFETCH{$key} = $path; 1447 $MAP_PREFETCH{$path} = 0;
1511 $MAP_PREFETCHER->ready; 1448 $MAP_PREFETCHER->ready;
1512 1449
1513 () 1450 ()
1514} 1451}
1515 1452
… …
1520 1457
1521 $self->{last_save} = $cf::RUNTIME; 1458 $self->{last_save} = $cf::RUNTIME;
1522 1459
1523 return unless $self->dirty; 1460 return unless $self->dirty;
1524 1461
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1462 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1463 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1464
1528 $self->{load_path} = $save; 1465 $self->{load_path} = $save;
1529 1466
1530 return if $self->{deny_save}; 1467 return if $self->{deny_save};
1531 1468
… …
1534 cf::async { 1471 cf::async {
1535 $_->contr->save for $self->players; 1472 $_->contr->save for $self->players;
1536 }; 1473 };
1537 1474
1538 if ($uniq) { 1475 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1476 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1477 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1478 } else {
1542 $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);
1543 } 1480 }
1544} 1481}
1545 1482
1546sub swap_out { 1483sub swap_out {
1547 my ($self) = @_; 1484 my ($self) = @_;
… …
1561 1498
1562sub reset_at { 1499sub reset_at {
1563 my ($self) = @_; 1500 my ($self) = @_;
1564 1501
1565 # TODO: safety, remove and allow resettable per-player maps 1502 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1503 return 1e99 if $self->isa ("ext::map_per_player");
1567 return 1e99 if $self->{deny_reset}; 1504 return 1e99 if $self->{deny_reset};
1568 1505
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 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;
1571 1508
… …
1576 my ($self) = @_; 1513 my ($self) = @_;
1577 1514
1578 $self->reset_at <= $cf::RUNTIME 1515 $self->reset_at <= $cf::RUNTIME
1579} 1516}
1580 1517
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 { 1518sub rename {
1590 my ($self, $new_path) = @_; 1519 my ($self, $new_path) = @_;
1591 1520
1521 normalise $new_path;
1522
1592 $self->unlink_save; 1523 $self->unlink_save;
1593 1524
1594 delete $cf::MAP{$self->path}; 1525 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path; 1526 $self->{path} = $new_path; $self->path ($self->{path});
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self; 1527 $cf::MAP{$self->path} = $self;
1598 1528
1599 $self->save; 1529 $self->save;
1600} 1530}
1601 1531
1602sub reset { 1532sub reset {
1603 my ($self) = @_; 1533 my ($self) = @_;
1604 1534
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1535 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1536
1607 return if $self->players; 1537 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1538 return if $self->isa ("ext::map_per_player");#d#
1609 1539
1610 warn "resetting map ", $self->path;#d# 1540 warn "resetting map ", $self->path;#d#
1611 1541
1612 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1543
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear;
1613 1546
1614 $_->clear_links_to ($self) for values %cf::MAP; 1547 $_->clear_links_to ($self) for values %cf::MAP;
1615 1548
1616 $self->unlink_save; 1549 $self->unlink_save;
1617 $self->destroy; 1550 $self->destroy;
… …
1626 $self->reset_timeout (1); 1559 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1560 $self->rename ("{nuke}/" . ($nuke_counter++));
1628 $self->reset; # polite request, might not happen 1561 $self->reset; # polite request, might not happen
1629} 1562}
1630 1563
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 1564=item cf::map::unique_maps
1642 1565
1643Returns an arrayref of cf::path's of all shared maps that have 1566Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1567instantiated unique items. May block.
1645 1568
1646=cut 1569=cut
1647 1570
1648sub unique_maps() { 1571sub unique_maps() {
… …
1654 for (@$files) { 1577 for (@$files) {
1655 utf8::decode $_; 1578 utf8::decode $_;
1656 next if /\.pst$/; 1579 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1580 next unless /^$PATH_SEP/o;
1658 1581
1582 s/\.map$//;
1659 push @paths, new cf::path $_; 1583 push @paths, $_;
1660 } 1584 }
1661 1585
1662 \@paths 1586 \@paths
1663} 1587}
1664 1588
… …
1739 1663
1740=item $player_object->enter_link 1664=item $player_object->enter_link
1741 1665
1742Freezes 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}>).
1743 1667
1744The 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
1745I<MUST> call C<leave_link> as soon as possible, though. 1669I<MUST> call C<leave_link> as soon as possible, though.
1746 1670
1671Will never block.
1672
1747=item $player_object->leave_link ($map, $x, $y) 1673=item $player_object->leave_link ($map, $x, $y)
1748 1674
1749Moves 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
1750map 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
1751location 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
1752to the emergency map position. 1678fails, to the emergency map position.
1753 1679
1754Might block. 1680Might block.
1755 1681
1756=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}
1757 1693
1758sub cf::object::player::enter_link { 1694sub cf::object::player::enter_link {
1759 my ($self) = @_; 1695 my ($self) = @_;
1760 1696
1761 $self->deactivate_recursive; 1697 $self->deactivate_recursive;
1762 1698
1763 return if $self->map == $LINK_MAP; 1699 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1700
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1702 if $self->map;
1767 1703
1768 $self->enter_map ($LINK_MAP, 20, 20); 1704 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1769} 1705}
1770 1706
1771sub cf::object::player::leave_link { 1707sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1708 my ($self, $map, $x, $y) = @_;
1773 1709
… …
1837=cut 1773=cut
1838 1774
1839sub cf::object::player::goto { 1775sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1776 my ($self, $path, $x, $y) = @_;
1841 1777
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1778 $self->enter_link;
1845 1779
1846 (async { 1780 (async {
1847 my $map = cf::map::find $path->as_string; 1781 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1782 $map = $map->customise_for ($self) if $map;
1849 1783
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1784# warn "entering ", $map->path, " at ($x, $y)\n"
1851# if $map; 1785# if $map;
1852 1786
… …
1917 $self->deactivate_recursive; # just to be sure 1851 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1852 unless (eval {
1919 prepare_random_map $exit 1853 prepare_random_map $exit
1920 if $exit->slaying eq "/!"; 1854 if $exit->slaying eq "/!";
1921 1855
1922 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;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1858
1925 1; 1859 1;
1926 }) { 1860 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1861 $self->message ("Something went wrong deep within the crossfire server. "
… …
2310 warn "enter emergency perl save\n"; 2244 warn "enter emergency perl save\n";
2311 2245
2312 cf::sync_job { 2246 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2247 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2248 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2249 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2250 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2251 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2252 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2253 $pl->valid or next;
2320 $pl->save; 2254 $pl->save;
… …
2340 return; 2274 return;
2341 } 2275 }
2342 2276
2343 warn "reloading..."; 2277 warn "reloading...";
2344 2278
2279 warn "freezing server";
2345 my $guard = freeze_mainloop; 2280 my $guard = freeze_mainloop;
2346 cf::emergency_save; 2281 cf::emergency_save;
2347 2282
2283 warn "sync database to disk";
2284 cf::db_sync;
2285 IO::AIO::flush;
2286
2348 eval { 2287 eval {
2349 # 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
2350 2289
2351 # cancel all watchers 2290 warn "cancel all watchers";
2352 for (Event::all_watchers) { 2291 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2292 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2293 }
2355 2294
2356 # cancel all extension coros 2295 warn "cancel all extension coros";
2357 $_->cancel for values %EXT_CORO; 2296 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2297 %EXT_CORO = ();
2359 2298
2299 warn "remove commands";
2300 %COMMAND = ();
2301
2302 warn "remove ext commands";
2303 %EXTCMD = ();
2304
2360 # unload all extensions 2305 warn "unload/nuke all extensions";
2361 for (@exts) { 2306 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2307 warn "... unloading $pkg";
2363 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: $@";
2364 } 2314 }
2365 2315
2316 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg;
2318 }
2319
2366 # unload all modules loaded from $LIBDIR 2320 warn "unload all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2321 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2323
2370 warn "removing <$k>"; 2324 warn "removing <$k>";
2371 delete $INC{$k}; 2325 delete $INC{$k};
… …
2378 } 2332 }
2379 2333
2380 Symbol::delete_package $k; 2334 Symbol::delete_package $k;
2381 } 2335 }
2382 2336
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2337 warn "get rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2338 Symbol::delete_package "safe::$_"
2389 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);
2390 2340
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2341 warn "unload cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2342 delete $INC{"cf.pm"};
2396 2343
2397 # don't, removes xs symbols, too, 2344 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2345 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2346 #Symbol::delete_package __PACKAGE__;
2400 2347
2401 # reload cf.pm
2402 warn "reloading cf.pm"; 2348 warn "reloading cf.pm";
2403 require cf; 2349 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2351
2406 # load config and database again 2352 warn "load config and database again";
2407 cf::cfg_load; 2353 cf::cfg_load;
2408 cf::db_load; 2354 cf::db_load;
2409 2355
2410 # load extensions
2411 warn "load extensions"; 2356 warn "load extensions";
2412 cf::load_extensions; 2357 cf::load_extensions;
2413 2358
2414 # reattach attachments to objects 2359 warn "reattach attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2360 _global_reattach;
2361 warn "reattach attachments to maps";
2417 reattach $_ for values %MAP; 2362 reattach $_ for values %MAP;
2418 }; 2363 };
2419 2364
2420 if ($@) { 2365 if ($@) {
2421 warn $@; 2366 warn $@;
2422 warn "error while reloading, exiting."; 2367 warn "error while reloading, exiting.";
2423 exit 1; 2368 exit 1;
2424 } 2369 }
2425 2370
2426 warn "reloaded successfully"; 2371 warn "reloaded";
2427}; 2372};
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 2373
2474register_command "reload" => sub { 2374register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2375 my ($who, $arg) = @_;
2476 2376
2477 if ($who->flag (FLAG_WIZ)) { 2377 if ($who->flag (FLAG_WIZ)) {
… …
2487 reentrant => 0, 2387 reentrant => 0,
2488 prio => 0, 2388 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2389 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2390 data => WF_AUTOCANCEL,
2491 cb => sub { 2391 cb => sub {
2392 $NOW = Event::time;
2393
2492 cf::server_tick; # one server iteration 2394 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2395 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2396 $NEXT_TICK += $TICK;
2495 2397
2496 $WAIT_FOR_TICK->broadcast; 2398 $WAIT_FOR_TICK->broadcast;
… …
2504 }, 2406 },
2505); 2407);
2506 2408
2507IO::AIO::max_poll_time $TICK * 0.2; 2409IO::AIO::max_poll_time $TICK * 0.2;
2508 2410
2509Event->io ( 2411$AIO_POLL_WATCHER = Event->io (
2510 fd => IO::AIO::poll_fileno, 2412 fd => IO::AIO::poll_fileno,
2511 poll => 'r', 2413 poll => 'r',
2512 prio => 5, 2414 prio => 5,
2513 data => WF_AUTOCANCEL, 2415 data => WF_AUTOCANCEL,
2514 cb => \&IO::AIO::poll_cb, 2416 cb => \&IO::AIO::poll_cb,
2515); 2417);
2516 2418
2517Event->timer ( 2419$WRITE_RUNTIME_WATCHER = Event->timer (
2518 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2519 after => 0, 2421 after => 0,
2520 interval => 10, 2422 interval => 10,
2521 cb => sub { 2423 cb => sub {
2522 (Coro::unblock_sub { 2424 (Coro::unblock_sub {

Diff Legend

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