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.169 by root, Sun Jan 14 01:09:46 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
… …
804# object support 683# object support
805 684
806sub reattach { 685sub reattach {
807 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
808 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
809 690
810 my $registry = $obj->registry; 691 my $registry = $obj->registry;
811 692
812 @$registry = (); 693 @$registry = ();
813 694
… …
945=cut 826=cut
946 827
947sub register_extcmd { 828sub register_extcmd {
948 my ($name, $cb) = @_; 829 my ($name, $cb) = @_;
949 830
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 831 $EXTCMD{$name} = $cb;
954} 832}
955 833
956cf::player->attach ( 834cf::player->attach (
957 on_command => sub { 835 on_command => sub {
958 my ($pl, $name, $params) = @_; 836 my ($pl, $name, $params) = @_;
… …
971 849
972 my $msg = eval { from_json $buf }; 850 my $msg = eval { from_json $buf };
973 851
974 if (ref $msg) { 852 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 853 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 854 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 855 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 856 }
979 } 857 }
980 } else { 858 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 859 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 861
984 cf::override; 862 cf::override;
985 }, 863 },
986); 864);
987 865
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 866sub load_extension {
995 my ($path) = @_; 867 my ($path) = @_;
996 868
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 869 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 870 my $base = $1;
999 my $pkg = $1; 871 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 872 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 873 $pkg = "ext::$pkg";
1002 874
1003 warn "loading '$path' into '$pkg'\n"; 875 warn "... loading '$path' into '$pkg'\n";
1004 876
1005 open my $fh, "<:utf8", $path 877 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 878 or die "$path: $!";
1007 879
1008 my $source = 880 my $source =
1009 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 884 . "\n};\n1";
1013 885
1014 eval $source 886 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 888 : "extension disabled.\n";
1017 889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 890 warn $@;
1019 $ext_pkg{$base} = $pkg; 891 warn "mandatory extension failed to load, exiting.\n";
1020 892 exit 1;
1021# no strict 'refs'; 893 }
1022# @{"$pkg\::ISA"} = ext::; 894 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# } 895 }
1037 896
1038 # remove commands 897 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} 898}
1063 899
1064sub load_extensions { 900sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 901 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 902 next unless -r $ext;
… …
1070 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1071 } 907 }
1072} 908}
1073 909
1074############################################################################# 910#############################################################################
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 911
1090=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1091 913
1092Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1093 915
… …
1229 \@logins 1051 \@logins
1230} 1052}
1231 1053
1232=item $player->maps 1054=item $player->maps
1233 1055
1234Returns an arrayref of cf::path's of all maps that are private for this 1056Returns an arrayref of map paths that are private for this
1235player. May block. 1057player. May block.
1236 1058
1237=cut 1059=cut
1238 1060
1239sub maps($) { 1061sub maps($) {
… …
1247 for (@$files) { 1069 for (@$files) {
1248 utf8::decode $_; 1070 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1071 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1072 next unless /^$PATH_SEP/o;
1251 1073
1074 s/\.map$//;
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1253 } 1076 }
1254 1077
1255 \@paths 1078 \@paths
1256} 1079}
1257 1080
… …
1283package cf::map; 1106package cf::map;
1284 1107
1285use Fcntl; 1108use Fcntl;
1286use Coro::AIO; 1109use Coro::AIO;
1287 1110
1111use overload
1112 '""' => \&as_string;
1113
1288our $MAX_RESET = 3600; 1114our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1115our $DEFAULT_RESET = 3000;
1290 1116
1291sub generate_random_map { 1117sub generate_random_map {
1292 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1293 1119
1294 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1121 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1127 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1128 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1129 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1130 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region}) 1132 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 )
1134}
1135
1136sub register {
1137 my (undef, $regex) = @_;
1138 my $pkg = caller;
1139
1140 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__;
1142
1143 $EXT_MAP{$pkg} = qr<$regex>;
1144}
1145
1146# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)};
1148
1149sub normalise {
1150 my ($path, $base) = @_;
1151
1152 # map plan:
1153 #
1154 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched
1156 # ?xxx/... are special absolute paths
1157 # ?random/... random maps
1158 # /... normal maps
1159 # ~user/... per-player map of a specific user
1160
1161 $path =~ s/$PATH_SEP/\//go;
1162
1163 # treat it as relative path if it starts with
1164 # something that looks reasonable
1165 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1166 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1167
1168 $base =~ s{[^/]+/?$}{};
1169 $path = "$base/$path";
1170 }
1171
1172 for ($path) {
1173 redo if s{//}{/};
1174 redo if s{/\.?/}{/};
1175 redo if s{/[^/]+/\.\./}{/};
1176 }
1177
1178 $path
1179}
1180
1181sub new_from_path {
1182 my (undef, $path, $base) = @_;
1183
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185
1186 $path = normalise $path, $base;
1187
1188 for my $pkg (keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) {
1190 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc.
1193 return $self;
1194 }
1195 }
1196
1197 Carp::carp "unable to resolve path '$path'.";
1198 ()
1199}
1200
1201sub init {
1202 my ($self) = @_;
1203
1204 $self
1205}
1206
1207sub as_string {
1208 my ($self) = @_;
1209
1210 "$self->{path}"
1211}
1212
1213# the displayed name, this is a one way mapping
1214sub visible_name {
1215 &as_string
1216}
1217
1218# the original (read-only) location
1219sub load_path {
1220 my ($self) = @_;
1221
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1223}
1224
1225# the temporary/swap location
1226sub save_path {
1227 my ($self) = @_;
1228
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1231}
1232
1233# the unique path, undef == no special unique path
1234sub uniq_path {
1235 my ($self) = @_;
1236
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1308} 1239}
1309 1240
1310# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1311# all maps in C++... 1242# all maps in C++...
1312sub change_all_map_light { 1243sub change_all_map_light {
… …
1314 1245
1315 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1317} 1248}
1318 1249
1250sub unlink_save {
1251 my ($self) = @_;
1252
1253 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1256}
1257
1319sub try_load_header($) { 1258sub load_header_from($) {
1320 my ($path) = @_; 1259 my ($self, $path) = @_;
1321 1260
1322 utf8::encode $path; 1261 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1324 or return; 1263 or return;
1325 1264
1326 my $map = cf::map::new 1265 $self->_load_header ($path)
1327 or return; 1266 or return;
1328 1267
1329 # for better error messages only, will be overwritten 1268 $self->{load_path} = $path;
1330 $map->path ($path);
1331 1269
1332 $map->load_header ($path) 1270 1
1271}
1272
1273sub load_orig {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->load_path)
1277}
1278
1279sub load_temp {
1280 my ($self) = @_;
1281
1282 $self->load_header_from ($self->save_path)
1283}
1284
1285sub load_header {
1286 my ($self) = @_;
1287
1288 if ($self->load_temp) {
1289 $self->last_access ((delete $self->{last_access})
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else {
1295 $self->load_orig
1333 or return; 1296 or return;
1334 1297
1335 $map->{load_path} = $path; 1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 }
1336 1303
1337 $map 1304 1
1338} 1305}
1339 1306
1340sub find; 1307sub find;
1341sub find { 1308sub find {
1342 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1343 1310
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1312
1349 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1350 1314
1351 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1353 1317 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; 1318 or return;
1373 1319
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; 1320 $map->{last_save} = $cf::RUNTIME;
1386 1321
1387 Coro::cede; 1322 $map->load_header
1323 or return;
1388 1324
1389 if ($map->should_reset) { 1325 if ($map->should_reset) {
1390 $map->reset; 1326 $map->reset;
1391 undef $guard; 1327 undef $guard;
1392 $map = find $path 1328 $map = find $path
1393 or return; 1329 or return;
1394 } 1330 }
1395 1331
1396 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1397 } 1333 }
1398} 1334}
1399 1335
1400sub load { 1336sub load {
1401 my ($self) = @_; 1337 my ($self) = @_;
1402 1338
1403 my $path = $self->{path}; 1339 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1405 1341
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1343
1408 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1409 1345
1410 $self->alloc; 1346 $self->alloc;
1411 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1348 or return;
1413 1349
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1416 1352
1417 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1354 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1356 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1422 } 1358 }
1423 } 1359 }
1424 1360
1425 Coro::cede; 1361 Coro::cede;
1426 1362
1427 # now do the right thing for maps 1363 # now do the right thing for maps
1428 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1429 1365
1430 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1367 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1437 $self->set_darkness_map; 1371 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1440 $self->activate; 1375 $self->activate;
1441 } 1376 }
1442 1377
1443 Coro::cede;
1444
1445 $self->in_memory (cf::MAP_IN_MEMORY); 1378 $self->in_memory (cf::MAP_IN_MEMORY);
1379}
1380
1381sub customise_for {
1382 my ($self, $ob) = @_;
1383
1384 return find "~" . $ob->name . "/" . $self->{path}
1385 if $self->per_player;
1386
1387 $self
1446} 1388}
1447 1389
1448# find and load all maps in the 3x3 area around a map 1390# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1391sub load_diag {
1450 my ($map) = @_; 1392 my ($map) = @_;
… …
1482} 1424}
1483 1425
1484our %MAP_PREFETCH; 1426our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1427our $MAP_PREFETCHER = Coro::async {
1486 while () { 1428 while () {
1487 while (%MAP_PREFETCH) { 1429 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 1430 my $map = find $path
1493 or next; 1431 or next;
1494 $map->load; 1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1495 } 1435 }
1496 Coro::schedule; 1436 Coro::schedule;
1497 } 1437 }
1498}; 1438};
1499 1439
1500sub find_async { 1440sub find_async {
1501 my ($path, $origin) = @_; 1441 my ($path, $origin) = @_;
1502 1442
1503 $path = new cf::path $path, $origin && $origin->path; 1443 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1444
1506 if (my $map = $cf::MAP{$key}) { 1445 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1447 }
1509 1448
1510 $MAP_PREFETCH{$key} = $path; 1449 $MAP_PREFETCH{$path} = 0;
1511 $MAP_PREFETCHER->ready; 1450 $MAP_PREFETCHER->ready;
1512 1451
1513 () 1452 ()
1514} 1453}
1515 1454
… …
1520 1459
1521 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1522 1461
1523 return unless $self->dirty; 1462 return unless $self->dirty;
1524 1463
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1466
1528 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1529 1468
1530 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1531 1470
… …
1534 cf::async { 1473 cf::async {
1535 $_->contr->save for $self->players; 1474 $_->contr->save for $self->players;
1536 }; 1475 };
1537 1476
1538 if ($uniq) { 1477 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1480 } else {
1542 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1481 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1543 } 1482 }
1544} 1483}
1545 1484
1546sub swap_out { 1485sub swap_out {
1547 my ($self) = @_; 1486 my ($self) = @_;
… …
1561 1500
1562sub reset_at { 1501sub reset_at {
1563 my ($self) = @_; 1502 my ($self) = @_;
1564 1503
1565 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1567 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1568 1507
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1571 1510
… …
1576 my ($self) = @_; 1515 my ($self) = @_;
1577 1516
1578 $self->reset_at <= $cf::RUNTIME 1517 $self->reset_at <= $cf::RUNTIME
1579} 1518}
1580 1519
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 { 1520sub rename {
1590 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1591 1522
1523 normalise $new_path;
1524
1592 $self->unlink_save; 1525 $self->unlink_save;
1593 1526
1594 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1598 1530
1599 $self->save; 1531 $self->save;
1600} 1532}
1601 1533
1602sub reset { 1534sub reset {
1603 my ($self) = @_; 1535 my ($self) = @_;
1604 1536
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1538
1607 return if $self->players; 1539 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1609 1541
1610 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1611 1543
1612 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1613 1548
1614 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1615 1550
1616 $self->unlink_save; 1551 $self->unlink_save;
1617 $self->destroy; 1552 $self->destroy;
… …
1626 $self->reset_timeout (1); 1561 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1562 $self->rename ("{nuke}/" . ($nuke_counter++));
1628 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1629} 1564}
1630 1565
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 1566=item cf::map::unique_maps
1642 1567
1643Returns an arrayref of cf::path's of all shared maps that have 1568Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1569instantiated unique items. May block.
1645 1570
1646=cut 1571=cut
1647 1572
1648sub unique_maps() { 1573sub unique_maps() {
… …
1654 for (@$files) { 1579 for (@$files) {
1655 utf8::decode $_; 1580 utf8::decode $_;
1656 next if /\.pst$/; 1581 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1582 next unless /^$PATH_SEP/o;
1658 1583
1584 s/\.map$//;
1659 push @paths, new cf::path $_; 1585 push @paths, $_;
1660 } 1586 }
1661 1587
1662 \@paths 1588 \@paths
1663} 1589}
1664 1590
… …
1739 1665
1740=item $player_object->enter_link 1666=item $player_object->enter_link
1741 1667
1742Freezes the player and moves him/her to a special map (C<{link}>). 1668Freezes the player and moves him/her to a special map (C<{link}>).
1743 1669
1744The player should be reaosnably safe there for short amounts of time. You 1670The player should be reasonably safe there for short amounts of time. You
1745I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1746 1672
1673Will never block.
1674
1747=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1748 1676
1749Moves the player out of the specila link map onto the given map. If the 1677Moves 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 1678map. 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, 1679to the location he/she was before the call to C<enter_link>, or, if that
1752to the emergency map position. 1680fails, to the emergency map position.
1753 1681
1754Might block. 1682Might block.
1755 1683
1756=cut 1684=cut
1685
1686sub link_map {
1687 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1690 $LINK_MAP->load;
1691 }
1692
1693 $LINK_MAP
1694}
1757 1695
1758sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1759 my ($self) = @_; 1697 my ($self) = @_;
1760 1698
1761 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1762 1700
1763 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1702
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1704 if $self->map;
1767 1705
1768 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1769} 1707}
1770 1708
1771sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1773 1711
… …
1837=cut 1775=cut
1838 1776
1839sub cf::object::player::goto { 1777sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1841 1779
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1780 $self->enter_link;
1845 1781
1846 (async { 1782 (async {
1847 my $map = cf::map::find $path->as_string; 1783 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1849 1785
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1851# if $map; 1787# if $map;
1852 1788
… …
1917 $self->deactivate_recursive; # just to be sure 1853 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1854 unless (eval {
1919 prepare_random_map $exit 1855 prepare_random_map $exit
1920 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1921 1857
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1860
1925 1; 1861 1;
1926 }) { 1862 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
… …
2310 warn "enter emergency perl save\n"; 2246 warn "enter emergency perl save\n";
2311 2247
2312 cf::sync_job { 2248 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2249 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2250 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2251 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2252 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2253 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2254 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2255 $pl->valid or next;
2320 $pl->save; 2256 $pl->save;
… …
2340 return; 2276 return;
2341 } 2277 }
2342 2278
2343 warn "reloading..."; 2279 warn "reloading...";
2344 2280
2281 warn "freezing server";
2345 my $guard = freeze_mainloop; 2282 my $guard = freeze_mainloop;
2346 cf::emergency_save; 2283 cf::emergency_save;
2347 2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288
2348 eval { 2289 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2290 # if anything goes wrong in here, we should simply crash as we already saved
2350 2291
2351 # cancel all watchers 2292 warn "cancel all watchers";
2352 for (Event::all_watchers) { 2293 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2294 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2295 }
2355 2296
2356 # cancel all extension coros 2297 warn "cancel all extension coros";
2357 $_->cancel for values %EXT_CORO; 2298 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2299 %EXT_CORO = ();
2359 2300
2301 warn "remove commands";
2302 %COMMAND = ();
2303
2304 warn "remove ext commands";
2305 %EXTCMD = ();
2306
2360 # unload all extensions 2307 warn "unload/nuke all extensions";
2361 for (@exts) { 2308 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2309 warn "... unloading $pkg";
2363 unload_extension $_; 2310
2311 if (my $cb = $pkg->can ("unload")) {
2312 eval {
2313 $cb->($pkg);
2314 1
2315 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2316 }
2365 2317
2318 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg;
2320 }
2321
2366 # unload all modules loaded from $LIBDIR 2322 warn "unload all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2323 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2325
2370 warn "removing <$k>"; 2326 warn "removing <$k>";
2371 delete $INC{$k}; 2327 delete $INC{$k};
… …
2378 } 2334 }
2379 2335
2380 Symbol::delete_package $k; 2336 Symbol::delete_package $k;
2381 } 2337 }
2382 2338
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2339 warn "get rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2340 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2342
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2343 warn "unload cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2344 delete $INC{"cf.pm"};
2396 2345
2397 # don't, removes xs symbols, too, 2346 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2347 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2348 #Symbol::delete_package __PACKAGE__;
2400 2349
2401 # reload cf.pm
2402 warn "reloading cf.pm"; 2350 warn "reloading cf.pm";
2403 require cf; 2351 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2353
2406 # load config and database again 2354 warn "load config and database again";
2407 cf::cfg_load; 2355 cf::cfg_load;
2408 cf::db_load; 2356 cf::db_load;
2409 2357
2410 # load extensions
2411 warn "load extensions"; 2358 warn "load extensions";
2412 cf::load_extensions; 2359 cf::load_extensions;
2413 2360
2414 # reattach attachments to objects 2361 warn "reattach attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2362 _global_reattach;
2363 warn "reattach attachments to maps";
2417 reattach $_ for values %MAP; 2364 reattach $_ for values %MAP;
2418 }; 2365 };
2419 2366
2420 if ($@) { 2367 if ($@) {
2421 warn $@; 2368 warn $@;
2422 warn "error while reloading, exiting."; 2369 warn "error while reloading, exiting.";
2423 exit 1; 2370 exit 1;
2424 } 2371 }
2425 2372
2426 warn "reloaded successfully"; 2373 warn "reloaded";
2427}; 2374};
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 2375
2474register_command "reload" => sub { 2376register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2476 2378
2477 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
… …
2487 reentrant => 0, 2389 reentrant => 0,
2488 prio => 0, 2390 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2391 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2392 data => WF_AUTOCANCEL,
2491 cb => sub { 2393 cb => sub {
2394 $NOW = Event::time;
2395
2492 cf::server_tick; # one server iteration 2396 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2397 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2398 $NEXT_TICK += $TICK;
2495 2399
2496 $WAIT_FOR_TICK->broadcast; 2400 $WAIT_FOR_TICK->broadcast;
… …
2504 }, 2408 },
2505); 2409);
2506 2410
2507IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2508 2412
2509Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2510 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2511 poll => 'r', 2415 poll => 'r',
2512 prio => 5, 2416 prio => 5,
2513 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2514 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2515); 2419);
2516 2420
2517Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2518 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2519 after => 0, 2423 after => 0,
2520 interval => 10, 2424 interval => 10,
2521 cb => sub { 2425 cb => sub {
2522 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

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