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.177 by root, Sun Jan 14 22:54:18 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
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 fallback => 1;
1120
1284our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1286 1123
1287sub generate_random_map { 1124sub generate_random_map {
1288 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1289 1126
1290 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1128 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1137 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}) 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 )
1141}
1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub thawer_merge {
1157 my ($self, $merge) = @_;
1158
1159 # we have to keep some variables in memory intact
1160 local $self->{path};
1161 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164
1165 $self->SUPER::thawer_merge ($merge);
1166}
1167
1168sub normalise {
1169 my ($path, $base) = @_;
1170
1171 # map plan:
1172 #
1173 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched
1175 # ?xxx/... are special absolute paths
1176 # ?random/... random maps
1177 # /... normal maps
1178 # ~user/... per-player map of a specific user
1179
1180 $path =~ s/$PATH_SEP/\//go;
1181
1182 # treat it as relative path if it starts with
1183 # something that looks reasonable
1184 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1185 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1186
1187 $base =~ s{[^/]+/?$}{};
1188 $path = "$base/$path";
1189 }
1190
1191 for ($path) {
1192 redo if s{//}{/};
1193 redo if s{/\.?/}{/};
1194 redo if s{/[^/]+/\.\./}{/};
1195 }
1196
1197 $path
1198}
1199
1200sub new_from_path {
1201 my (undef, $path, $base) = @_;
1202
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204
1205 $path = normalise $path, $base;
1206
1207 for my $pkg (keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) {
1209 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc.
1212 return $self;
1213 }
1214 }
1215
1216 Carp::carp "unable to resolve path '$path'.";
1217 ()
1218}
1219
1220sub init {
1221 my ($self) = @_;
1222
1223 $self
1224}
1225
1226sub as_string {
1227 my ($self) = @_;
1228
1229 "$self->{path}"
1230}
1231
1232# the displayed name, this is a one way mapping
1233sub visible_name {
1234 &as_string
1235}
1236
1237# the original (read-only) location
1238sub load_path {
1239 my ($self) = @_;
1240
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1242}
1243
1244# the temporary/swap location
1245sub save_path {
1246 my ($self) = @_;
1247
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1250}
1251
1252# the unique path, undef == no special unique path
1253sub uniq_path {
1254 my ($self) = @_;
1255
1256 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1257 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304} 1258}
1305 1259
1306# and all this just because we cannot iterate over 1260# and all this just because we cannot iterate over
1307# all maps in C++... 1261# all maps in C++...
1308sub change_all_map_light { 1262sub change_all_map_light {
… …
1310 1264
1311 $_->change_map_light ($change) 1265 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1266 for grep $_->outdoor, values %cf::MAP;
1313} 1267}
1314 1268
1269sub unlink_save {
1270 my ($self) = @_;
1271
1272 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1275}
1276
1315sub try_load_header($) { 1277sub load_header_from($) {
1316 my ($path) = @_; 1278 my ($self, $path) = @_;
1317 1279
1318 utf8::encode $path; 1280 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1281 aio_open $path, O_RDONLY, 0
1320 or return; 1282 or return;
1321 1283
1322 my $map = cf::map::new 1284 $self->_load_header ($path)
1323 or return; 1285 or return;
1324 1286
1325 # for better error messages only, will be overwritten 1287 $self->{load_path} = $path;
1326 $map->path ($path);
1327 1288
1328 $map->load_header ($path) 1289 1
1290}
1291
1292sub load_orig {
1293 my ($self) = @_;
1294
1295 $self->load_header_from ($self->load_path)
1296}
1297
1298sub load_temp {
1299 my ($self) = @_;
1300
1301 $self->load_header_from ($self->save_path)
1302}
1303
1304sub load_header {
1305 my ($self) = @_;
1306
1307 if ($self->load_temp) {
1308 $self->last_access ((delete $self->{last_access})
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else {
1314 $self->load_orig
1329 or return; 1315 or return;
1330 1316
1331 $map->{load_path} = $path; 1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 }
1332 1322
1333 $map 1323 1
1334} 1324}
1335 1325
1336sub find; 1326sub find;
1337sub find { 1327sub find {
1338 my ($path, $origin) = @_; 1328 my ($path, $origin) = @_;
1339 1329
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1330 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1331
1345 cf::lock_wait "map_find:$key"; 1332 cf::lock_wait "map_find:$path";
1346 1333
1347 $cf::MAP{$key} || do { 1334 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1335 my $guard = cf::lock_acquire "map_find:$path";
1349 1336 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; 1337 or return;
1369 1338
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; 1339 $map->{last_save} = $cf::RUNTIME;
1382 1340
1383 Coro::cede; 1341 $map->load_header
1342 or return;
1384 1343
1385 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1386 $map->reset; 1346 $map->reset;
1387 undef $guard; 1347 undef $guard;
1388 $map = find $path 1348 $map = find $path
1389 or return; 1349 or return;
1390 } 1350 }
1391 1351
1392 $cf::MAP{$key} = $map 1352 $cf::MAP{$path} = $map
1393 } 1353 }
1394} 1354}
1395 1355
1396sub load { 1356sub load {
1397 my ($self) = @_; 1357 my ($self) = @_;
1398 1358
1399 my $path = $self->{path}; 1359 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1360 my $guard = cf::lock_acquire "map_load:$path";
1401 1361
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1362 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1363
1404 $self->in_memory (cf::MAP_LOADING); 1364 $self->in_memory (cf::MAP_LOADING);
1405 1365
1406 $self->alloc; 1366 $self->alloc;
1407 $self->load_objects ($self->{load_path}, 1) 1367 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1368 or return;
1409 1369
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1371 if delete $self->{load_original};
1412 1372
1413 if (my $uniq = $path->uniq_path) { 1373 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1374 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1375 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1376 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1377 $self->_load_objects ($uniq, 0);
1418 } 1378 }
1419 } 1379 }
1420 1380
1421 Coro::cede; 1381 Coro::cede;
1422 1382
1423 # now do the right thing for maps 1383 # now do the right thing for maps
1424 $self->link_multipart_objects; 1384 $self->link_multipart_objects;
1425 1385
1426 if ($self->{path}->is_style_map) { 1386 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1387 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1388 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1389 $self->update_buttons;
1390 Coro::cede;
1433 $self->set_darkness_map; 1391 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1392 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1393 unless $self->difficulty;
1394 Coro::cede;
1436 $self->activate; 1395 $self->activate;
1437 } 1396 }
1438 1397
1439 Coro::cede;
1440
1441 $self->in_memory (cf::MAP_IN_MEMORY); 1398 $self->in_memory (cf::MAP_IN_MEMORY);
1399}
1400
1401sub customise_for {
1402 my ($self, $ob) = @_;
1403
1404 return find "~" . $ob->name . "/" . $self->{path}
1405 if $self->per_player;
1406
1407 $self
1408}
1409
1410# find and load all maps in the 3x3 area around a map
1411sub load_diag {
1412 my ($map) = @_;
1413
1414 my @diag; # diagonal neighbours
1415
1416 for (0 .. 3) {
1417 my $neigh = $map->tile_path ($_)
1418 or next;
1419 $neigh = find $neigh, $map
1420 or next;
1421 $neigh->load;
1422
1423 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1424 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1425 }
1426
1427 for (@diag) {
1428 my $neigh = find @$_
1429 or next;
1430 $neigh->load;
1431 }
1442} 1432}
1443 1433
1444sub find_sync { 1434sub find_sync {
1445 my ($path, $origin) = @_; 1435 my ($path, $origin) = @_;
1446 1436
1447 cf::sync_job { cf::map::find $path, $origin } 1437 cf::sync_job { find $path, $origin }
1448} 1438}
1449 1439
1450sub do_load_sync { 1440sub do_load_sync {
1451 my ($map) = @_; 1441 my ($map) = @_;
1452 1442
1453 cf::sync_job { $map->load }; 1443 cf::sync_job { $map->load };
1454} 1444}
1455 1445
1446our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async {
1448 while () {
1449 for my $path (keys %MAP_PREFETCH) {
1450 my $map = find $path
1451 or next;
1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1455 }
1456 Coro::schedule;
1457 }
1458};
1459
1460sub find_async {
1461 my ($path, $origin) = @_;
1462
1463 $path = normalise $path, $origin && $origin->{path};
1464
1465 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 }
1468
1469 $MAP_PREFETCH{$path} = 0;
1470 $MAP_PREFETCHER->ready;
1471
1472 ()
1473}
1474
1456sub save { 1475sub save {
1457 my ($self) = @_; 1476 my ($self) = @_;
1458 1477
1459 my $lock = cf::lock_acquire "map_data:" . $self->path; 1478 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460 1479
1461 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1462 1481
1463 return unless $self->dirty; 1482 return unless $self->dirty;
1464 1483
1465 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1467 1486
1468 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1469 1488
1470 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1471 1490
… …
1474 cf::async { 1493 cf::async {
1475 $_->contr->save for $self->players; 1494 $_->contr->save for $self->players;
1476 }; 1495 };
1477 1496
1478 if ($uniq) { 1497 if ($uniq) {
1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1480 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1481 } else { 1500 } else {
1482 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1483 } 1502 }
1484} 1503}
1485 1504
1486sub swap_out { 1505sub swap_out {
1487 my ($self) = @_; 1506 my ($self) = @_;
… …
1501 1520
1502sub reset_at { 1521sub reset_at {
1503 my ($self) = @_; 1522 my ($self) = @_;
1504 1523
1505 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1507 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1508 1527
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1511 1530
… …
1516 my ($self) = @_; 1535 my ($self) = @_;
1517 1536
1518 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1519} 1538}
1520 1539
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 {
1530 my ($self, $new_path) = @_;
1531
1532 $self->unlink_save;
1533
1534 delete $cf::MAP{$self->path};
1535 $self->{path} = new cf::path $new_path;
1536 $self->path ($self->{path}->as_string);
1537 $cf::MAP{$self->path} = $self;
1538
1539 $self->save;
1540}
1541
1542sub reset { 1540sub reset {
1543 my ($self) = @_; 1541 my ($self) = @_;
1544 1542
1545 my $lock = cf::lock_acquire "map_data:" . $self->path; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1546 1544
1547 return if $self->players; 1545 return if $self->players;
1548 return if $self->{path}{user_rel};#d# 1546 return if $self->isa ("ext::map_per_player");#d#
1549 1547
1550 warn "resetting map ", $self->path;#d# 1548 warn "resetting map ", $self->path;#d#
1551 1549
1552 delete $cf::MAP{$self->path}; 1550 delete $cf::MAP{$self->path};
1551
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear;
1553 1554
1554 $_->clear_links_to ($self) for values %cf::MAP; 1555 $_->clear_links_to ($self) for values %cf::MAP;
1555 1556
1556 $self->unlink_save; 1557 $self->unlink_save;
1557 $self->destroy; 1558 $self->destroy;
… …
1560my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1561 1562
1562sub nuke { 1563sub nuke {
1563 my ($self) = @_; 1564 my ($self) = @_;
1564 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1565 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1566 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1568 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1569} 1579}
1570 1580
1571sub customise_for { 1581=item cf::map::unique_maps
1572 my ($map, $ob) = @_;
1573 1582
1574 if ($map->per_player) { 1583Returns an arrayref of paths of all shared maps that have
1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1584instantiated unique items. May block.
1576 }
1577 1585
1578 $map 1586=cut
1587
1588sub unique_maps() {
1589 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1590 or return;
1591
1592 my @paths;
1593
1594 for (@$files) {
1595 utf8::decode $_;
1596 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o;
1598
1599 s/\.map$//;
1600 push @paths, $_;
1601 }
1602
1603 \@paths
1579} 1604}
1580 1605
1581package cf; 1606package cf;
1582 1607
1583=back 1608=back
… …
1655 1680
1656=item $player_object->enter_link 1681=item $player_object->enter_link
1657 1682
1658Freezes the player and moves him/her to a special map (C<{link}>). 1683Freezes the player and moves him/her to a special map (C<{link}>).
1659 1684
1660The player should be reaosnably safe there for short amounts of time. You 1685The player should be reasonably safe there for short amounts of time. You
1661I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1662 1687
1688Will never block.
1689
1663=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1664 1691
1665Moves the player out of the specila link map onto the given map. If the 1692Moves 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 1693map. 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, 1694to the location he/she was before the call to C<enter_link>, or, if that
1668to the emergency map position. 1695fails, to the emergency map position.
1669 1696
1670Might block. 1697Might block.
1671 1698
1672=cut 1699=cut
1700
1701sub link_map {
1702 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1705 $LINK_MAP->load;
1706 }
1707
1708 $LINK_MAP
1709}
1673 1710
1674sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1675 my ($self) = @_; 1712 my ($self) = @_;
1676 1713
1677 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1678 1715
1679 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1680 1717
1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1682 if $self->map; 1719 if $self->map;
1683 1720
1684 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1685} 1722}
1686 1723
1687sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1688 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1689 1726
… …
1707 # use -1 or undef as default coordinates, not 0, 0 1744 # use -1 or undef as default coordinates, not 0, 0
1708 ($x, $y) = ($map->enter_x, $map->enter_y) 1745 ($x, $y) = ($map->enter_x, $map->enter_y)
1709 if $x <=0 && $y <= 0; 1746 if $x <=0 && $y <= 0;
1710 1747
1711 $map->load; 1748 $map->load;
1749 $map->load_diag;
1712 1750
1713 return unless $self->contr->active; 1751 return unless $self->contr->active;
1714 $self->activate_recursive; 1752 $self->activate_recursive;
1715 $self->enter_map ($map, $x, $y); 1753 $self->enter_map ($map, $x, $y);
1716} 1754}
… …
1752=cut 1790=cut
1753 1791
1754sub cf::object::player::goto { 1792sub cf::object::player::goto {
1755 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1756 1794
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1760 $self->enter_link; 1795 $self->enter_link;
1761 1796
1762 (async { 1797 (async {
1763 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1764 $map = $map->customise_for ($self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1765 1800
1766# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1767# if $map; 1802# if $map;
1768 1803
… …
1811 1846
1812 $rmp->{random_seed} ||= $exit->random_seed; 1847 $rmp->{random_seed} ||= $exit->random_seed;
1813 1848
1814 my $data = cf::to_json $rmp; 1849 my $data = cf::to_json $rmp;
1815 my $md5 = Digest::MD5::md5_hex $data; 1850 my $md5 = Digest::MD5::md5_hex $data;
1851 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1816 1852
1817 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1853 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1818 aio_write $fh, 0, (length $data), $data, 0; 1854 aio_write $fh, 0, (length $data), $data, 0;
1855 undef $fh;
1856 aio_rename "$meta~", $meta;
1819 1857
1820 $exit->slaying ("?random/$md5"); 1858 $exit->slaying ("?random/$md5");
1821 $exit->msg (undef); 1859 $exit->msg (undef);
1822 } 1860 }
1823} 1861}
… …
1833 $self->deactivate_recursive; # just to be sure 1871 $self->deactivate_recursive; # just to be sure
1834 unless (eval { 1872 unless (eval {
1835 prepare_random_map $exit 1873 prepare_random_map $exit
1836 if $exit->slaying eq "/!"; 1874 if $exit->slaying eq "/!";
1837 1875
1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1876 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1877 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1840 1878
1841 1; 1879 1;
1842 }) { 1880 }) {
1843 $self->message ("Something went wrong deep within the crossfire server. " 1881 $self->message ("Something went wrong deep within the crossfire server. "
1844 . "I'll try to bring you back to the map you were before. " 1882 . "I'll try to bring you back to the map you were before. "
1845 . "Please report this to the dungeon master", 1883 . "Please report this to the dungeon master!",
1846 cf::NDI_UNIQUE | cf::NDI_RED); 1884 cf::NDI_UNIQUE | cf::NDI_RED);
1847 1885
1848 warn "ERROR in enter_exit: $@"; 1886 warn "ERROR in enter_exit: $@";
1849 $self->leave_link; 1887 $self->leave_link;
1850 } 1888 }
… …
2193 2231
2194sub main { 2232sub main {
2195 # we must not ever block the main coroutine 2233 # we must not ever block the main coroutine
2196 local $Coro::idle = sub { 2234 local $Coro::idle = sub {
2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2236 (async {
2198 async { Event::one_event }; 2237 Event::one_event;
2238 })->prio (Coro::PRIO_MAX);
2199 }; 2239 };
2200 2240
2201 cfg_load; 2241 cfg_load;
2202 db_load; 2242 db_load;
2203 load_extensions; 2243 load_extensions;
… …
2218 }, 2258 },
2219 ); 2259 );
2220 } 2260 }
2221} 2261}
2222 2262
2223sub emergency_save { 2263sub emergency_save() {
2224 my $freeze_guard = cf::freeze_mainloop; 2264 my $freeze_guard = cf::freeze_mainloop;
2225 2265
2226 warn "enter emergency perl save\n"; 2266 warn "enter emergency perl save\n";
2227 2267
2228 cf::sync_job { 2268 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl 2269 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players 2270 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously. 2271 # and maps saved/destroyed asynchronously.
2232 warn "begin emergency player save\n"; 2272 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) { 2273 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next; 2274 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next; 2275 $pl->valid or next;
2236 $pl->save; 2276 $pl->save;
… …
2256 return; 2296 return;
2257 } 2297 }
2258 2298
2259 warn "reloading..."; 2299 warn "reloading...";
2260 2300
2301 warn "freezing server";
2261 my $guard = freeze_mainloop; 2302 my $guard = freeze_mainloop;
2262 cf::emergency_save; 2303 cf::emergency_save;
2263 2304
2305 warn "sync database to disk";
2306 cf::db_sync;
2307 IO::AIO::flush;
2308
2264 eval { 2309 eval {
2265 # if anything goes wrong in here, we should simply crash as we already saved 2310 # if anything goes wrong in here, we should simply crash as we already saved
2266 2311
2267 # cancel all watchers 2312 warn "cancel all watchers";
2268 for (Event::all_watchers) { 2313 for (Event::all_watchers) {
2269 $_->cancel if $_->data & WF_AUTOCANCEL; 2314 $_->cancel if $_->data & WF_AUTOCANCEL;
2270 } 2315 }
2271 2316
2272 # cancel all extension coros 2317 warn "cancel all extension coros";
2273 $_->cancel for values %EXT_CORO; 2318 $_->cancel for values %EXT_CORO;
2274 %EXT_CORO = (); 2319 %EXT_CORO = ();
2275 2320
2321 warn "remove commands";
2322 %COMMAND = ();
2323
2324 warn "remove ext commands";
2325 %EXTCMD = ();
2326
2276 # unload all extensions 2327 warn "unload/nuke all extensions";
2277 for (@exts) { 2328 for my $pkg (@EXTS) {
2278 warn "unloading <$_>"; 2329 warn "... unloading $pkg";
2279 unload_extension $_; 2330
2331 if (my $cb = $pkg->can ("unload")) {
2332 eval {
2333 $cb->($pkg);
2334 1
2335 } or warn "$pkg unloaded, but with errors: $@";
2280 } 2336 }
2281 2337
2338 warn "... nuking $pkg";
2339 Symbol::delete_package $pkg;
2340 }
2341
2282 # unload all modules loaded from $LIBDIR 2342 warn "unload all perl modules loaded from $LIBDIR";
2283 while (my ($k, $v) = each %INC) { 2343 while (my ($k, $v) = each %INC) {
2284 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2344 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2285 2345
2286 warn "removing <$k>"; 2346 warn "removing <$k>";
2287 delete $INC{$k}; 2347 delete $INC{$k};
… …
2294 } 2354 }
2295 2355
2296 Symbol::delete_package $k; 2356 Symbol::delete_package $k;
2297 } 2357 }
2298 2358
2299 # sync database to disk
2300 cf::db_sync;
2301 IO::AIO::flush;
2302
2303 # get rid of safe::, as good as possible 2359 warn "get rid of safe::, as good as possible";
2304 Symbol::delete_package "safe::$_" 2360 Symbol::delete_package "safe::$_"
2305 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2361 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2306 2362
2307 # remove register_script_function callbacks
2308 # TODO
2309
2310 # unload cf.pm "a bit" 2363 warn "unload cf.pm \"a bit\"";
2311 delete $INC{"cf.pm"}; 2364 delete $INC{"cf.pm"};
2312 2365
2313 # don't, removes xs symbols, too, 2366 # don't, removes xs symbols, too,
2314 # and global variables created in xs 2367 # and global variables created in xs
2315 #Symbol::delete_package __PACKAGE__; 2368 #Symbol::delete_package __PACKAGE__;
2316 2369
2317 # reload cf.pm
2318 warn "reloading cf.pm"; 2370 warn "reloading cf.pm";
2319 require cf; 2371 require cf;
2320 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2321 2373
2322 # load config and database again 2374 warn "load config and database again";
2323 cf::cfg_load; 2375 cf::cfg_load;
2324 cf::db_load; 2376 cf::db_load;
2325 2377
2326 # load extensions
2327 warn "load extensions"; 2378 warn "load extensions";
2328 cf::load_extensions; 2379 cf::load_extensions;
2329 2380
2330 # reattach attachments to objects 2381 warn "reattach attachments to objects/players";
2331 warn "reattach";
2332 _global_reattach; 2382 _global_reattach;
2383 warn "reattach attachments to maps";
2333 reattach $_ for values %MAP; 2384 reattach $_ for values %MAP;
2334 }; 2385 };
2335 2386
2336 if ($@) { 2387 if ($@) {
2337 warn $@; 2388 warn $@;
2338 warn "error while reloading, exiting."; 2389 warn "error while reloading, exiting.";
2339 exit 1; 2390 exit 1;
2340 } 2391 }
2341 2392
2342 warn "reloaded successfully"; 2393 warn "reloaded";
2343}; 2394};
2344 2395
2345############################################################################# 2396our $RELOAD_WATCHER; # used only during reload
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 2397
2390register_command "reload" => sub { 2398register_command "reload" => sub {
2391 my ($who, $arg) = @_; 2399 my ($who, $arg) = @_;
2392 2400
2393 if ($who->flag (FLAG_WIZ)) { 2401 if ($who->flag (FLAG_WIZ)) {
2394 $who->message ("start of reload."); 2402 $who->message ("reloading server.");
2403
2404 # doing reload synchronously and two reloads happen back-to-back,
2405 # coro crashes during coro_state_free->destroy here.
2406
2407 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2395 reload; 2408 reload;
2396 $who->message ("end of reload."); 2409 undef $RELOAD_WATCHER;
2410 });
2397 } 2411 }
2398}; 2412};
2399 2413
2400unshift @INC, $LIBDIR; 2414unshift @INC, $LIBDIR;
2401 2415
… …
2403 reentrant => 0, 2417 reentrant => 0,
2404 prio => 0, 2418 prio => 0,
2405 at => $NEXT_TICK || $TICK, 2419 at => $NEXT_TICK || $TICK,
2406 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2407 cb => sub { 2421 cb => sub {
2422 $NOW = Event::time;
2423
2408 cf::server_tick; # one server iteration 2424 cf::server_tick; # one server iteration
2409 $RUNTIME += $TICK; 2425 $RUNTIME += $TICK;
2410 $NEXT_TICK += $TICK; 2426 $NEXT_TICK += $TICK;
2411 2427
2412 $WAIT_FOR_TICK->broadcast; 2428 $WAIT_FOR_TICK->broadcast;
… …
2420 }, 2436 },
2421); 2437);
2422 2438
2423IO::AIO::max_poll_time $TICK * 0.2; 2439IO::AIO::max_poll_time $TICK * 0.2;
2424 2440
2425Event->io ( 2441$AIO_POLL_WATCHER = Event->io (
2426 fd => IO::AIO::poll_fileno, 2442 fd => IO::AIO::poll_fileno,
2427 poll => 'r', 2443 poll => 'r',
2428 prio => 5, 2444 prio => 5,
2429 data => WF_AUTOCANCEL, 2445 data => WF_AUTOCANCEL,
2430 cb => \&IO::AIO::poll_cb, 2446 cb => \&IO::AIO::poll_cb,
2431); 2447);
2432 2448
2433Event->timer ( 2449$WRITE_RUNTIME_WATCHER = Event->timer (
2434 data => WF_AUTOCANCEL, 2450 data => WF_AUTOCANCEL,
2435 after => 0, 2451 after => 0,
2436 interval => 10, 2452 interval => 10,
2437 cb => sub { 2453 cb => sub {
2438 (Coro::unblock_sub { 2454 (Coro::unblock_sub {

Diff Legend

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