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.154 by root, Tue Jan 9 15:36:19 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines