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.155 by root, Tue Jan 9 21:32:42 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
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
… …
799# object support 683# object support
800 684
801sub reattach { 685sub reattach {
802 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
803 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804 690
805 my $registry = $obj->registry; 691 my $registry = $obj->registry;
806 692
807 @$registry = (); 693 @$registry = ();
808 694
… …
940=cut 826=cut
941 827
942sub register_extcmd { 828sub register_extcmd {
943 my ($name, $cb) = @_; 829 my ($name, $cb) = @_;
944 830
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 831 $EXTCMD{$name} = $cb;
949} 832}
950 833
951cf::player->attach ( 834cf::player->attach (
952 on_command => sub { 835 on_command => sub {
953 my ($pl, $name, $params) = @_; 836 my ($pl, $name, $params) = @_;
… …
966 849
967 my $msg = eval { from_json $buf }; 850 my $msg = eval { from_json $buf };
968 851
969 if (ref $msg) { 852 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 853 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 854 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 855 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 856 }
974 } 857 }
975 } else { 858 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 859 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 861
979 cf::override; 862 cf::override;
980 }, 863 },
981); 864);
982 865
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 866sub load_extension {
990 my ($path) = @_; 867 my ($path) = @_;
991 868
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 869 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 870 my $base = $1;
994 my $pkg = $1; 871 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 872 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 873 $pkg = "ext::$pkg";
997 874
998 warn "loading '$path' into '$pkg'\n"; 875 warn "... loading '$path' into '$pkg'\n";
999 876
1000 open my $fh, "<:utf8", $path 877 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 878 or die "$path: $!";
1002 879
1003 my $source = 880 my $source =
1004 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 884 . "\n};\n1";
1008 885
1009 eval $source 886 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 888 : "extension disabled.\n";
1012 889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 890 warn $@;
1014 $ext_pkg{$base} = $pkg; 891 warn "mandatory extension failed to load, exiting.\n";
1015 892 exit 1;
1016# no strict 'refs'; 893 }
1017# @{"$pkg\::ISA"} = ext::; 894 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# } 895 }
1032 896
1033 # remove commands 897 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} 898}
1058 899
1059sub load_extensions { 900sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 901 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 902 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1066 } 907 }
1067} 908}
1068 909
1069############################################################################# 910#############################################################################
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 911
1085=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1086 913
1087Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1088 915
… …
1224 \@logins 1051 \@logins
1225} 1052}
1226 1053
1227=item $player->maps 1054=item $player->maps
1228 1055
1229Returns 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
1230player. May block. 1057player. May block.
1231 1058
1232=cut 1059=cut
1233 1060
1234sub maps($) { 1061sub maps($) {
… …
1240 my @paths; 1067 my @paths;
1241 1068
1242 for (@$files) { 1069 for (@$files) {
1243 utf8::decode $_; 1070 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1071 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1072 next unless /^$PATH_SEP/o;
1246 1073
1247 s/$PATH_SEP/\//g; 1074 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1076 }
1250 1077
1251 \@paths 1078 \@paths
1252} 1079}
1253 1080
… …
1279package cf::map; 1106package cf::map;
1280 1107
1281use Fcntl; 1108use Fcntl;
1282use Coro::AIO; 1109use Coro::AIO;
1283 1110
1111use overload
1112 '""' => \&as_string;
1113
1284our $MAX_RESET = 3600; 1114our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1115our $DEFAULT_RESET = 3000;
1286 1116
1287sub generate_random_map { 1117sub generate_random_map {
1288 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1289 1119
1290 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1121 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1127 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1128 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1129 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $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},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (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
1304} 1239}
1305 1240
1306# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1307# all maps in C++... 1242# all maps in C++...
1308sub change_all_map_light { 1243sub change_all_map_light {
… …
1310 1245
1311 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1313} 1248}
1314 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
1315sub try_load_header($) { 1258sub load_header_from($) {
1316 my ($path) = @_; 1259 my ($self, $path) = @_;
1317 1260
1318 utf8::encode $path; 1261 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1320 or return; 1263 or return;
1321 1264
1322 my $map = cf::map::new 1265 $self->_load_header ($path)
1323 or return; 1266 or return;
1324 1267
1325 # for better error messages only, will be overwritten 1268 $self->{load_path} = $path;
1326 $map->path ($path);
1327 1269
1328 $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
1329 or return; 1296 or return;
1330 1297
1331 $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 }
1332 1303
1333 $map 1304 1
1334} 1305}
1335 1306
1336sub find; 1307sub find;
1337sub find { 1308sub find {
1338 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1339 1310
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1312
1345 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1346 1314
1347 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1349 1317 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; 1318 or return;
1369 1319
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; 1320 $map->{last_save} = $cf::RUNTIME;
1382 1321
1383 Coro::cede; 1322 $map->load_header
1323 or return;
1384 1324
1385 if ($map->should_reset) { 1325 if ($map->should_reset) {
1386 $map->reset; 1326 $map->reset;
1387 undef $guard; 1327 undef $guard;
1388 $map = find $path 1328 $map = find $path
1389 or return; 1329 or return;
1390 } 1330 }
1391 1331
1392 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1393 } 1333 }
1394} 1334}
1395 1335
1396sub load { 1336sub load {
1397 my ($self) = @_; 1337 my ($self) = @_;
1398 1338
1399 my $path = $self->{path}; 1339 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1401 1341
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1343
1404 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1405 1345
1406 $self->alloc; 1346 $self->alloc;
1407 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1348 or return;
1409 1349
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1412 1352
1413 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1354 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1356 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1418 } 1358 }
1419 } 1359 }
1420 1360
1421 Coro::cede; 1361 Coro::cede;
1422 1362
1423 # now do the right thing for maps 1363 # now do the right thing for maps
1424 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1425 1365
1426 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1367 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1433 $self->set_darkness_map; 1371 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1436 $self->activate; 1375 $self->activate;
1437 } 1376 }
1438 1377
1439 Coro::cede;
1440
1441 $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
1388}
1389
1390# find and load all maps in the 3x3 area around a map
1391sub load_diag {
1392 my ($map) = @_;
1393
1394 my @diag; # diagonal neighbours
1395
1396 for (0 .. 3) {
1397 my $neigh = $map->tile_path ($_)
1398 or next;
1399 $neigh = find $neigh, $map
1400 or next;
1401 $neigh->load;
1402
1403 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1404 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1405 }
1406
1407 for (@diag) {
1408 my $neigh = find @$_
1409 or next;
1410 $neigh->load;
1411 }
1442} 1412}
1443 1413
1444sub find_sync { 1414sub find_sync {
1445 my ($path, $origin) = @_; 1415 my ($path, $origin) = @_;
1446 1416
1447 cf::sync_job { cf::map::find $path, $origin } 1417 cf::sync_job { find $path, $origin }
1448} 1418}
1449 1419
1450sub do_load_sync { 1420sub do_load_sync {
1451 my ($map) = @_; 1421 my ($map) = @_;
1452 1422
1453 cf::sync_job { $map->load }; 1423 cf::sync_job { $map->load };
1454} 1424}
1455 1425
1426our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async {
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439
1440sub find_async {
1441 my ($path, $origin) = @_;
1442
1443 $path = normalise $path, $origin && $origin->{path};
1444
1445 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 }
1448
1449 $MAP_PREFETCH{$path} = 0;
1450 $MAP_PREFETCHER->ready;
1451
1452 ()
1453}
1454
1456sub save { 1455sub save {
1457 my ($self) = @_; 1456 my ($self) = @_;
1458 1457
1459 my $lock = cf::lock_acquire "map_data:" . $self->path; 1458 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460 1459
1461 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1462 1461
1463 return unless $self->dirty; 1462 return unless $self->dirty;
1464 1463
1465 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1467 1466
1468 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1469 1468
1470 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1471 1470
… …
1474 cf::async { 1473 cf::async {
1475 $_->contr->save for $self->players; 1474 $_->contr->save for $self->players;
1476 }; 1475 };
1477 1476
1478 if ($uniq) { 1477 if ($uniq) {
1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1480 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1481 } else { 1480 } else {
1482 $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);
1483 } 1482 }
1484} 1483}
1485 1484
1486sub swap_out { 1485sub swap_out {
1487 my ($self) = @_; 1486 my ($self) = @_;
… …
1501 1500
1502sub reset_at { 1501sub reset_at {
1503 my ($self) = @_; 1502 my ($self) = @_;
1504 1503
1505 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1507 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1508 1507
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 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;
1511 1510
… …
1516 my ($self) = @_; 1515 my ($self) = @_;
1517 1516
1518 $self->reset_at <= $cf::RUNTIME 1517 $self->reset_at <= $cf::RUNTIME
1519} 1518}
1520 1519
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 { 1520sub rename {
1530 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1531 1522
1523 normalise $new_path;
1524
1532 $self->unlink_save; 1525 $self->unlink_save;
1533 1526
1534 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1535 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1536 $self->path ($self->{path}->as_string);
1537 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1538 1530
1539 $self->save; 1531 $self->save;
1540} 1532}
1541 1533
1542sub reset { 1534sub reset {
1543 my ($self) = @_; 1535 my ($self) = @_;
1544 1536
1545 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1546 1538
1547 return if $self->players; 1539 return if $self->players;
1548 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1549 1541
1550 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1551 1543
1552 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1553 1548
1554 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1555 1550
1556 $self->unlink_save; 1551 $self->unlink_save;
1557 $self->destroy; 1552 $self->destroy;
… …
1566 $self->reset_timeout (1); 1561 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++)); 1562 $self->rename ("{nuke}/" . ($nuke_counter++));
1568 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1569} 1564}
1570 1565
1571sub customise_for { 1566=item cf::map::unique_maps
1572 my ($map, $ob) = @_;
1573 1567
1574 if ($map->per_player) { 1568Returns an arrayref of paths of all shared maps that have
1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1569instantiated unique items. May block.
1576 }
1577 1570
1578 $map 1571=cut
1572
1573sub unique_maps() {
1574 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1575 or return;
1576
1577 my @paths;
1578
1579 for (@$files) {
1580 utf8::decode $_;
1581 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o;
1583
1584 s/\.map$//;
1585 push @paths, $_;
1586 }
1587
1588 \@paths
1579} 1589}
1580 1590
1581package cf; 1591package cf;
1582 1592
1583=back 1593=back
… …
1655 1665
1656=item $player_object->enter_link 1666=item $player_object->enter_link
1657 1667
1658Freezes 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}>).
1659 1669
1660The 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
1661I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1662 1672
1673Will never block.
1674
1663=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1664 1676
1665Moves 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
1666map 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
1667location 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
1668to the emergency map position. 1680fails, to the emergency map position.
1669 1681
1670Might block. 1682Might block.
1671 1683
1672=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}
1673 1695
1674sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1675 my ($self) = @_; 1697 my ($self) = @_;
1676 1698
1677 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1678 1700
1679 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1680 1702
1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1682 if $self->map; 1704 if $self->map;
1683 1705
1684 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1685} 1707}
1686 1708
1687sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1688 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1689 1711
… …
1707 # use -1 or undef as default coordinates, not 0, 0 1729 # use -1 or undef as default coordinates, not 0, 0
1708 ($x, $y) = ($map->enter_x, $map->enter_y) 1730 ($x, $y) = ($map->enter_x, $map->enter_y)
1709 if $x <=0 && $y <= 0; 1731 if $x <=0 && $y <= 0;
1710 1732
1711 $map->load; 1733 $map->load;
1734 $map->load_diag;
1712 1735
1713 return unless $self->contr->active; 1736 return unless $self->contr->active;
1714 $self->activate_recursive; 1737 $self->activate_recursive;
1715 $self->enter_map ($map, $x, $y); 1738 $self->enter_map ($map, $x, $y);
1716} 1739}
… …
1752=cut 1775=cut
1753 1776
1754sub cf::object::player::goto { 1777sub cf::object::player::goto {
1755 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1756 1779
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1760 $self->enter_link; 1780 $self->enter_link;
1761 1781
1762 (async { 1782 (async {
1763 my $map = cf::map::find $path->as_string; 1783 my $map = cf::map::find $path;
1764 $map = $map->customise_for ($self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1765 1785
1766# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1767# if $map; 1787# if $map;
1768 1788
… …
1833 $self->deactivate_recursive; # just to be sure 1853 $self->deactivate_recursive; # just to be sure
1834 unless (eval { 1854 unless (eval {
1835 prepare_random_map $exit 1855 prepare_random_map $exit
1836 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1837 1857
1838 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;
1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1840 1860
1841 1; 1861 1;
1842 }) { 1862 }) {
1843 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
1844 . "I'll try to bring you back to the map you were before. " 1864 . "I'll try to bring you back to the map you were before. "
1845 . "Please report this to the dungeon master", 1865 . "Please report this to the dungeon master!",
1846 cf::NDI_UNIQUE | cf::NDI_RED); 1866 cf::NDI_UNIQUE | cf::NDI_RED);
1847 1867
1848 warn "ERROR in enter_exit: $@"; 1868 warn "ERROR in enter_exit: $@";
1849 $self->leave_link; 1869 $self->leave_link;
1850 } 1870 }
… …
2218 }, 2238 },
2219 ); 2239 );
2220 } 2240 }
2221} 2241}
2222 2242
2223sub emergency_save { 2243sub emergency_save() {
2224 my $freeze_guard = cf::freeze_mainloop; 2244 my $freeze_guard = cf::freeze_mainloop;
2225 2245
2226 warn "enter emergency perl save\n"; 2246 warn "enter emergency perl save\n";
2227 2247
2228 cf::sync_job { 2248 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl 2249 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players 2250 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously. 2251 # and maps saved/destroyed asynchronously.
2232 warn "begin emergency player save\n"; 2252 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) { 2253 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next; 2254 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next; 2255 $pl->valid or next;
2236 $pl->save; 2256 $pl->save;
… …
2256 return; 2276 return;
2257 } 2277 }
2258 2278
2259 warn "reloading..."; 2279 warn "reloading...";
2260 2280
2281 warn "freezing server";
2261 my $guard = freeze_mainloop; 2282 my $guard = freeze_mainloop;
2262 cf::emergency_save; 2283 cf::emergency_save;
2263 2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2288
2264 eval { 2289 eval {
2265 # 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
2266 2291
2267 # cancel all watchers 2292 warn "cancel all watchers";
2268 for (Event::all_watchers) { 2293 for (Event::all_watchers) {
2269 $_->cancel if $_->data & WF_AUTOCANCEL; 2294 $_->cancel if $_->data & WF_AUTOCANCEL;
2270 } 2295 }
2271 2296
2272 # cancel all extension coros 2297 warn "cancel all extension coros";
2273 $_->cancel for values %EXT_CORO; 2298 $_->cancel for values %EXT_CORO;
2274 %EXT_CORO = (); 2299 %EXT_CORO = ();
2275 2300
2301 warn "remove commands";
2302 %COMMAND = ();
2303
2304 warn "remove ext commands";
2305 %EXTCMD = ();
2306
2276 # unload all extensions 2307 warn "unload/nuke all extensions";
2277 for (@exts) { 2308 for my $pkg (@EXTS) {
2278 warn "unloading <$_>"; 2309 warn "... unloading $pkg";
2279 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: $@";
2280 } 2316 }
2281 2317
2318 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg;
2320 }
2321
2282 # unload all modules loaded from $LIBDIR 2322 warn "unload all perl modules loaded from $LIBDIR";
2283 while (my ($k, $v) = each %INC) { 2323 while (my ($k, $v) = each %INC) {
2284 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2285 2325
2286 warn "removing <$k>"; 2326 warn "removing <$k>";
2287 delete $INC{$k}; 2327 delete $INC{$k};
… …
2294 } 2334 }
2295 2335
2296 Symbol::delete_package $k; 2336 Symbol::delete_package $k;
2297 } 2337 }
2298 2338
2299 # sync database to disk
2300 cf::db_sync;
2301 IO::AIO::flush;
2302
2303 # get rid of safe::, as good as possible 2339 warn "get rid of safe::, as good as possible";
2304 Symbol::delete_package "safe::$_" 2340 Symbol::delete_package "safe::$_"
2305 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);
2306 2342
2307 # remove register_script_function callbacks
2308 # TODO
2309
2310 # unload cf.pm "a bit" 2343 warn "unload cf.pm \"a bit\"";
2311 delete $INC{"cf.pm"}; 2344 delete $INC{"cf.pm"};
2312 2345
2313 # don't, removes xs symbols, too, 2346 # don't, removes xs symbols, too,
2314 # and global variables created in xs 2347 # and global variables created in xs
2315 #Symbol::delete_package __PACKAGE__; 2348 #Symbol::delete_package __PACKAGE__;
2316 2349
2317 # reload cf.pm
2318 warn "reloading cf.pm"; 2350 warn "reloading cf.pm";
2319 require cf; 2351 require cf;
2320 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2321 2353
2322 # load config and database again 2354 warn "load config and database again";
2323 cf::cfg_load; 2355 cf::cfg_load;
2324 cf::db_load; 2356 cf::db_load;
2325 2357
2326 # load extensions
2327 warn "load extensions"; 2358 warn "load extensions";
2328 cf::load_extensions; 2359 cf::load_extensions;
2329 2360
2330 # reattach attachments to objects 2361 warn "reattach attachments to objects/players";
2331 warn "reattach";
2332 _global_reattach; 2362 _global_reattach;
2363 warn "reattach attachments to maps";
2333 reattach $_ for values %MAP; 2364 reattach $_ for values %MAP;
2334 }; 2365 };
2335 2366
2336 if ($@) { 2367 if ($@) {
2337 warn $@; 2368 warn $@;
2338 warn "error while reloading, exiting."; 2369 warn "error while reloading, exiting.";
2339 exit 1; 2370 exit 1;
2340 } 2371 }
2341 2372
2342 warn "reloaded successfully"; 2373 warn "reloaded";
2343}; 2374};
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 2375
2390register_command "reload" => sub { 2376register_command "reload" => sub {
2391 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2392 2378
2393 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
… …
2403 reentrant => 0, 2389 reentrant => 0,
2404 prio => 0, 2390 prio => 0,
2405 at => $NEXT_TICK || $TICK, 2391 at => $NEXT_TICK || $TICK,
2406 data => WF_AUTOCANCEL, 2392 data => WF_AUTOCANCEL,
2407 cb => sub { 2393 cb => sub {
2394 $NOW = Event::time;
2395
2408 cf::server_tick; # one server iteration 2396 cf::server_tick; # one server iteration
2409 $RUNTIME += $TICK; 2397 $RUNTIME += $TICK;
2410 $NEXT_TICK += $TICK; 2398 $NEXT_TICK += $TICK;
2411 2399
2412 $WAIT_FOR_TICK->broadcast; 2400 $WAIT_FOR_TICK->broadcast;
… …
2420 }, 2408 },
2421); 2409);
2422 2410
2423IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2424 2412
2425Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2426 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2427 poll => 'r', 2415 poll => 'r',
2428 prio => 5, 2416 prio => 5,
2429 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2430 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2431); 2419);
2432 2420
2433Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2434 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2435 after => 0, 2423 after => 0,
2436 interval => 10, 2424 interval => 10,
2437 cb => sub { 2425 cb => sub {
2438 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

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