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

Diff Legend

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