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.156 by root, Tue Jan 9 22:07:08 2007 UTC vs.
Revision 1.198 by root, Sun Jan 28 01:58:37 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.5 ();
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(&) {
… …
343 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
344 350
345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
346 or return; 352 or return;
347 353
354 my $value = $cf::RUNTIME + 90 + 10;
348 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
349 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
350 and return; 359 and return;
351 360
352 aio_fsync $fh 361 aio_fsync $fh
353 and return; 362 and return;
… …
362} 371}
363 372
364=back 373=back
365 374
366=cut 375=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 376
490############################################################################# 377#############################################################################
491 378
492=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
493 380
… …
619our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
620our @CB_MAP = (); 507our @CB_MAP = ();
621 508
622my %attachment; 509my %attachment;
623 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
624sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
625 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
626 519
627 use sort 'stable'; 520 use sort 'stable';
628 521
… …
799# object support 692# object support
800 693
801sub reattach { 694sub reattach {
802 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
803 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804 699
805 my $registry = $obj->registry; 700 my $registry = $obj->registry;
806 701
807 @$registry = (); 702 @$registry = ();
808 703
… …
940=cut 835=cut
941 836
942sub register_extcmd { 837sub register_extcmd {
943 my ($name, $cb) = @_; 838 my ($name, $cb) = @_;
944 839
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 840 $EXTCMD{$name} = $cb;
949} 841}
950 842
951cf::player->attach ( 843cf::player->attach (
952 on_command => sub { 844 on_command => sub {
953 my ($pl, $name, $params) = @_; 845 my ($pl, $name, $params) = @_;
… …
966 858
967 my $msg = eval { from_json $buf }; 859 my $msg = eval { from_json $buf };
968 860
969 if (ref $msg) { 861 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 862 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 863 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 864 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 865 }
974 } 866 }
975 } else { 867 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 868 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 870
979 cf::override; 871 cf::override;
980 }, 872 },
981); 873);
982 874
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 875sub load_extension {
990 my ($path) = @_; 876 my ($path) = @_;
991 877
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 879 my $base = $1;
994 my $pkg = $1; 880 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 881 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 882 $pkg = "ext::$pkg";
997 883
998 warn "loading '$path' into '$pkg'\n"; 884 warn "... loading '$path' into '$pkg'\n";
999 885
1000 open my $fh, "<:utf8", $path 886 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 887 or die "$path: $!";
1002 888
1003 my $source = 889 my $source =
1004 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 893 . "\n};\n1";
1008 894
1009 eval $source 895 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 897 : "extension disabled.\n";
1012 898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 899 warn $@;
1014 $ext_pkg{$base} = $pkg; 900 warn "mandatory extension failed to load, exiting.\n";
1015 901 exit 1;
1016# no strict 'refs'; 902 }
1017# @{"$pkg\::ISA"} = ext::; 903 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# } 904 }
1032 905
1033 # remove commands 906 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} 907}
1058 908
1059sub load_extensions { 909sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 910 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 911 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1066 } 916 }
1067} 917}
1068 918
1069############################################################################# 919#############################################################################
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 920
1085=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1086 922
1087Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1088 924
… …
1124 960
1125sub exists($) { 961sub exists($) {
1126 my ($login) = @_; 962 my ($login) = @_;
1127 963
1128 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1130} 966}
1131 967
1132sub find($) { 968sub find($) {
1133 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0]; 970 my $login = $_[0];
… …
1224 \@logins 1060 \@logins
1225} 1061}
1226 1062
1227=item $player->maps 1063=item $player->maps
1228 1064
1229Returns an arrayref of cf::path's of all maps that are private for this 1065Returns an arrayref of map paths that are private for this
1230player. May block. 1066player. May block.
1231 1067
1232=cut 1068=cut
1233 1069
1234sub maps($) { 1070sub maps($) {
… …
1240 my @paths; 1076 my @paths;
1241 1077
1242 for (@$files) { 1078 for (@$files) {
1243 utf8::decode $_; 1079 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1081 next unless /^$PATH_SEP/o;
1246 1082
1247 s/$PATH_SEP/\//g; 1083 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1085 }
1250 1086
1251 \@paths 1087 \@paths
1252} 1088}
1253 1089
… …
1279package cf::map; 1115package cf::map;
1280 1116
1281use Fcntl; 1117use Fcntl;
1282use Coro::AIO; 1118use Coro::AIO;
1283 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1284our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1286 1126
1287sub generate_random_map { 1127sub generate_random_map {
1288 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1130 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1139 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}) 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 )
1143}
1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1153sub register {
1154 my (undef, $regex, $prio) = @_;
1155 my $pkg = caller;
1156
1157 no strict;
1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1159
1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1161}
1162
1163# also paths starting with '/'
1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1177
1178sub normalise {
1179 my ($path, $base) = @_;
1180
1181 $path = "$path"; # make sure its a string
1182
1183 # map plan:
1184 #
1185 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths
1188 # ?random/... random maps
1189 # /... normal maps
1190 # ~user/... per-player map of a specific user
1191
1192 $path =~ s/$PATH_SEP/\//go;
1193
1194 # treat it as relative path if it starts with
1195 # something that looks reasonable
1196 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1197 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1198
1199 $base =~ s{[^/]+/?$}{};
1200 $path = "$base/$path";
1201 }
1202
1203 for ($path) {
1204 redo if s{//}{/};
1205 redo if s{/\.?/}{/};
1206 redo if s{/[^/]+/\.\./}{/};
1207 }
1208
1209 $path
1210}
1211
1212sub new_from_path {
1213 my (undef, $path, $base) = @_;
1214
1215 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1216
1217 $path = normalise $path, $base;
1218
1219 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1220 if ($path =~ $EXT_MAP{$pkg}[1]) {
1221 my $self = bless cf::map::new, $pkg;
1222 $self->{path} = $path; $self->path ($path);
1223 $self->init; # pass $1 etc.
1224 return $self;
1225 }
1226 }
1227
1228 Carp::carp "unable to resolve path '$path' (base '$base').";
1229 ()
1230}
1231
1232sub init {
1233 my ($self) = @_;
1234
1235 $self
1236}
1237
1238sub as_string {
1239 my ($self) = @_;
1240
1241 "$self->{path}"
1242}
1243
1244# the displayed name, this is a one way mapping
1245sub visible_name {
1246 &as_string
1247}
1248
1249# the original (read-only) location
1250sub load_path {
1251 my ($self) = @_;
1252
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1254}
1255
1256# the temporary/swap location
1257sub save_path {
1258 my ($self) = @_;
1259
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1262}
1263
1264# the unique path, undef == no special unique path
1265sub uniq_path {
1266 my ($self) = @_;
1267
1268 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1269 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304} 1270}
1305 1271
1306# and all this just because we cannot iterate over 1272# and all this just because we cannot iterate over
1307# all maps in C++... 1273# all maps in C++...
1308sub change_all_map_light { 1274sub change_all_map_light {
… …
1310 1276
1311 $_->change_map_light ($change) 1277 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1278 for grep $_->outdoor, values %cf::MAP;
1313} 1279}
1314 1280
1281sub unlink_save {
1282 my ($self) = @_;
1283
1284 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1287}
1288
1315sub try_load_header($) { 1289sub load_header_from($) {
1316 my ($path) = @_; 1290 my ($self, $path) = @_;
1317 1291
1318 utf8::encode $path; 1292 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1293 aio_open $path, O_RDONLY, 0
1320 or return; 1294 or return;
1321 1295
1322 my $map = cf::map::new 1296 $self->_load_header ($path)
1323 or return; 1297 or return;
1324 1298
1325 # for better error messages only, will be overwritten 1299 $self->{load_path} = $path;
1326 $map->path ($path);
1327 1300
1328 $map->load_header ($path) 1301 1
1302}
1303
1304sub load_header_orig {
1305 my ($self) = @_;
1306
1307 $self->load_header_from ($self->load_path)
1308}
1309
1310sub load_header_temp {
1311 my ($self) = @_;
1312
1313 $self->load_header_from ($self->save_path)
1314}
1315
1316sub prepare_temp {
1317 my ($self) = @_;
1318
1319 $self->last_access ((delete $self->{last_access})
1320 || $cf::RUNTIME); #d#
1321 # safety
1322 $self->{instantiate_time} = $cf::RUNTIME
1323 if $self->{instantiate_time} > $cf::RUNTIME;
1324}
1325
1326sub prepare_orig {
1327 my ($self) = @_;
1328
1329 $self->{load_original} = 1;
1330 $self->{instantiate_time} = $cf::RUNTIME;
1331 $self->last_access ($cf::RUNTIME);
1332 $self->instantiate;
1333}
1334
1335sub load_header {
1336 my ($self) = @_;
1337
1338 if ($self->load_header_temp) {
1339 $self->prepare_temp;
1340 } else {
1341 $self->load_header_orig
1329 or return; 1342 or return;
1343 $self->prepare_orig;
1344 }
1330 1345
1331 $map->{load_path} = $path; 1346 1
1332
1333 $map
1334} 1347}
1335 1348
1336sub find; 1349sub find;
1337sub find { 1350sub find {
1338 my ($path, $origin) = @_; 1351 my ($path, $origin) = @_;
1339 1352
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1353 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1354
1345 cf::lock_wait "map_find:$key"; 1355 cf::lock_wait "map_find:$path";
1346 1356
1347 $cf::MAP{$key} || do { 1357 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1358 my $guard = cf::lock_acquire "map_find:$path";
1349 1359 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; 1360 or return;
1369 1361
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; 1362 $map->{last_save} = $cf::RUNTIME;
1382 1363
1383 Coro::cede; 1364 $map->load_header
1365 or return;
1384 1366
1385 if ($map->should_reset) { 1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait;
1386 $map->reset; 1370 $map->reset;
1387 undef $guard; 1371 undef $guard;
1388 $map = find $path 1372 return find $path;
1389 or return;
1390 } 1373 }
1391 1374
1392 $cf::MAP{$key} = $map 1375 $cf::MAP{$path} = $map
1393 } 1376 }
1394} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1395 1381
1396sub load { 1382sub load {
1397 my ($self) = @_; 1383 my ($self) = @_;
1398 1384
1385 local $self->{deny_reset} = 1; # loading can take a long time
1386
1399 my $path = $self->{path}; 1387 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1388 my $guard = cf::lock_acquire "map_load:$path";
1401 1389
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1390 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1391
1404 $self->in_memory (cf::MAP_LOADING); 1392 $self->in_memory (cf::MAP_LOADING);
1405 1393
1406 $self->alloc; 1394 $self->alloc;
1395
1396 $self->pre_load;
1397
1407 $self->load_objects ($self->{load_path}, 1) 1398 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1399 or return;
1409 1400
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1401 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1402 if delete $self->{load_original};
1412 1403
1413 if (my $uniq = $path->uniq_path) { 1404 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1405 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1406 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1407 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1408 $self->_load_objects ($uniq, 0);
1418 } 1409 }
1419 } 1410 }
1420 1411
1421 Coro::cede; 1412 Coro::cede;
1422 1413
1423 # now do the right thing for maps 1414 # now do the right thing for maps
1424 $self->link_multipart_objects; 1415 $self->link_multipart_objects;
1425 1416
1426 if ($self->{path}->is_style_map) { 1417 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1418 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1419 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1420 $self->update_buttons;
1421 Coro::cede;
1433 $self->set_darkness_map; 1422 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1423 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1424 unless $self->difficulty;
1425 Coro::cede;
1436 $self->activate; 1426 $self->activate;
1437 } 1427 }
1438 1428
1439 Coro::cede; 1429 $self->post_load;
1440 1430
1441 $self->in_memory (cf::MAP_IN_MEMORY); 1431 $self->in_memory (cf::MAP_IN_MEMORY);
1432}
1433
1434sub customise_for {
1435 my ($self, $ob) = @_;
1436
1437 return find "~" . $ob->name . "/" . $self->{path}
1438 if $self->per_player;
1439
1440 $self
1441}
1442
1443# find and load all maps in the 3x3 area around a map
1444sub load_diag {
1445 my ($map) = @_;
1446
1447 my @diag; # diagonal neighbours
1448
1449 for (0 .. 3) {
1450 my $neigh = $map->tile_path ($_)
1451 or next;
1452 $neigh = find $neigh, $map
1453 or next;
1454 $neigh->load;
1455
1456 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1457 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1458 }
1459
1460 for (@diag) {
1461 my $neigh = find @$_
1462 or next;
1463 $neigh->load;
1464 }
1442} 1465}
1443 1466
1444sub find_sync { 1467sub find_sync {
1445 my ($path, $origin) = @_; 1468 my ($path, $origin) = @_;
1446 1469
1447 cf::sync_job { cf::map::find $path, $origin } 1470 cf::sync_job { find $path, $origin }
1448} 1471}
1449 1472
1450sub do_load_sync { 1473sub do_load_sync {
1451 my ($map) = @_; 1474 my ($map) = @_;
1452 1475
1453 cf::sync_job { $map->load }; 1476 cf::sync_job { $map->load };
1454} 1477}
1455 1478
1479our %MAP_PREFETCH;
1480our $MAP_PREFETCHER = undef;
1481
1482sub find_async {
1483 my ($path, $origin) = @_;
1484
1485 $path = normalise $path, $origin && $origin->{path};
1486
1487 if (my $map = $cf::MAP{$path}) {
1488 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1489 }
1490
1491 undef $MAP_PREFETCH{$path};
1492 $MAP_PREFETCHER ||= cf::async {
1493 while (%MAP_PREFETCH) {
1494 for my $path (keys %MAP_PREFETCH) {
1495 my $map = find $path
1496 or next;
1497 $map->load;
1498
1499 delete $MAP_PREFETCH{$path};
1500 }
1501 }
1502 undef $MAP_PREFETCHER;
1503 };
1504 $MAP_PREFETCHER->prio (6);
1505
1506 ()
1507}
1508
1456sub save { 1509sub save {
1457 my ($self) = @_; 1510 my ($self) = @_;
1458 1511
1459 my $lock = cf::lock_acquire "map_data:" . $self->path; 1512 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460 1513
1461 $self->{last_save} = $cf::RUNTIME; 1514 $self->{last_save} = $cf::RUNTIME;
1462 1515
1463 return unless $self->dirty; 1516 return unless $self->dirty;
1464 1517
1465 my $save = $self->{path}->save_path; utf8::encode $save; 1518 my $save = $self->save_path; utf8::encode $save;
1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1519 my $uniq = $self->uniq_path; utf8::encode $uniq;
1467 1520
1468 $self->{load_path} = $save; 1521 $self->{load_path} = $save;
1469 1522
1470 return if $self->{deny_save}; 1523 return if $self->{deny_save};
1471 1524
… …
1474 cf::async { 1527 cf::async {
1475 $_->contr->save for $self->players; 1528 $_->contr->save for $self->players;
1476 }; 1529 };
1477 1530
1478 if ($uniq) { 1531 if ($uniq) {
1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1532 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1480 $self->save_objects ($uniq, cf::IO_UNIQUES); 1533 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1481 } else { 1534 } else {
1482 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1535 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1483 } 1536 }
1484} 1537}
1485 1538
1486sub swap_out { 1539sub swap_out {
1487 my ($self) = @_; 1540 my ($self) = @_;
… …
1501 1554
1502sub reset_at { 1555sub reset_at {
1503 my ($self) = @_; 1556 my ($self) = @_;
1504 1557
1505 # TODO: safety, remove and allow resettable per-player maps 1558 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel}; 1559 return 1e99 if $self->isa ("ext::map_per_player");#d#
1507 return 1e99 if $self->{deny_reset}; 1560 return 1e99 if $self->{deny_reset};
1508 1561
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1562 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1563 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1511 1564
… …
1516 my ($self) = @_; 1569 my ($self) = @_;
1517 1570
1518 $self->reset_at <= $cf::RUNTIME 1571 $self->reset_at <= $cf::RUNTIME
1519} 1572}
1520 1573
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 { 1574sub reset {
1543 my ($self) = @_; 1575 my ($self) = @_;
1544 1576
1545 my $lock = cf::lock_acquire "map_data:" . $self->path; 1577 my $lock = cf::lock_acquire "map_data:$self->{path}";
1546 1578
1547 return if $self->players; 1579 return if $self->players;
1548 return if $self->{path}{user_rel};#d# 1580 return if $self->isa ("ext::map_per_player");#d#
1549 1581
1550 warn "resetting map ", $self->path;#d# 1582 warn "resetting map ", $self->path;#d#
1551 1583
1552 delete $cf::MAP{$self->path}; 1584 delete $cf::MAP{$self->path};
1585
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear;
1553 1588
1554 $_->clear_links_to ($self) for values %cf::MAP; 1589 $_->clear_links_to ($self) for values %cf::MAP;
1555 1590
1556 $self->unlink_save; 1591 $self->unlink_save;
1557 $self->destroy; 1592 $self->destroy;
… …
1560my $nuke_counter = "aaaa"; 1595my $nuke_counter = "aaaa";
1561 1596
1562sub nuke { 1597sub nuke {
1563 my ($self) = @_; 1598 my ($self) = @_;
1564 1599
1600 delete $cf::MAP{$self->path};
1601
1602 $self->unlink_save;
1603
1604 bless $self, "cf::map";
1605 delete $self->{deny_reset};
1565 $self->{deny_save} = 1; 1606 $self->{deny_save} = 1;
1566 $self->reset_timeout (1); 1607 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++)); 1608 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1609
1610 $cf::MAP{$self->path} = $self;
1611
1568 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1569} 1613}
1570 1614
1571sub customise_for { 1615=item cf::map::unique_maps
1572 my ($map, $ob) = @_;
1573 1616
1574 if ($map->per_player) { 1617Returns an arrayref of paths of all shared maps that have
1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1576 }
1577 1619
1578 $map 1620=cut
1621
1622sub unique_maps() {
1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1625
1626 my @paths;
1627
1628 for (@$files) {
1629 utf8::decode $_;
1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 s/\.map$//;
1634 push @paths, $_;
1635 }
1636
1637 \@paths
1579} 1638}
1580 1639
1581package cf; 1640package cf;
1582 1641
1583=back 1642=back
… …
1655 1714
1656=item $player_object->enter_link 1715=item $player_object->enter_link
1657 1716
1658Freezes the player and moves him/her to a special map (C<{link}>). 1717Freezes the player and moves him/her to a special map (C<{link}>).
1659 1718
1660The player should be reaosnably safe there for short amounts of time. You 1719The player should be reasonably safe there for short amounts of time. You
1661I<MUST> call C<leave_link> as soon as possible, though. 1720I<MUST> call C<leave_link> as soon as possible, though.
1662 1721
1722Will never block.
1723
1663=item $player_object->leave_link ($map, $x, $y) 1724=item $player_object->leave_link ($map, $x, $y)
1664 1725
1665Moves the player out of the specila link map onto the given map. If the 1726Moves 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 1727map. 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, 1728to the location he/she was before the call to C<enter_link>, or, if that
1668to the emergency map position. 1729fails, to the emergency map position.
1669 1730
1670Might block. 1731Might block.
1671 1732
1672=cut 1733=cut
1734
1735sub link_map {
1736 unless ($LINK_MAP) {
1737 $LINK_MAP = cf::map::find "{link}"
1738 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1739 $LINK_MAP->load;
1740 }
1741
1742 $LINK_MAP
1743}
1673 1744
1674sub cf::object::player::enter_link { 1745sub cf::object::player::enter_link {
1675 my ($self) = @_; 1746 my ($self) = @_;
1676 1747
1677 $self->deactivate_recursive; 1748 $self->deactivate_recursive;
1678 1749
1679 return if $self->map == $LINK_MAP; 1750 return if UNIVERSAL::isa $self->map, "ext::map_link";
1680 1751
1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1682 if $self->map; 1753 if $self->map;
1683 1754
1684 $self->enter_map ($LINK_MAP, 20, 20); 1755 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1685} 1756}
1686 1757
1687sub cf::object::player::leave_link { 1758sub cf::object::player::leave_link {
1688 my ($self, $map, $x, $y) = @_; 1759 my ($self, $map, $x, $y) = @_;
1689 1760
… …
1707 # use -1 or undef as default coordinates, not 0, 0 1778 # use -1 or undef as default coordinates, not 0, 0
1708 ($x, $y) = ($map->enter_x, $map->enter_y) 1779 ($x, $y) = ($map->enter_x, $map->enter_y)
1709 if $x <=0 && $y <= 0; 1780 if $x <=0 && $y <= 0;
1710 1781
1711 $map->load; 1782 $map->load;
1783 $map->load_diag;
1712 1784
1713 return unless $self->contr->active; 1785 return unless $self->contr->active;
1714 $self->activate_recursive; 1786 $self->activate_recursive;
1715 $self->enter_map ($map, $x, $y); 1787 $self->enter_map ($map, $x, $y);
1716} 1788}
… …
1752=cut 1824=cut
1753 1825
1754sub cf::object::player::goto { 1826sub cf::object::player::goto {
1755 my ($self, $path, $x, $y) = @_; 1827 my ($self, $path, $x, $y) = @_;
1756 1828
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1760 $self->enter_link; 1829 $self->enter_link;
1761 1830
1762 (async { 1831 (async {
1832 my $map = eval {
1763 my $map = cf::map::find $path->as_string; 1833 my $map = cf::map::find $path;
1764 $map = $map->customise_for ($self) if $map; 1834 $map = $map->customise_for ($self) if $map;
1765 1835 $map
1766# warn "entering ", $map->path, " at ($x, $y)\n" 1836 } or
1767# if $map;
1768
1769 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1837 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1770 1838
1771 $self->leave_link ($map, $x, $y); 1839 $self->leave_link ($map, $x, $y);
1772 })->prio (1); 1840 })->prio (1);
1773} 1841}
1774 1842
… …
1778 1846
1779sub parse_random_map_params { 1847sub parse_random_map_params {
1780 my ($spec) = @_; 1848 my ($spec) = @_;
1781 1849
1782 my $rmp = { # defaults 1850 my $rmp = { # defaults
1783 xsize => 10, 1851 xsize => (cf::rndm 15, 40),
1784 ysize => 10, 1852 ysize => (cf::rndm 15, 40),
1853 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1854 #layout => string,
1785 }; 1855 };
1786 1856
1787 for (split /\n/, $spec) { 1857 for (split /\n/, $spec) {
1788 my ($k, $v) = split /\s+/, $_, 2; 1858 my ($k, $v) = split /\s+/, $_, 2;
1789 1859
… …
1793 $rmp 1863 $rmp
1794} 1864}
1795 1865
1796sub prepare_random_map { 1866sub prepare_random_map {
1797 my ($exit) = @_; 1867 my ($exit) = @_;
1868
1869 my $guard = cf::lock_acquire "exit_prepare:$exit";
1798 1870
1799 # all this does is basically replace the /! path by 1871 # all this does is basically replace the /! path by
1800 # a new random map path (?random/...) with a seed 1872 # a new random map path (?random/...) with a seed
1801 # that depends on the exit object 1873 # that depends on the exit object
1802 1874
1803 my $rmp = parse_random_map_params $exit->msg; 1875 my $rmp = parse_random_map_params $exit->msg;
1804 1876
1805 if ($exit->map) { 1877 if ($exit->map) {
1806 $rmp->{region} = $exit->map->region_name; 1878 $rmp->{region} = $exit->region->name;
1807 $rmp->{origin_map} = $exit->map->path; 1879 $rmp->{origin_map} = $exit->map->path;
1808 $rmp->{origin_x} = $exit->x; 1880 $rmp->{origin_x} = $exit->x;
1809 $rmp->{origin_y} = $exit->y; 1881 $rmp->{origin_y} = $exit->y;
1810 } 1882 }
1811 1883
1812 $rmp->{random_seed} ||= $exit->random_seed; 1884 $rmp->{random_seed} ||= $exit->random_seed;
1813 1885
1814 my $data = cf::to_json $rmp; 1886 my $data = cf::to_json $rmp;
1815 my $md5 = Digest::MD5::md5_hex $data; 1887 my $md5 = Digest::MD5::md5_hex $data;
1888 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1816 1889
1817 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1890 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1818 aio_write $fh, 0, (length $data), $data, 0; 1891 aio_write $fh, 0, (length $data), $data, 0;
1892 undef $fh;
1893 aio_rename "$meta~", $meta;
1819 1894
1820 $exit->slaying ("?random/$md5"); 1895 $exit->slaying ("?random/$md5");
1821 $exit->msg (undef); 1896 $exit->msg (undef);
1822 } 1897 }
1823} 1898}
1824 1899
1825sub cf::object::player::enter_exit { 1900sub cf::object::player::enter_exit {
1826 my ($self, $exit) = @_; 1901 my ($self, $exit) = @_;
1827 1902
1828 return unless $self->type == cf::PLAYER; 1903 return unless $self->type == cf::PLAYER;
1904
1905 if ($exit->slaying eq "/!") {
1906 #TODO: this should de-fi-ni-te-ly not be a sync-job
1907 cf::sync_job { prepare_random_map $exit };
1908 }
1909
1910 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1911 my $hp = $exit->stats->hp;
1912 my $sp = $exit->stats->sp;
1829 1913
1830 $self->enter_link; 1914 $self->enter_link;
1831 1915
1832 (async { 1916 (async {
1833 $self->deactivate_recursive; # just to be sure 1917 $self->deactivate_recursive; # just to be sure
1834 unless (eval { 1918 unless (eval {
1835 prepare_random_map $exit 1919 $self->goto ($slaying, $hp, $sp);
1836 if $exit->slaying eq "/!";
1837
1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1840 1920
1841 1; 1921 1;
1842 }) { 1922 }) {
1843 $self->message ("Something went wrong deep within the crossfire server. " 1923 $self->message ("Something went wrong deep within the crossfire server. "
1844 . "I'll try to bring you back to the map you were before. " 1924 . "I'll try to bring you back to the map you were before. "
1845 . "Please report this to the dungeon master", 1925 . "Please report this to the dungeon master!",
1846 cf::NDI_UNIQUE | cf::NDI_RED); 1926 cf::NDI_UNIQUE | cf::NDI_RED);
1847 1927
1848 warn "ERROR in enter_exit: $@"; 1928 warn "ERROR in enter_exit: $@";
1849 $self->leave_link; 1929 $self->leave_link;
1850 } 1930 }
… …
2133 sub db_sync() { 2213 sub db_sync() {
2134 db_save if $dirty; 2214 db_save if $dirty;
2135 undef $dirty; 2215 undef $dirty;
2136 } 2216 }
2137 2217
2138 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2218 my $idle = Event->idle (
2139 db_sync; 2219 reentrant => 0,
2220 min => 10,
2221 max => 20,
2222 repeat => 0,
2223 data => WF_AUTOCANCEL,
2224 cb => \&db_sync,
2140 }); 2225 );
2141 2226
2142 sub db_dirty() { 2227 sub db_dirty() {
2143 $dirty = 1; 2228 $dirty = 1;
2144 $idle->start; 2229 $idle->start;
2145 } 2230 }
… …
2193 2278
2194sub main { 2279sub main {
2195 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2196 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2282 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2283 (async {
2198 async { Event::one_event }; 2284 Event::one_event;
2285 })->prio (Coro::PRIO_MAX);
2199 }; 2286 };
2200 2287
2201 cfg_load; 2288 cfg_load;
2202 db_load; 2289 db_load;
2203 load_extensions; 2290 load_extensions;
2291
2292 $TICK_WATCHER->start;
2204 Event::loop; 2293 Event::loop;
2205} 2294}
2206 2295
2207############################################################################# 2296#############################################################################
2208# initialisation and cleanup 2297# initialisation and cleanup
2209 2298
2210# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2211BEGIN { 2300BEGIN {
2212 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2213 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2214 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2215 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2216 cb => sub { 2307 cb => sub {
2217 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2218 }, 2309 },
2219 ); 2310 );
2220 } 2311 }
2221} 2312}
… …
2226 warn "enter emergency perl save\n"; 2317 warn "enter emergency perl save\n";
2227 2318
2228 cf::sync_job { 2319 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl 2320 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players 2321 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously. 2322 # and maps saved/destroyed asynchronously.
2232 warn "begin emergency player save\n"; 2323 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) { 2324 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next; 2325 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next; 2326 $pl->valid or next;
2236 $pl->save; 2327 $pl->save;
… …
2250} 2341}
2251 2342
2252sub reload() { 2343sub reload() {
2253 # can/must only be called in main 2344 # can/must only be called in main
2254 if ($Coro::current != $Coro::main) { 2345 if ($Coro::current != $Coro::main) {
2255 warn "can only reload from main coroutine\n"; 2346 warn "can only reload from main coroutine";
2256 return; 2347 return;
2257 } 2348 }
2258 2349
2259 warn "reloading..."; 2350 warn "reloading...";
2260 2351
2261 my $guard = freeze_mainloop; 2352 warn "cancelling server ticker";
2353 $TICK_WATCHER->cancel;
2354
2262 cf::emergency_save; 2355 cf::emergency_save;
2263 2356
2264 eval { 2357 eval {
2265 # if anything goes wrong in here, we should simply crash as we already saved 2358 # if anything goes wrong in here, we should simply crash as we already saved
2266 2359
2267 # cancel all watchers 2360 warn "syncing database to disk";
2361 cf::db_sync;
2362
2363 warn "cancelling all WF_AUTOCANCEL watchers";
2268 for (Event::all_watchers) { 2364 for (Event::all_watchers) {
2269 $_->cancel if $_->data & WF_AUTOCANCEL; 2365 $_->cancel if $_->data & WF_AUTOCANCEL;
2270 } 2366 }
2271 2367
2368 warn "flushing outstanding aio requests";
2369 for (;;) {
2370 IO::AIO::flush;
2371 Coro::cede;
2372 last unless IO::AIO::nreqs;
2373 warn "iterate...";
2374 }
2375
2272 # cancel all extension coros 2376 warn "cancelling all extension coros";
2273 $_->cancel for values %EXT_CORO; 2377 $_->cancel for values %EXT_CORO;
2274 %EXT_CORO = (); 2378 %EXT_CORO = ();
2275 2379
2276 # unload all extensions 2380 warn "removing commands";
2277 for (@exts) { 2381 %COMMAND = ();
2382
2383 warn "removing ext commands";
2384 %EXTCMD = ();
2385
2386 warn "unloading/nuking all extensions";
2387 for my $pkg (@EXTS) {
2278 warn "unloading <$_>"; 2388 warn "... unloading $pkg";
2279 unload_extension $_; 2389
2390 if (my $cb = $pkg->can ("unload")) {
2391 eval {
2392 $cb->($pkg);
2393 1
2394 } or warn "$pkg unloaded, but with errors: $@";
2280 } 2395 }
2281 2396
2397 warn "... nuking $pkg";
2398 Symbol::delete_package $pkg;
2399 }
2400
2282 # unload all modules loaded from $LIBDIR 2401 warn "unloading all perl modules loaded from $LIBDIR";
2283 while (my ($k, $v) = each %INC) { 2402 while (my ($k, $v) = each %INC) {
2284 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2403 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2285 2404
2286 warn "removing <$k>"; 2405 warn "... unloading $k";
2287 delete $INC{$k}; 2406 delete $INC{$k};
2288 2407
2289 $k =~ s/\.pm$//; 2408 $k =~ s/\.pm$//;
2290 $k =~ s/\//::/g; 2409 $k =~ s/\//::/g;
2291 2410
… …
2294 } 2413 }
2295 2414
2296 Symbol::delete_package $k; 2415 Symbol::delete_package $k;
2297 } 2416 }
2298 2417
2299 # sync database to disk
2300 cf::db_sync;
2301 IO::AIO::flush;
2302
2303 # get rid of safe::, as good as possible 2418 warn "getting rid of safe::, as good as possible";
2304 Symbol::delete_package "safe::$_" 2419 Symbol::delete_package "safe::$_"
2305 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2420 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2306 2421
2307 # remove register_script_function callbacks
2308 # TODO
2309
2310 # unload cf.pm "a bit" 2422 warn "unloading cf.pm \"a bit\"";
2311 delete $INC{"cf.pm"}; 2423 delete $INC{"cf.pm"};
2312 2424
2313 # don't, removes xs symbols, too, 2425 # don't, removes xs symbols, too,
2314 # and global variables created in xs 2426 # and global variables created in xs
2315 #Symbol::delete_package __PACKAGE__; 2427 #Symbol::delete_package __PACKAGE__;
2316 2428
2317 # reload cf.pm 2429 warn "unload completed, starting to reload now";
2430
2318 warn "reloading cf.pm"; 2431 warn "reloading cf.pm";
2319 require cf; 2432 require cf;
2320 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2433 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2321 2434
2322 # load config and database again 2435 warn "loading config and database again";
2323 cf::cfg_load; 2436 cf::cfg_load;
2324 cf::db_load; 2437 cf::db_load;
2325 2438
2326 # load extensions
2327 warn "load extensions"; 2439 warn "loading extensions";
2328 cf::load_extensions; 2440 cf::load_extensions;
2329 2441
2330 # reattach attachments to objects 2442 warn "reattaching attachments to objects/players";
2331 warn "reattach";
2332 _global_reattach; 2443 _global_reattach;
2444 warn "reattaching attachments to maps";
2333 reattach $_ for values %MAP; 2445 reattach $_ for values %MAP;
2446
2447 warn "restarting server ticker";
2448
2449 $TICK_WATCHER->start;
2334 }; 2450 };
2335 2451
2336 if ($@) { 2452 if ($@) {
2337 warn $@; 2453 warn $@;
2338 warn "error while reloading, exiting."; 2454 warn "error while reloading, exiting.";
2339 exit 1; 2455 exit 1;
2340 } 2456 }
2341 2457
2342 warn "reloaded successfully"; 2458 warn "reloaded";
2343}; 2459};
2344 2460
2345############################################################################# 2461our $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 2462
2390register_command "reload" => sub { 2463register_command "reload" => sub {
2391 my ($who, $arg) = @_; 2464 my ($who, $arg) = @_;
2392 2465
2393 if ($who->flag (FLAG_WIZ)) { 2466 if ($who->flag (FLAG_WIZ)) {
2394 $who->message ("start of reload."); 2467 $who->message ("reloading server.");
2468
2469 # doing reload synchronously and two reloads happen back-to-back,
2470 # coro crashes during coro_state_free->destroy here.
2471
2472 $RELOAD_WATCHER ||= Event->timer (
2473 reentrant => 0,
2474 after => 0,
2475 data => WF_AUTOCANCEL,
2476 cb => sub {
2395 reload; 2477 reload;
2396 $who->message ("end of reload."); 2478 undef $RELOAD_WATCHER;
2479 },
2480 );
2397 } 2481 }
2398}; 2482};
2399 2483
2400unshift @INC, $LIBDIR; 2484unshift @INC, $LIBDIR;
2485
2486my $bug_warning = 0;
2401 2487
2402$TICK_WATCHER = Event->timer ( 2488$TICK_WATCHER = Event->timer (
2403 reentrant => 0, 2489 reentrant => 0,
2490 parked => 1,
2404 prio => 0, 2491 prio => 0,
2405 at => $NEXT_TICK || $TICK, 2492 at => $NEXT_TICK || $TICK,
2406 data => WF_AUTOCANCEL, 2493 data => WF_AUTOCANCEL,
2407 cb => sub { 2494 cb => sub {
2495 if ($Coro::current != $Coro::main) {
2496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2497 unless ++$bug_warning > 10;
2498 return;
2499 }
2500
2501 $NOW = Event::time;
2502
2408 cf::server_tick; # one server iteration 2503 cf::server_tick; # one server iteration
2409 $RUNTIME += $TICK; 2504 $RUNTIME += $TICK;
2410 $NEXT_TICK += $TICK; 2505 $NEXT_TICK += $TICK;
2411 2506
2412 $WAIT_FOR_TICK->broadcast; 2507 $WAIT_FOR_TICK->broadcast;
2413 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2509
2510 Event::sweep;
2511 Coro::cede_notself;
2512
2513# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d#
2414 2515
2415 # if we are delayed by four ticks or more, skip them all 2516 # if we are delayed by four ticks or more, skip them all
2416 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2417 2518
2418 $TICK_WATCHER->at ($NEXT_TICK); 2519 $TICK_WATCHER->at ($NEXT_TICK);
2419 $TICK_WATCHER->start; 2520 $TICK_WATCHER->start;
2420 }, 2521 },
2421); 2522);
2422 2523
2423IO::AIO::max_poll_time $TICK * 0.2; 2524IO::AIO::max_poll_time $TICK * 0.1;
2424 2525
2425Event->io ( 2526undef $Coro::AIO::WATCHER;
2527$AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0,
2426 fd => IO::AIO::poll_fileno, 2529 fd => IO::AIO::poll_fileno,
2427 poll => 'r', 2530 poll => 'r',
2428 prio => 5, 2531 prio => 6,
2429 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2430 cb => \&IO::AIO::poll_cb, 2533 cb => \&IO::AIO::poll_cb,
2431); 2534);
2432 2535
2433Event->timer ( 2536$WRITE_RUNTIME_WATCHER = Event->timer (
2537 reentrant => 0,
2434 data => WF_AUTOCANCEL, 2538 data => WF_AUTOCANCEL,
2435 after => 0, 2539 after => 1,
2436 interval => 10, 2540 interval => 10,
2437 cb => sub { 2541 prio => 6, # keep it lowest so it acts like a watchdog
2438 (Coro::unblock_sub { 2542 cb => Coro::unblock_sub {
2439 write_runtime 2543 write_runtime
2440 or warn "ERROR: unable to write runtime file: $!"; 2544 or warn "ERROR: unable to write runtime file: $!";
2441 })->();
2442 }, 2545 },
2443); 2546);
2444 2547
2445END { cf::emergency_save } 2548END { cf::emergency_save }
2446 2549

Diff Legend

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