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.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.196 by root, Sat Jan 27 23:59:29 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
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378sub new {
379 my ($class, $path, $base) = @_;
380
381 $path = $path->as_string if ref $path;
382
383 my $self = bless { }, $class;
384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else {
401 if ($path =~ s{^~([^/]+)?}{}) {
402 $self->{user_rel} = 1;
403
404 if (defined $1) {
405 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1;
408 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 }
411 } elsif ($path =~ /^\//) {
412 # already absolute
413 } else {
414 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path");
416 }
417
418 for ($path) {
419 redo if s{/\.?/}{/};
420 redo if s{/[^/]+/\.\./}{/};
421 }
422 }
423
424 $self->{path} = $path;
425
426 $self
427}
428
429# the name / primary key / in-game path
430sub as_string {
431 my ($self) = @_;
432
433 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}"
435 : $self->{path}
436}
437
438# the displayed name, this is a one way mapping
439sub visible_name {
440 my ($self) = @_;
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448}
449
450# escape the /'s in the path
451sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453 $path
454}
455
456# the original (read-only) location
457sub load_path {
458 my ($self) = @_;
459
460 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461}
462
463# the temporary/swap location
464sub save_path {
465 my ($self) = @_;
466
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470}
471
472# the unique path, might be eq to save_path
473sub uniq_path {
474 my ($self) = @_;
475
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486}
487
488# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map {
490 $_[0]{path} =~ m{^/styles/}
491}
492
493package cf;
494 376
495############################################################################# 377#############################################################################
496 378
497=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
498 380
… …
624our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
625our @CB_MAP = (); 507our @CB_MAP = ();
626 508
627my %attachment; 509my %attachment;
628 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
629sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
630 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
631 519
632 use sort 'stable'; 520 use sort 'stable';
633 521
… …
804# object support 692# object support
805 693
806sub reattach { 694sub reattach {
807 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
808 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
809 699
810 my $registry = $obj->registry; 700 my $registry = $obj->registry;
811 701
812 @$registry = (); 702 @$registry = ();
813 703
… …
945=cut 835=cut
946 836
947sub register_extcmd { 837sub register_extcmd {
948 my ($name, $cb) = @_; 838 my ($name, $cb) = @_;
949 839
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 840 $EXTCMD{$name} = $cb;
954} 841}
955 842
956cf::player->attach ( 843cf::player->attach (
957 on_command => sub { 844 on_command => sub {
958 my ($pl, $name, $params) = @_; 845 my ($pl, $name, $params) = @_;
… …
971 858
972 my $msg = eval { from_json $buf }; 859 my $msg = eval { from_json $buf };
973 860
974 if (ref $msg) { 861 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 862 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 863 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 864 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 865 }
979 } 866 }
980 } else { 867 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 868 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 870
984 cf::override; 871 cf::override;
985 }, 872 },
986); 873);
987 874
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 875sub load_extension {
995 my ($path) = @_; 876 my ($path) = @_;
996 877
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 879 my $base = $1;
999 my $pkg = $1; 880 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 881 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 882 $pkg = "ext::$pkg";
1002 883
1003 warn "loading '$path' into '$pkg'\n"; 884 warn "... loading '$path' into '$pkg'\n";
1004 885
1005 open my $fh, "<:utf8", $path 886 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 887 or die "$path: $!";
1007 888
1008 my $source = 889 my $source =
1009 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 893 . "\n};\n1";
1013 894
1014 eval $source 895 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 897 : "extension disabled.\n";
1017 898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 899 warn $@;
1019 $ext_pkg{$base} = $pkg; 900 warn "mandatory extension failed to load, exiting.\n";
1020 901 exit 1;
1021# no strict 'refs'; 902 }
1022# @{"$pkg\::ISA"} = ext::; 903 die $@;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# } 904 }
1037 905
1038 # remove commands 906 push @EXTS, $pkg;
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 907}
1063 908
1064sub load_extensions { 909sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 910 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 911 next unless -r $ext;
… …
1070 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1071 } 916 }
1072} 917}
1073 918
1074############################################################################# 919#############################################################################
1075# load/save/clean perl data associated with a map
1076
1077*cf::mapsupport::on_clean = sub {
1078 my ($map) = @_;
1079
1080 my $path = $map->tmpname;
1081 defined $path or return;
1082
1083 unlink "$path.pst";
1084};
1085
1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088#############################################################################
1089 920
1090=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1091 922
1092Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1093 924
… …
1129 960
1130sub exists($) { 961sub exists($) {
1131 my ($login) = @_; 962 my ($login) = @_;
1132 963
1133 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1135} 966}
1136 967
1137sub find($) { 968sub find($) {
1138 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0]; 970 my $login = $_[0];
… …
1229 \@logins 1060 \@logins
1230} 1061}
1231 1062
1232=item $player->maps 1063=item $player->maps
1233 1064
1234Returns 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
1235player. May block. 1066player. May block.
1236 1067
1237=cut 1068=cut
1238 1069
1239sub maps($) { 1070sub maps($) {
… …
1247 for (@$files) { 1078 for (@$files) {
1248 utf8::decode $_; 1079 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1251 1082
1083 s/\.map$//;
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1253 } 1085 }
1254 1086
1255 \@paths 1087 \@paths
1256} 1088}
1257 1089
… …
1283package cf::map; 1115package cf::map;
1284 1116
1285use Fcntl; 1117use Fcntl;
1286use Coro::AIO; 1118use Coro::AIO;
1287 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1288our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1290 1126
1291sub generate_random_map { 1127sub generate_random_map {
1292 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1293
1294 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1130 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $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},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (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
1308} 1270}
1309 1271
1310# and all this just because we cannot iterate over 1272# and all this just because we cannot iterate over
1311# all maps in C++... 1273# all maps in C++...
1312sub change_all_map_light { 1274sub change_all_map_light {
… …
1314 1276
1315 $_->change_map_light ($change) 1277 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1278 for grep $_->outdoor, values %cf::MAP;
1317} 1279}
1318 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
1319sub try_load_header($) { 1289sub load_header_from($) {
1320 my ($path) = @_; 1290 my ($self, $path) = @_;
1321 1291
1322 utf8::encode $path; 1292 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1293 aio_open $path, O_RDONLY, 0
1324 or return; 1294 or return;
1325 1295
1326 my $map = cf::map::new 1296 $self->_load_header ($path)
1327 or return; 1297 or return;
1328 1298
1329 # for better error messages only, will be overwritten 1299 $self->{load_path} = $path;
1330 $map->path ($path);
1331 1300
1332 $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
1333 or return; 1342 or return;
1343 $self->prepare_orig;
1344 }
1334 1345
1335 $map->{load_path} = $path; 1346 1
1336
1337 $map
1338} 1347}
1339 1348
1340sub find; 1349sub find;
1341sub find { 1350sub find {
1342 my ($path, $origin) = @_; 1351 my ($path, $origin) = @_;
1343 1352
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1353 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1354
1349 cf::lock_wait "map_find:$key"; 1355 cf::lock_wait "map_find:$path";
1350 1356
1351 $cf::MAP{$key} || do { 1357 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1358 my $guard = cf::lock_acquire "map_find:$path";
1353 1359 my $map = new_from_path cf::map $path
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1360 or return;
1373 1361
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME; 1362 $map->{last_save} = $cf::RUNTIME;
1386 1363
1387 Coro::cede; 1364 $map->load_header
1365 or return;
1388 1366
1389 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;
1390 $map->reset; 1370 $map->reset;
1391 undef $guard; 1371 undef $guard;
1392 $map = find $path 1372 return find $path;
1393 or return;
1394 } 1373 }
1395 1374
1396 $cf::MAP{$key} = $map 1375 $cf::MAP{$path} = $map
1397 } 1376 }
1398} 1377}
1378
1379sub pre_load { }
1380sub post_load { }
1399 1381
1400sub load { 1382sub load {
1401 my ($self) = @_; 1383 my ($self) = @_;
1402 1384
1385 local $self->{deny_reset} = 1; # loading can take a long time
1386
1403 my $path = $self->{path}; 1387 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1388 my $guard = cf::lock_acquire "map_load:$path";
1405 1389
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1390 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1391
1408 $self->in_memory (cf::MAP_LOADING); 1392 $self->in_memory (cf::MAP_LOADING);
1409 1393
1410 $self->alloc; 1394 $self->alloc;
1395
1396 $self->pre_load;
1397
1411 $self->load_objects ($self->{load_path}, 1) 1398 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1399 or return;
1413 1400
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1401 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1402 if delete $self->{load_original};
1416 1403
1417 if (my $uniq = $path->uniq_path) { 1404 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1405 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1406 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1407 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1408 $self->_load_objects ($uniq, 0);
1422 } 1409 }
1423 } 1410 }
1424 1411
1425 Coro::cede; 1412 Coro::cede;
1426 1413
1427 # now do the right thing for maps 1414 # now do the right thing for maps
1428 $self->link_multipart_objects; 1415 $self->link_multipart_objects;
1429 1416
1430 if ($self->{path}->is_style_map) { 1417 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1418 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1419 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1420 $self->update_buttons;
1421 Coro::cede;
1437 $self->set_darkness_map; 1422 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1423 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1424 unless $self->difficulty;
1425 Coro::cede;
1440 $self->activate; 1426 $self->activate;
1441 } 1427 }
1442 1428
1443 Coro::cede; 1429 $self->post_load;
1444 1430
1445 $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
1446} 1441}
1447 1442
1448# find and load all maps in the 3x3 area around a map 1443# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1444sub load_diag {
1450 my ($map) = @_; 1445 my ($map) = @_;
… …
1480 1475
1481 cf::sync_job { $map->load }; 1476 cf::sync_job { $map->load };
1482} 1477}
1483 1478
1484our %MAP_PREFETCH; 1479our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1480our $MAP_PREFETCHER = undef;
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495 }
1496 Coro::schedule;
1497 }
1498};
1499 1481
1500sub find_async { 1482sub find_async {
1501 my ($path, $origin) = @_; 1483 my ($path, $origin) = @_;
1502 1484
1503 $path = new cf::path $path, $origin && $origin->path; 1485 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1486
1506 if (my $map = $cf::MAP{$key}) { 1487 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1488 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1489 }
1509 1490
1510 $MAP_PREFETCH{$key} = $path; 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 };
1511 $MAP_PREFETCHER->ready; 1504 $MAP_PREFETCHER->prio (6);
1512 1505
1513 () 1506 ()
1514} 1507}
1515 1508
1516sub save { 1509sub save {
… …
1520 1513
1521 $self->{last_save} = $cf::RUNTIME; 1514 $self->{last_save} = $cf::RUNTIME;
1522 1515
1523 return unless $self->dirty; 1516 return unless $self->dirty;
1524 1517
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1518 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1519 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1520
1528 $self->{load_path} = $save; 1521 $self->{load_path} = $save;
1529 1522
1530 return if $self->{deny_save}; 1523 return if $self->{deny_save};
1531 1524
… …
1534 cf::async { 1527 cf::async {
1535 $_->contr->save for $self->players; 1528 $_->contr->save for $self->players;
1536 }; 1529 };
1537 1530
1538 if ($uniq) { 1531 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1532 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1533 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1534 } else {
1542 $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);
1543 } 1536 }
1544} 1537}
1545 1538
1546sub swap_out { 1539sub swap_out {
1547 my ($self) = @_; 1540 my ($self) = @_;
… …
1561 1554
1562sub reset_at { 1555sub reset_at {
1563 my ($self) = @_; 1556 my ($self) = @_;
1564 1557
1565 # TODO: safety, remove and allow resettable per-player maps 1558 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1559 return 1e99 if $self->isa ("ext::map_per_player");#d#
1567 return 1e99 if $self->{deny_reset}; 1560 return 1e99 if $self->{deny_reset};
1568 1561
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1562 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 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;
1571 1564
… …
1576 my ($self) = @_; 1569 my ($self) = @_;
1577 1570
1578 $self->reset_at <= $cf::RUNTIME 1571 $self->reset_at <= $cf::RUNTIME
1579} 1572}
1580 1573
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename {
1590 my ($self, $new_path) = @_;
1591
1592 $self->unlink_save;
1593
1594 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path;
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self;
1598
1599 $self->save;
1600}
1601
1602sub reset { 1574sub reset {
1603 my ($self) = @_; 1575 my ($self) = @_;
1604 1576
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1577 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1578
1607 return if $self->players; 1579 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1580 return if $self->isa ("ext::map_per_player");#d#
1609 1581
1610 warn "resetting map ", $self->path;#d# 1582 warn "resetting map ", $self->path;#d#
1611 1583
1612 delete $cf::MAP{$self->path}; 1584 delete $cf::MAP{$self->path};
1585
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear;
1613 1588
1614 $_->clear_links_to ($self) for values %cf::MAP; 1589 $_->clear_links_to ($self) for values %cf::MAP;
1615 1590
1616 $self->unlink_save; 1591 $self->unlink_save;
1617 $self->destroy; 1592 $self->destroy;
… …
1620my $nuke_counter = "aaaa"; 1595my $nuke_counter = "aaaa";
1621 1596
1622sub nuke { 1597sub nuke {
1623 my ($self) = @_; 1598 my ($self) = @_;
1624 1599
1600 delete $cf::MAP{$self->path};
1601
1602 $self->unlink_save;
1603
1604 bless $self, "cf::map";
1605 delete $self->{deny_reset};
1625 $self->{deny_save} = 1; 1606 $self->{deny_save} = 1;
1626 $self->reset_timeout (1); 1607 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1608 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1609
1610 $cf::MAP{$self->path} = $self;
1611
1628 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1629} 1613}
1630 1614
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps 1615=item cf::map::unique_maps
1642 1616
1643Returns an arrayref of cf::path's of all shared maps that have 1617Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1618instantiated unique items. May block.
1645 1619
1646=cut 1620=cut
1647 1621
1648sub unique_maps() { 1622sub unique_maps() {
… …
1654 for (@$files) { 1628 for (@$files) {
1655 utf8::decode $_; 1629 utf8::decode $_;
1656 next if /\.pst$/; 1630 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1631 next unless /^$PATH_SEP/o;
1658 1632
1633 s/\.map$//;
1659 push @paths, new cf::path $_; 1634 push @paths, $_;
1660 } 1635 }
1661 1636
1662 \@paths 1637 \@paths
1663} 1638}
1664 1639
… …
1739 1714
1740=item $player_object->enter_link 1715=item $player_object->enter_link
1741 1716
1742Freezes 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}>).
1743 1718
1744The 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
1745I<MUST> call C<leave_link> as soon as possible, though. 1720I<MUST> call C<leave_link> as soon as possible, though.
1746 1721
1722Will never block.
1723
1747=item $player_object->leave_link ($map, $x, $y) 1724=item $player_object->leave_link ($map, $x, $y)
1748 1725
1749Moves 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
1750map 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
1751location 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
1752to the emergency map position. 1729fails, to the emergency map position.
1753 1730
1754Might block. 1731Might block.
1755 1732
1756=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}
1757 1744
1758sub cf::object::player::enter_link { 1745sub cf::object::player::enter_link {
1759 my ($self) = @_; 1746 my ($self) = @_;
1760 1747
1761 $self->deactivate_recursive; 1748 $self->deactivate_recursive;
1762 1749
1763 return if $self->map == $LINK_MAP; 1750 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1751
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1753 if $self->map;
1767 1754
1768 $self->enter_map ($LINK_MAP, 20, 20); 1755 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1769} 1756}
1770 1757
1771sub cf::object::player::leave_link { 1758sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1759 my ($self, $map, $x, $y) = @_;
1773 1760
… …
1837=cut 1824=cut
1838 1825
1839sub cf::object::player::goto { 1826sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1827 my ($self, $path, $x, $y) = @_;
1841 1828
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1829 $self->enter_link;
1845 1830
1846 (async { 1831 (async {
1847 my $map = cf::map::find $path->as_string; 1832 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1833 $map = $map->customise_for ($self) if $map;
1849 1834
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1835# warn "entering ", $map->path, " at ($x, $y)\n"
1851# if $map; 1836# if $map;
1852 1837
… …
1862 1847
1863sub parse_random_map_params { 1848sub parse_random_map_params {
1864 my ($spec) = @_; 1849 my ($spec) = @_;
1865 1850
1866 my $rmp = { # defaults 1851 my $rmp = { # defaults
1867 xsize => 10, 1852 xsize => (cf::rndm 15, 40),
1868 ysize => 10, 1853 ysize => (cf::rndm 15, 40),
1854 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1855 #layout => string,
1869 }; 1856 };
1870 1857
1871 for (split /\n/, $spec) { 1858 for (split /\n/, $spec) {
1872 my ($k, $v) = split /\s+/, $_, 2; 1859 my ($k, $v) = split /\s+/, $_, 2;
1873 1860
… …
1877 $rmp 1864 $rmp
1878} 1865}
1879 1866
1880sub prepare_random_map { 1867sub prepare_random_map {
1881 my ($exit) = @_; 1868 my ($exit) = @_;
1869
1870 my $guard = cf::lock_acquire "exit_prepare:$exit";
1882 1871
1883 # all this does is basically replace the /! path by 1872 # all this does is basically replace the /! path by
1884 # a new random map path (?random/...) with a seed 1873 # a new random map path (?random/...) with a seed
1885 # that depends on the exit object 1874 # that depends on the exit object
1886 1875
… …
1895 1884
1896 $rmp->{random_seed} ||= $exit->random_seed; 1885 $rmp->{random_seed} ||= $exit->random_seed;
1897 1886
1898 my $data = cf::to_json $rmp; 1887 my $data = cf::to_json $rmp;
1899 my $md5 = Digest::MD5::md5_hex $data; 1888 my $md5 = Digest::MD5::md5_hex $data;
1889 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1900 1890
1901 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1891 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1902 aio_write $fh, 0, (length $data), $data, 0; 1892 aio_write $fh, 0, (length $data), $data, 0;
1893 undef $fh;
1894 aio_rename "$meta~", $meta;
1903 1895
1904 $exit->slaying ("?random/$md5"); 1896 $exit->slaying ("?random/$md5");
1905 $exit->msg (undef); 1897 $exit->msg (undef);
1906 } 1898 }
1907} 1899}
1908 1900
1909sub cf::object::player::enter_exit { 1901sub cf::object::player::enter_exit {
1910 my ($self, $exit) = @_; 1902 my ($self, $exit) = @_;
1911 1903
1912 return unless $self->type == cf::PLAYER; 1904 return unless $self->type == cf::PLAYER;
1905
1906 if ($exit->slaying eq "/!") {
1907 #TODO: this should de-fi-ni-te-ly not be a sync-job
1908 cf::sync_job { prepare_random_map $exit };
1909 }
1910
1911 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1912 my $hp = $exit->stats->hp;
1913 my $sp = $exit->stats->sp;
1913 1914
1914 $self->enter_link; 1915 $self->enter_link;
1915 1916
1916 (async { 1917 (async {
1917 $self->deactivate_recursive; # just to be sure 1918 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1919 unless (eval {
1919 prepare_random_map $exit 1920 $self->goto ($slaying, $hp, $sp);
1920 if $exit->slaying eq "/!";
1921
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1921
1925 1; 1922 1;
1926 }) { 1923 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1924 $self->message ("Something went wrong deep within the crossfire server. "
1928 . "I'll try to bring you back to the map you were before. " 1925 . "I'll try to bring you back to the map you were before. "
… …
2217 sub db_sync() { 2214 sub db_sync() {
2218 db_save if $dirty; 2215 db_save if $dirty;
2219 undef $dirty; 2216 undef $dirty;
2220 } 2217 }
2221 2218
2222 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2219 my $idle = Event->idle (
2223 db_sync; 2220 reentrant => 0,
2221 min => 10,
2222 max => 20,
2223 repeat => 0,
2224 data => WF_AUTOCANCEL,
2225 cb => \&db_sync,
2224 }); 2226 );
2225 2227
2226 sub db_dirty() { 2228 sub db_dirty() {
2227 $dirty = 1; 2229 $dirty = 1;
2228 $idle->start; 2230 $idle->start;
2229 } 2231 }
… …
2277 2279
2278sub main { 2280sub main {
2279 # we must not ever block the main coroutine 2281 # we must not ever block the main coroutine
2280 local $Coro::idle = sub { 2282 local $Coro::idle = sub {
2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2283 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2284 (async {
2282 async { Event::one_event }; 2285 Event::one_event;
2286 })->prio (Coro::PRIO_MAX);
2283 }; 2287 };
2284 2288
2285 cfg_load; 2289 cfg_load;
2286 db_load; 2290 db_load;
2287 load_extensions; 2291 load_extensions;
2292
2293 $TICK_WATCHER->start;
2288 Event::loop; 2294 Event::loop;
2289} 2295}
2290 2296
2291############################################################################# 2297#############################################################################
2292# initialisation and cleanup 2298# initialisation and cleanup
2293 2299
2294# install some emergency cleanup handlers 2300# install some emergency cleanup handlers
2295BEGIN { 2301BEGIN {
2296 for my $signal (qw(INT HUP TERM)) { 2302 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal ( 2303 Event->signal (
2304 reentrant => 0,
2298 data => WF_AUTOCANCEL, 2305 data => WF_AUTOCANCEL,
2299 signal => $signal, 2306 signal => $signal,
2307 prio => 0,
2300 cb => sub { 2308 cb => sub {
2301 cf::cleanup "SIG$signal"; 2309 cf::cleanup "SIG$signal";
2302 }, 2310 },
2303 ); 2311 );
2304 } 2312 }
2305} 2313}
… …
2310 warn "enter emergency perl save\n"; 2318 warn "enter emergency perl save\n";
2311 2319
2312 cf::sync_job { 2320 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2321 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2322 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2323 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2324 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2325 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2326 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2327 $pl->valid or next;
2320 $pl->save; 2328 $pl->save;
… …
2334} 2342}
2335 2343
2336sub reload() { 2344sub reload() {
2337 # can/must only be called in main 2345 # can/must only be called in main
2338 if ($Coro::current != $Coro::main) { 2346 if ($Coro::current != $Coro::main) {
2339 warn "can only reload from main coroutine\n"; 2347 warn "can only reload from main coroutine";
2340 return; 2348 return;
2341 } 2349 }
2342 2350
2343 warn "reloading..."; 2351 warn "reloading...";
2344 2352
2345 my $guard = freeze_mainloop; 2353 warn "cancelling server ticker";
2354 $TICK_WATCHER->cancel;
2355
2346 cf::emergency_save; 2356 cf::emergency_save;
2347 2357
2348 eval { 2358 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2359 # if anything goes wrong in here, we should simply crash as we already saved
2350 2360
2351 # cancel all watchers 2361 warn "syncing database to disk";
2362 cf::db_sync;
2363
2364 warn "cancelling all WF_AUTOCANCEL watchers";
2352 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2367 }
2355 2368
2369 warn "flushing outstanding aio requests";
2370 for (;;) {
2371 IO::AIO::flush;
2372 Coro::cede;
2373 last unless IO::AIO::nreqs;
2374 warn "iterate...";
2375 }
2376
2356 # cancel all extension coros 2377 warn "cancelling all extension coros";
2357 $_->cancel for values %EXT_CORO; 2378 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2379 %EXT_CORO = ();
2359 2380
2360 # unload all extensions 2381 warn "removing commands";
2361 for (@exts) { 2382 %COMMAND = ();
2383
2384 warn "removing ext commands";
2385 %EXTCMD = ();
2386
2387 warn "unloading/nuking all extensions";
2388 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2389 warn "... unloading $pkg";
2363 unload_extension $_; 2390
2391 if (my $cb = $pkg->can ("unload")) {
2392 eval {
2393 $cb->($pkg);
2394 1
2395 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2396 }
2365 2397
2398 warn "... nuking $pkg";
2399 Symbol::delete_package $pkg;
2400 }
2401
2366 # unload all modules loaded from $LIBDIR 2402 warn "unloading all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2403 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2404 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2405
2370 warn "removing <$k>"; 2406 warn "... unloading $k";
2371 delete $INC{$k}; 2407 delete $INC{$k};
2372 2408
2373 $k =~ s/\.pm$//; 2409 $k =~ s/\.pm$//;
2374 $k =~ s/\//::/g; 2410 $k =~ s/\//::/g;
2375 2411
… …
2378 } 2414 }
2379 2415
2380 Symbol::delete_package $k; 2416 Symbol::delete_package $k;
2381 } 2417 }
2382 2418
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2419 warn "getting rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2420 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2421 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2422
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2423 warn "unloading cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2424 delete $INC{"cf.pm"};
2396 2425
2397 # don't, removes xs symbols, too, 2426 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2427 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2428 #Symbol::delete_package __PACKAGE__;
2400 2429
2401 # reload cf.pm 2430 warn "unload completed, starting to reload now";
2431
2402 warn "reloading cf.pm"; 2432 warn "reloading cf.pm";
2403 require cf; 2433 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2434 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2435
2406 # load config and database again 2436 warn "loading config and database again";
2407 cf::cfg_load; 2437 cf::cfg_load;
2408 cf::db_load; 2438 cf::db_load;
2409 2439
2410 # load extensions
2411 warn "load extensions"; 2440 warn "loading extensions";
2412 cf::load_extensions; 2441 cf::load_extensions;
2413 2442
2414 # reattach attachments to objects 2443 warn "reattaching attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2444 _global_reattach;
2445 warn "reattaching attachments to maps";
2417 reattach $_ for values %MAP; 2446 reattach $_ for values %MAP;
2447
2448 warn "restarting server ticker";
2449
2450 $TICK_WATCHER->start;
2418 }; 2451 };
2419 2452
2420 if ($@) { 2453 if ($@) {
2421 warn $@; 2454 warn $@;
2422 warn "error while reloading, exiting."; 2455 warn "error while reloading, exiting.";
2423 exit 1; 2456 exit 1;
2424 } 2457 }
2425 2458
2426 warn "reloaded successfully"; 2459 warn "reloaded";
2427}; 2460};
2428 2461
2429############################################################################# 2462our $RELOAD_WATCHER; # used only during reload
2430
2431unless ($LINK_MAP) {
2432 $LINK_MAP = cf::map::new;
2433
2434 $LINK_MAP->width (41);
2435 $LINK_MAP->height (41);
2436 $LINK_MAP->alloc;
2437 $LINK_MAP->path ("{link}");
2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470}
2471
2472register "<global>", __PACKAGE__;
2473 2463
2474register_command "reload" => sub { 2464register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2465 my ($who, $arg) = @_;
2476 2466
2477 if ($who->flag (FLAG_WIZ)) { 2467 if ($who->flag (FLAG_WIZ)) {
2478 $who->message ("start of reload."); 2468 $who->message ("reloading server.");
2469
2470 # doing reload synchronously and two reloads happen back-to-back,
2471 # coro crashes during coro_state_free->destroy here.
2472
2473 $RELOAD_WATCHER ||= Event->timer (
2474 reentrant => 0,
2475 after => 0,
2476 data => WF_AUTOCANCEL,
2477 cb => sub {
2479 reload; 2478 reload;
2480 $who->message ("end of reload."); 2479 undef $RELOAD_WATCHER;
2480 },
2481 );
2481 } 2482 }
2482}; 2483};
2483 2484
2484unshift @INC, $LIBDIR; 2485unshift @INC, $LIBDIR;
2486
2487my $bug_warning = 0;
2485 2488
2486$TICK_WATCHER = Event->timer ( 2489$TICK_WATCHER = Event->timer (
2487 reentrant => 0, 2490 reentrant => 0,
2491 parked => 1,
2488 prio => 0, 2492 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2493 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2494 data => WF_AUTOCANCEL,
2491 cb => sub { 2495 cb => sub {
2496 if ($Coro::current != $Coro::main) {
2497 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2498 unless ++$bug_warning > 10;
2499 return;
2500 }
2501
2502 $NOW = Event::time;
2503
2492 cf::server_tick; # one server iteration 2504 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2505 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2506 $NEXT_TICK += $TICK;
2495 2507
2496 $WAIT_FOR_TICK->broadcast; 2508 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2509 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2510
2511 Event::sweep;
2512 Coro::cede_notself;
2513
2514# my $AFTER = Event::time;
2515# warn $AFTER - $NOW;#d#
2498 2516
2499 # if we are delayed by four ticks or more, skip them all 2517 # if we are delayed by four ticks or more, skip them all
2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2518 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2501 2519
2502 $TICK_WATCHER->at ($NEXT_TICK); 2520 $TICK_WATCHER->at ($NEXT_TICK);
2503 $TICK_WATCHER->start; 2521 $TICK_WATCHER->start;
2504 }, 2522 },
2505); 2523);
2506 2524
2507IO::AIO::max_poll_time $TICK * 0.2; 2525IO::AIO::max_poll_time $TICK * 0.1;
2508 2526
2509Event->io ( 2527undef $Coro::AIO::WATCHER;
2528$AIO_POLL_WATCHER = Event->io (
2529 reentrant => 0,
2510 fd => IO::AIO::poll_fileno, 2530 fd => IO::AIO::poll_fileno,
2511 poll => 'r', 2531 poll => 'r',
2512 prio => 5, 2532 prio => 6,
2513 data => WF_AUTOCANCEL, 2533 data => WF_AUTOCANCEL,
2514 cb => \&IO::AIO::poll_cb, 2534 cb => \&IO::AIO::poll_cb,
2515); 2535);
2516 2536
2517Event->timer ( 2537$WRITE_RUNTIME_WATCHER = Event->timer (
2538 reentrant => 0,
2518 data => WF_AUTOCANCEL, 2539 data => WF_AUTOCANCEL,
2519 after => 0, 2540 after => 1,
2520 interval => 10, 2541 interval => 10,
2521 cb => sub { 2542 prio => 6, # keep it lowest so it acts like a watchdog
2522 (Coro::unblock_sub { 2543 cb => Coro::unblock_sub {
2523 write_runtime 2544 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!"; 2545 or warn "ERROR: unable to write runtime file: $!";
2525 })->();
2526 }, 2546 },
2527); 2547);
2528 2548
2529END { cf::emergency_save } 2549END { cf::emergency_save }
2530 2550

Diff Legend

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