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.171 by root, Sun Jan 14 12:24:48 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
… …
619our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
620our @CB_MAP = (); 504our @CB_MAP = ();
621 505
622my %attachment; 506my %attachment;
623 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
624sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
625 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
626 516
627 use sort 'stable'; 517 use sort 'stable';
628 518
… …
799# object support 689# object support
800 690
801sub reattach { 691sub reattach {
802 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
803 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804 696
805 my $registry = $obj->registry; 697 my $registry = $obj->registry;
806 698
807 @$registry = (); 699 @$registry = ();
808 700
… …
940=cut 832=cut
941 833
942sub register_extcmd { 834sub register_extcmd {
943 my ($name, $cb) = @_; 835 my ($name, $cb) = @_;
944 836
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 837 $EXTCMD{$name} = $cb;
949} 838}
950 839
951cf::player->attach ( 840cf::player->attach (
952 on_command => sub { 841 on_command => sub {
953 my ($pl, $name, $params) = @_; 842 my ($pl, $name, $params) = @_;
… …
966 855
967 my $msg = eval { from_json $buf }; 856 my $msg = eval { from_json $buf };
968 857
969 if (ref $msg) { 858 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 859 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 860 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 861 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 862 }
974 } 863 }
975 } else { 864 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 867
979 cf::override; 868 cf::override;
980 }, 869 },
981); 870);
982 871
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 872sub load_extension {
990 my ($path) = @_; 873 my ($path) = @_;
991 874
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 876 my $base = $1;
994 my $pkg = $1; 877 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 878 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 879 $pkg = "ext::$pkg";
997 880
998 warn "loading '$path' into '$pkg'\n"; 881 warn "... loading '$path' into '$pkg'\n";
999 882
1000 open my $fh, "<:utf8", $path 883 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 884 or die "$path: $!";
1002 885
1003 my $source = 886 my $source =
1004 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 890 . "\n};\n1";
1008 891
1009 eval $source 892 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 894 : "extension disabled.\n";
1012 895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 896 warn $@;
1014 $ext_pkg{$base} = $pkg; 897 warn "mandatory extension failed to load, exiting.\n";
1015 898 exit 1;
1016# no strict 'refs'; 899 }
1017# @{"$pkg\::ISA"} = ext::; 900 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# } 901 }
1032 902
1033 # remove commands 903 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} 904}
1058 905
1059sub load_extensions { 906sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 907 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 908 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1066 } 913 }
1067} 914}
1068 915
1069############################################################################# 916#############################################################################
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 917
1085=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1086 919
1087Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1088 921
… …
1224 \@logins 1057 \@logins
1225} 1058}
1226 1059
1227=item $player->maps 1060=item $player->maps
1228 1061
1229Returns an arrayref of cf::path's of all maps that are private for this 1062Returns an arrayref of map paths that are private for this
1230player. May block. 1063player. May block.
1231 1064
1232=cut 1065=cut
1233 1066
1234sub maps($) { 1067sub maps($) {
… …
1240 my @paths; 1073 my @paths;
1241 1074
1242 for (@$files) { 1075 for (@$files) {
1243 utf8::decode $_; 1076 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1078 next unless /^$PATH_SEP/o;
1246 1079
1247 s/$PATH_SEP/\//g; 1080 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1082 }
1250 1083
1251 \@paths 1084 \@paths
1252} 1085}
1253 1086
… …
1279package cf::map; 1112package cf::map;
1280 1113
1281use Fcntl; 1114use Fcntl;
1282use Coro::AIO; 1115use Coro::AIO;
1283 1116
1117use overload
1118 '""' => \&as_string;
1119
1284our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1286 1122
1287sub generate_random_map { 1123sub generate_random_map {
1288 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1289 1125
1290 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1127 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}) 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 )
1140}
1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 # we have to keep some variables in memory intact
1157 local $_[0]{path};
1158 local $_[0]{deny_save};
1159 local $_[0]{deny_reset};
1160
1161 $_[0]->SUPER::thawer_merge ($_[1]);
1162}
1163
1164sub normalise {
1165 my ($path, $base) = @_;
1166
1167 # map plan:
1168 #
1169 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched
1171 # ?xxx/... are special absolute paths
1172 # ?random/... random maps
1173 # /... normal maps
1174 # ~user/... per-player map of a specific user
1175
1176 $path =~ s/$PATH_SEP/\//go;
1177
1178 # treat it as relative path if it starts with
1179 # something that looks reasonable
1180 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1181 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1182
1183 $base =~ s{[^/]+/?$}{};
1184 $path = "$base/$path";
1185 }
1186
1187 for ($path) {
1188 redo if s{//}{/};
1189 redo if s{/\.?/}{/};
1190 redo if s{/[^/]+/\.\./}{/};
1191 }
1192
1193 $path
1194}
1195
1196sub new_from_path {
1197 my (undef, $path, $base) = @_;
1198
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200
1201 $path = normalise $path, $base;
1202
1203 for my $pkg (keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) {
1205 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc.
1208 return $self;
1209 }
1210 }
1211
1212 Carp::carp "unable to resolve path '$path'.";
1213 ()
1214}
1215
1216sub init {
1217 my ($self) = @_;
1218
1219 $self
1220}
1221
1222sub as_string {
1223 my ($self) = @_;
1224
1225 "$self->{path}"
1226}
1227
1228# the displayed name, this is a one way mapping
1229sub visible_name {
1230 &as_string
1231}
1232
1233# the original (read-only) location
1234sub load_path {
1235 my ($self) = @_;
1236
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1238}
1239
1240# the temporary/swap location
1241sub save_path {
1242 my ($self) = @_;
1243
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1246}
1247
1248# the unique path, undef == no special unique path
1249sub uniq_path {
1250 my ($self) = @_;
1251
1252 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1253 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304} 1254}
1305 1255
1306# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1307# all maps in C++... 1257# all maps in C++...
1308sub change_all_map_light { 1258sub change_all_map_light {
… …
1310 1260
1311 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1313} 1263}
1314 1264
1265sub unlink_save {
1266 my ($self) = @_;
1267
1268 utf8::encode (my $save = $self->save_path);
1269 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1270 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1271}
1272
1315sub try_load_header($) { 1273sub load_header_from($) {
1316 my ($path) = @_; 1274 my ($self, $path) = @_;
1317 1275
1318 utf8::encode $path; 1276 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1320 or return; 1278 or return;
1321 1279
1322 my $map = cf::map::new 1280 $self->_load_header ($path)
1323 or return; 1281 or return;
1324 1282
1325 # for better error messages only, will be overwritten 1283 $self->{load_path} = $path;
1326 $map->path ($path);
1327 1284
1328 $map->load_header ($path) 1285 1
1286}
1287
1288sub load_orig {
1289 my ($self) = @_;
1290
1291 $self->load_header_from ($self->load_path)
1292}
1293
1294sub load_temp {
1295 my ($self) = @_;
1296
1297 $self->load_header_from ($self->save_path)
1298}
1299
1300sub load_header {
1301 my ($self) = @_;
1302
1303 if ($self->load_temp) {
1304 $self->last_access ((delete $self->{last_access})
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else {
1310 $self->load_orig
1329 or return; 1311 or return;
1330 1312
1331 $map->{load_path} = $path; 1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 }
1332 1318
1333 $map 1319 1
1334} 1320}
1335 1321
1336sub find; 1322sub find;
1337sub find { 1323sub find {
1338 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1339 1325
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1327
1345 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1346 1329
1347 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1349 1332 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; 1333 or return;
1369 1334
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; 1335 $map->{last_save} = $cf::RUNTIME;
1382 1336
1383 Coro::cede; 1337 $map->load_header
1338 or return;
1384 1339
1385 if ($map->should_reset) { 1340 if ($map->should_reset) {
1341 $cf::WAIT_FOR_TICK->wait;
1386 $map->reset; 1342 $map->reset;
1387 undef $guard; 1343 undef $guard;
1388 $map = find $path 1344 $map = find $path
1389 or return; 1345 or return;
1390 } 1346 }
1391 1347
1392 $cf::MAP{$key} = $map 1348 $cf::MAP{$path} = $map
1393 } 1349 }
1394} 1350}
1395 1351
1396sub load { 1352sub load {
1397 my ($self) = @_; 1353 my ($self) = @_;
1398 1354
1399 my $path = $self->{path}; 1355 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1356 my $guard = cf::lock_acquire "map_load:$path";
1401 1357
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1358 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1359
1404 $self->in_memory (cf::MAP_LOADING); 1360 $self->in_memory (cf::MAP_LOADING);
1405 1361
1406 $self->alloc; 1362 $self->alloc;
1407 $self->load_objects ($self->{load_path}, 1) 1363 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1364 or return;
1409 1365
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1367 if delete $self->{load_original};
1412 1368
1413 if (my $uniq = $path->uniq_path) { 1369 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1370 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1371 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1372 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1373 $self->_load_objects ($uniq, 0);
1418 } 1374 }
1419 } 1375 }
1420 1376
1421 Coro::cede; 1377 Coro::cede;
1422 1378
1423 # now do the right thing for maps 1379 # now do the right thing for maps
1424 $self->link_multipart_objects; 1380 $self->link_multipart_objects;
1425 1381
1426 if ($self->{path}->is_style_map) { 1382 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1383 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1384 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1385 $self->update_buttons;
1386 Coro::cede;
1433 $self->set_darkness_map; 1387 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1388 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1389 unless $self->difficulty;
1390 Coro::cede;
1436 $self->activate; 1391 $self->activate;
1437 } 1392 }
1438 1393
1439 Coro::cede;
1440
1441 $self->in_memory (cf::MAP_IN_MEMORY); 1394 $self->in_memory (cf::MAP_IN_MEMORY);
1395}
1396
1397sub customise_for {
1398 my ($self, $ob) = @_;
1399
1400 return find "~" . $ob->name . "/" . $self->{path}
1401 if $self->per_player;
1402
1403 $self
1404}
1405
1406# find and load all maps in the 3x3 area around a map
1407sub load_diag {
1408 my ($map) = @_;
1409
1410 my @diag; # diagonal neighbours
1411
1412 for (0 .. 3) {
1413 my $neigh = $map->tile_path ($_)
1414 or next;
1415 $neigh = find $neigh, $map
1416 or next;
1417 $neigh->load;
1418
1419 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1420 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1421 }
1422
1423 for (@diag) {
1424 my $neigh = find @$_
1425 or next;
1426 $neigh->load;
1427 }
1442} 1428}
1443 1429
1444sub find_sync { 1430sub find_sync {
1445 my ($path, $origin) = @_; 1431 my ($path, $origin) = @_;
1446 1432
1447 cf::sync_job { cf::map::find $path, $origin } 1433 cf::sync_job { find $path, $origin }
1448} 1434}
1449 1435
1450sub do_load_sync { 1436sub do_load_sync {
1451 my ($map) = @_; 1437 my ($map) = @_;
1452 1438
1453 cf::sync_job { $map->load }; 1439 cf::sync_job { $map->load };
1454} 1440}
1455 1441
1442our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async {
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455
1456sub find_async {
1457 my ($path, $origin) = @_;
1458
1459 $path = normalise $path, $origin && $origin->{path};
1460
1461 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 }
1464
1465 $MAP_PREFETCH{$path} = 0;
1466 $MAP_PREFETCHER->ready;
1467
1468 ()
1469}
1470
1456sub save { 1471sub save {
1457 my ($self) = @_; 1472 my ($self) = @_;
1458 1473
1459 my $lock = cf::lock_acquire "map_data:" . $self->path; 1474 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460 1475
1461 $self->{last_save} = $cf::RUNTIME; 1476 $self->{last_save} = $cf::RUNTIME;
1462 1477
1463 return unless $self->dirty; 1478 return unless $self->dirty;
1464 1479
1465 my $save = $self->{path}->save_path; utf8::encode $save; 1480 my $save = $self->save_path; utf8::encode $save;
1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1481 my $uniq = $self->uniq_path; utf8::encode $uniq;
1467 1482
1468 $self->{load_path} = $save; 1483 $self->{load_path} = $save;
1469 1484
1470 return if $self->{deny_save}; 1485 return if $self->{deny_save};
1471 1486
… …
1474 cf::async { 1489 cf::async {
1475 $_->contr->save for $self->players; 1490 $_->contr->save for $self->players;
1476 }; 1491 };
1477 1492
1478 if ($uniq) { 1493 if ($uniq) {
1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1494 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1480 $self->save_objects ($uniq, cf::IO_UNIQUES); 1495 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1481 } else { 1496 } else {
1482 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1483 } 1498 }
1484} 1499}
1485 1500
1486sub swap_out { 1501sub swap_out {
1487 my ($self) = @_; 1502 my ($self) = @_;
… …
1501 1516
1502sub reset_at { 1517sub reset_at {
1503 my ($self) = @_; 1518 my ($self) = @_;
1504 1519
1505 # TODO: safety, remove and allow resettable per-player maps 1520 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel}; 1521 return 1e99 if $self->isa ("ext::map_per_player");#d#
1507 return 1e99 if $self->{deny_reset}; 1522 return 1e99 if $self->{deny_reset};
1508 1523
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1524 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1525 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1511 1526
… …
1516 my ($self) = @_; 1531 my ($self) = @_;
1517 1532
1518 $self->reset_at <= $cf::RUNTIME 1533 $self->reset_at <= $cf::RUNTIME
1519} 1534}
1520 1535
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 { 1536sub rename {
1530 my ($self, $new_path) = @_; 1537 my ($self, $new_path) = @_;
1531 1538
1539 normalise $new_path;
1540
1532 $self->unlink_save; 1541 $self->unlink_save;
1533 1542
1534 delete $cf::MAP{$self->path}; 1543 delete $cf::MAP{$self->path};
1535 $self->{path} = new cf::path $new_path; 1544 $self->{path} = $new_path; $self->path ($self->{path});
1536 $self->path ($self->{path}->as_string);
1537 $cf::MAP{$self->path} = $self; 1545 $cf::MAP{$self->path} = $self;
1538 1546
1539 $self->save; 1547 $self->save;
1540} 1548}
1541 1549
1542sub reset { 1550sub reset {
1543 my ($self) = @_; 1551 my ($self) = @_;
1544 1552
1545 my $lock = cf::lock_acquire "map_data:" . $self->path; 1553 my $lock = cf::lock_acquire "map_data:$self->{path}";
1546 1554
1547 return if $self->players; 1555 return if $self->players;
1548 return if $self->{path}{user_rel};#d# 1556 return if $self->isa ("ext::map_per_player");#d#
1549 1557
1550 warn "resetting map ", $self->path;#d# 1558 warn "resetting map ", $self->path;#d#
1551 1559
1552 delete $cf::MAP{$self->path}; 1560 delete $cf::MAP{$self->path};
1561
1562 $self->in_memory (cf::MAP_SWAPPED);
1563 $self->clear;
1553 1564
1554 $_->clear_links_to ($self) for values %cf::MAP; 1565 $_->clear_links_to ($self) for values %cf::MAP;
1555 1566
1556 $self->unlink_save; 1567 $self->unlink_save;
1557 $self->destroy; 1568 $self->destroy;
… …
1566 $self->reset_timeout (1); 1577 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++)); 1578 $self->rename ("{nuke}/" . ($nuke_counter++));
1568 $self->reset; # polite request, might not happen 1579 $self->reset; # polite request, might not happen
1569} 1580}
1570 1581
1571sub customise_for { 1582=item cf::map::unique_maps
1572 my ($map, $ob) = @_;
1573 1583
1574 if ($map->per_player) { 1584Returns an arrayref of paths of all shared maps that have
1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1585instantiated unique items. May block.
1576 }
1577 1586
1578 $map 1587=cut
1588
1589sub unique_maps() {
1590 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1591 or return;
1592
1593 my @paths;
1594
1595 for (@$files) {
1596 utf8::decode $_;
1597 next if /\.pst$/;
1598 next unless /^$PATH_SEP/o;
1599
1600 s/\.map$//;
1601 push @paths, $_;
1602 }
1603
1604 \@paths
1579} 1605}
1580 1606
1581package cf; 1607package cf;
1582 1608
1583=back 1609=back
… …
1655 1681
1656=item $player_object->enter_link 1682=item $player_object->enter_link
1657 1683
1658Freezes the player and moves him/her to a special map (C<{link}>). 1684Freezes the player and moves him/her to a special map (C<{link}>).
1659 1685
1660The player should be reaosnably safe there for short amounts of time. You 1686The player should be reasonably safe there for short amounts of time. You
1661I<MUST> call C<leave_link> as soon as possible, though. 1687I<MUST> call C<leave_link> as soon as possible, though.
1662 1688
1689Will never block.
1690
1663=item $player_object->leave_link ($map, $x, $y) 1691=item $player_object->leave_link ($map, $x, $y)
1664 1692
1665Moves the player out of the specila link map onto the given map. If the 1693Moves 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 1694map. 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, 1695to the location he/she was before the call to C<enter_link>, or, if that
1668to the emergency map position. 1696fails, to the emergency map position.
1669 1697
1670Might block. 1698Might block.
1671 1699
1672=cut 1700=cut
1701
1702sub link_map {
1703 unless ($LINK_MAP) {
1704 $LINK_MAP = cf::map::find "{link}"
1705 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1706 $LINK_MAP->load;
1707 }
1708
1709 $LINK_MAP
1710}
1673 1711
1674sub cf::object::player::enter_link { 1712sub cf::object::player::enter_link {
1675 my ($self) = @_; 1713 my ($self) = @_;
1676 1714
1677 $self->deactivate_recursive; 1715 $self->deactivate_recursive;
1678 1716
1679 return if $self->map == $LINK_MAP; 1717 return if UNIVERSAL::isa $self->map, "ext::map_link";
1680 1718
1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1719 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1682 if $self->map; 1720 if $self->map;
1683 1721
1684 $self->enter_map ($LINK_MAP, 20, 20); 1722 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1685} 1723}
1686 1724
1687sub cf::object::player::leave_link { 1725sub cf::object::player::leave_link {
1688 my ($self, $map, $x, $y) = @_; 1726 my ($self, $map, $x, $y) = @_;
1689 1727
… …
1707 # use -1 or undef as default coordinates, not 0, 0 1745 # use -1 or undef as default coordinates, not 0, 0
1708 ($x, $y) = ($map->enter_x, $map->enter_y) 1746 ($x, $y) = ($map->enter_x, $map->enter_y)
1709 if $x <=0 && $y <= 0; 1747 if $x <=0 && $y <= 0;
1710 1748
1711 $map->load; 1749 $map->load;
1750 $map->load_diag;
1712 1751
1713 return unless $self->contr->active; 1752 return unless $self->contr->active;
1714 $self->activate_recursive; 1753 $self->activate_recursive;
1715 $self->enter_map ($map, $x, $y); 1754 $self->enter_map ($map, $x, $y);
1716} 1755}
… …
1752=cut 1791=cut
1753 1792
1754sub cf::object::player::goto { 1793sub cf::object::player::goto {
1755 my ($self, $path, $x, $y) = @_; 1794 my ($self, $path, $x, $y) = @_;
1756 1795
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1760 $self->enter_link; 1796 $self->enter_link;
1761 1797
1762 (async { 1798 (async {
1763 my $map = cf::map::find $path->as_string; 1799 my $map = cf::map::find $path;
1764 $map = $map->customise_for ($self) if $map; 1800 $map = $map->customise_for ($self) if $map;
1765 1801
1766# warn "entering ", $map->path, " at ($x, $y)\n" 1802# warn "entering ", $map->path, " at ($x, $y)\n"
1767# if $map; 1803# if $map;
1768 1804
… …
1833 $self->deactivate_recursive; # just to be sure 1869 $self->deactivate_recursive; # just to be sure
1834 unless (eval { 1870 unless (eval {
1835 prepare_random_map $exit 1871 prepare_random_map $exit
1836 if $exit->slaying eq "/!"; 1872 if $exit->slaying eq "/!";
1837 1873
1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1874 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1875 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1840 1876
1841 1; 1877 1;
1842 }) { 1878 }) {
1843 $self->message ("Something went wrong deep within the crossfire server. " 1879 $self->message ("Something went wrong deep within the crossfire server. "
1844 . "I'll try to bring you back to the map you were before. " 1880 . "I'll try to bring you back to the map you were before. "
1845 . "Please report this to the dungeon master", 1881 . "Please report this to the dungeon master!",
1846 cf::NDI_UNIQUE | cf::NDI_RED); 1882 cf::NDI_UNIQUE | cf::NDI_RED);
1847 1883
1848 warn "ERROR in enter_exit: $@"; 1884 warn "ERROR in enter_exit: $@";
1849 $self->leave_link; 1885 $self->leave_link;
1850 } 1886 }
… …
2218 }, 2254 },
2219 ); 2255 );
2220 } 2256 }
2221} 2257}
2222 2258
2223sub emergency_save { 2259sub emergency_save() {
2224 my $freeze_guard = cf::freeze_mainloop; 2260 my $freeze_guard = cf::freeze_mainloop;
2225 2261
2226 warn "enter emergency perl save\n"; 2262 warn "enter emergency perl save\n";
2227 2263
2228 cf::sync_job { 2264 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl 2265 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players 2266 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously. 2267 # and maps saved/destroyed asynchronously.
2232 warn "begin emergency player save\n"; 2268 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) { 2269 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next; 2270 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next; 2271 $pl->valid or next;
2236 $pl->save; 2272 $pl->save;
… …
2256 return; 2292 return;
2257 } 2293 }
2258 2294
2259 warn "reloading..."; 2295 warn "reloading...";
2260 2296
2297 warn "freezing server";
2261 my $guard = freeze_mainloop; 2298 my $guard = freeze_mainloop;
2262 cf::emergency_save; 2299 cf::emergency_save;
2263 2300
2301 warn "sync database to disk";
2302 cf::db_sync;
2303 IO::AIO::flush;
2304
2264 eval { 2305 eval {
2265 # if anything goes wrong in here, we should simply crash as we already saved 2306 # if anything goes wrong in here, we should simply crash as we already saved
2266 2307
2267 # cancel all watchers 2308 warn "cancel all watchers";
2268 for (Event::all_watchers) { 2309 for (Event::all_watchers) {
2269 $_->cancel if $_->data & WF_AUTOCANCEL; 2310 $_->cancel if $_->data & WF_AUTOCANCEL;
2270 } 2311 }
2271 2312
2272 # cancel all extension coros 2313 warn "cancel all extension coros";
2273 $_->cancel for values %EXT_CORO; 2314 $_->cancel for values %EXT_CORO;
2274 %EXT_CORO = (); 2315 %EXT_CORO = ();
2275 2316
2317 warn "remove commands";
2318 %COMMAND = ();
2319
2320 warn "remove ext commands";
2321 %EXTCMD = ();
2322
2276 # unload all extensions 2323 warn "unload/nuke all extensions";
2277 for (@exts) { 2324 for my $pkg (@EXTS) {
2278 warn "unloading <$_>"; 2325 warn "... unloading $pkg";
2279 unload_extension $_; 2326
2327 if (my $cb = $pkg->can ("unload")) {
2328 eval {
2329 $cb->($pkg);
2330 1
2331 } or warn "$pkg unloaded, but with errors: $@";
2280 } 2332 }
2281 2333
2334 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg;
2336 }
2337
2282 # unload all modules loaded from $LIBDIR 2338 warn "unload all perl modules loaded from $LIBDIR";
2283 while (my ($k, $v) = each %INC) { 2339 while (my ($k, $v) = each %INC) {
2284 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2285 2341
2286 warn "removing <$k>"; 2342 warn "removing <$k>";
2287 delete $INC{$k}; 2343 delete $INC{$k};
… …
2294 } 2350 }
2295 2351
2296 Symbol::delete_package $k; 2352 Symbol::delete_package $k;
2297 } 2353 }
2298 2354
2299 # sync database to disk
2300 cf::db_sync;
2301 IO::AIO::flush;
2302
2303 # get rid of safe::, as good as possible 2355 warn "get rid of safe::, as good as possible";
2304 Symbol::delete_package "safe::$_" 2356 Symbol::delete_package "safe::$_"
2305 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2357 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2306 2358
2307 # remove register_script_function callbacks
2308 # TODO
2309
2310 # unload cf.pm "a bit" 2359 warn "unload cf.pm \"a bit\"";
2311 delete $INC{"cf.pm"}; 2360 delete $INC{"cf.pm"};
2312 2361
2313 # don't, removes xs symbols, too, 2362 # don't, removes xs symbols, too,
2314 # and global variables created in xs 2363 # and global variables created in xs
2315 #Symbol::delete_package __PACKAGE__; 2364 #Symbol::delete_package __PACKAGE__;
2316 2365
2317 # reload cf.pm
2318 warn "reloading cf.pm"; 2366 warn "reloading cf.pm";
2319 require cf; 2367 require cf;
2320 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2321 2369
2322 # load config and database again 2370 warn "load config and database again";
2323 cf::cfg_load; 2371 cf::cfg_load;
2324 cf::db_load; 2372 cf::db_load;
2325 2373
2326 # load extensions
2327 warn "load extensions"; 2374 warn "load extensions";
2328 cf::load_extensions; 2375 cf::load_extensions;
2329 2376
2330 # reattach attachments to objects 2377 warn "reattach attachments to objects/players";
2331 warn "reattach";
2332 _global_reattach; 2378 _global_reattach;
2379 warn "reattach attachments to maps";
2333 reattach $_ for values %MAP; 2380 reattach $_ for values %MAP;
2334 }; 2381 };
2335 2382
2336 if ($@) { 2383 if ($@) {
2337 warn $@; 2384 warn $@;
2338 warn "error while reloading, exiting."; 2385 warn "error while reloading, exiting.";
2339 exit 1; 2386 exit 1;
2340 } 2387 }
2341 2388
2342 warn "reloaded successfully"; 2389 warn "reloaded";
2343}; 2390};
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 2391
2390register_command "reload" => sub { 2392register_command "reload" => sub {
2391 my ($who, $arg) = @_; 2393 my ($who, $arg) = @_;
2392 2394
2393 if ($who->flag (FLAG_WIZ)) { 2395 if ($who->flag (FLAG_WIZ)) {
… …
2403 reentrant => 0, 2405 reentrant => 0,
2404 prio => 0, 2406 prio => 0,
2405 at => $NEXT_TICK || $TICK, 2407 at => $NEXT_TICK || $TICK,
2406 data => WF_AUTOCANCEL, 2408 data => WF_AUTOCANCEL,
2407 cb => sub { 2409 cb => sub {
2410 $NOW = Event::time;
2411
2408 cf::server_tick; # one server iteration 2412 cf::server_tick; # one server iteration
2409 $RUNTIME += $TICK; 2413 $RUNTIME += $TICK;
2410 $NEXT_TICK += $TICK; 2414 $NEXT_TICK += $TICK;
2411 2415
2412 $WAIT_FOR_TICK->broadcast; 2416 $WAIT_FOR_TICK->broadcast;
… …
2420 }, 2424 },
2421); 2425);
2422 2426
2423IO::AIO::max_poll_time $TICK * 0.2; 2427IO::AIO::max_poll_time $TICK * 0.2;
2424 2428
2425Event->io ( 2429$AIO_POLL_WATCHER = Event->io (
2426 fd => IO::AIO::poll_fileno, 2430 fd => IO::AIO::poll_fileno,
2427 poll => 'r', 2431 poll => 'r',
2428 prio => 5, 2432 prio => 5,
2429 data => WF_AUTOCANCEL, 2433 data => WF_AUTOCANCEL,
2430 cb => \&IO::AIO::poll_cb, 2434 cb => \&IO::AIO::poll_cb,
2431); 2435);
2432 2436
2433Event->timer ( 2437$WRITE_RUNTIME_WATCHER = Event->timer (
2434 data => WF_AUTOCANCEL, 2438 data => WF_AUTOCANCEL,
2435 after => 0, 2439 after => 0,
2436 interval => 10, 2440 interval => 10,
2437 cb => sub { 2441 cb => sub {
2438 (Coro::unblock_sub { 2442 (Coro::unblock_sub {

Diff Legend

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