ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.157 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.188 by root, Sat Jan 20 23:30:16 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
33 33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
44our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
45our $NEXT_TICK; 51our $NEXT_TICK;
46our $NOW; 52our $NOW;
47 53
48our %CFG; 54our %CFG;
49 55
50our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 57our $RUNTIME;
52 58
53our %PLAYER; # all users 59our %PLAYER; # all users
54our %MAP; # all maps 60our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions
58 63
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61 69
62binmode STDOUT; 70binmode STDOUT;
63binmode STDERR; 71binmode STDERR;
64 72
65# read virtual server time, if available 73# read virtual server time, if available
… …
73mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
77 85
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
81 87
82############################################################################# 88#############################################################################
83 89
84=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
156} 162}
157 163
158$Event::DIED = sub { 164$Event::DIED = sub {
159 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
160}; 166};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 167
166=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
167 169
168=over 4 170=over 4
169 171
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
319 } 325 }
320} 326}
321 327
322=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
323 329
324Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 331extension calling this is being unloaded.
326 332
327=cut 333=cut
328 334
329sub async_ext(&) { 335sub async_ext(&) {
… …
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 # map plan:
1182 #
1183 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths
1186 # ?random/... random maps
1187 # /... normal maps
1188 # ~user/... per-player map of a specific user
1189
1190 $path =~ s/$PATH_SEP/\//go;
1191
1192 # treat it as relative path if it starts with
1193 # something that looks reasonable
1194 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1195 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1196
1197 $base =~ s{[^/]+/?$}{};
1198 $path = "$base/$path";
1199 }
1200
1201 for ($path) {
1202 redo if s{//}{/};
1203 redo if s{/\.?/}{/};
1204 redo if s{/[^/]+/\.\./}{/};
1205 }
1206
1207 $path
1208}
1209
1210sub new_from_path {
1211 my (undef, $path, $base) = @_;
1212
1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1214
1215 $path = normalise $path, $base;
1216
1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1219 my $self = bless cf::map::new, $pkg;
1220 $self->{path} = $path; $self->path ($path);
1221 $self->init; # pass $1 etc.
1222 return $self;
1223 }
1224 }
1225
1226 Carp::carp "unable to resolve path '$path'.";
1227 ()
1228}
1229
1230sub init {
1231 my ($self) = @_;
1232
1233 $self
1234}
1235
1236sub as_string {
1237 my ($self) = @_;
1238
1239 "$self->{path}"
1240}
1241
1242# the displayed name, this is a one way mapping
1243sub visible_name {
1244 &as_string
1245}
1246
1247# the original (read-only) location
1248sub load_path {
1249 my ($self) = @_;
1250
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1252}
1253
1254# the temporary/swap location
1255sub save_path {
1256 my ($self) = @_;
1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1260}
1261
1262# the unique path, undef == no special unique path
1263sub uniq_path {
1264 my ($self) = @_;
1265
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304} 1268}
1305 1269
1306# and all this just because we cannot iterate over 1270# and all this just because we cannot iterate over
1307# all maps in C++... 1271# all maps in C++...
1308sub change_all_map_light { 1272sub change_all_map_light {
… …
1310 1274
1311 $_->change_map_light ($change) 1275 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1276 for grep $_->outdoor, values %cf::MAP;
1313} 1277}
1314 1278
1279sub unlink_save {
1280 my ($self) = @_;
1281
1282 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1285}
1286
1315sub try_load_header($) { 1287sub load_header_from($) {
1316 my ($path) = @_; 1288 my ($self, $path) = @_;
1317 1289
1318 utf8::encode $path; 1290 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1291 aio_open $path, O_RDONLY, 0
1320 or return; 1292 or return;
1321 1293
1322 my $map = cf::map::new 1294 $self->_load_header ($path)
1323 or return; 1295 or return;
1324 1296
1325 # for better error messages only, will be overwritten 1297 $self->{load_path} = $path;
1326 $map->path ($path);
1327 1298
1328 $map->load_header ($path) 1299 1
1300}
1301
1302sub load_header_orig {
1303 my ($self) = @_;
1304
1305 $self->load_header_from ($self->load_path)
1306}
1307
1308sub load_header_temp {
1309 my ($self) = @_;
1310
1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub prepare_temp {
1315 my ($self) = @_;
1316
1317 $self->last_access ((delete $self->{last_access})
1318 || $cf::RUNTIME); #d#
1319 # safety
1320 $self->{instantiate_time} = $cf::RUNTIME
1321 if $self->{instantiate_time} > $cf::RUNTIME;
1322}
1323
1324sub prepare_orig {
1325 my ($self) = @_;
1326
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331}
1332
1333sub load_header {
1334 my ($self) = @_;
1335
1336 if ($self->load_header_temp) {
1337 $self->prepare_temp;
1338 } else {
1339 $self->load_header_orig
1329 or return; 1340 or return;
1341 $self->prepare_orig;
1342 }
1330 1343
1331 $map->{load_path} = $path; 1344 1
1332
1333 $map
1334} 1345}
1335 1346
1336sub find; 1347sub find;
1337sub find { 1348sub find {
1338 my ($path, $origin) = @_; 1349 my ($path, $origin) = @_;
1339 1350
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1351 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1352
1345 cf::lock_wait "map_find:$key"; 1353 cf::lock_wait "map_find:$path";
1346 1354
1347 $cf::MAP{$key} || do { 1355 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1356 my $guard = cf::lock_acquire "map_find:$path";
1349 1357 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; 1358 or return;
1369 1359
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; 1360 $map->{last_save} = $cf::RUNTIME;
1382 1361
1383 Coro::cede; 1362 $map->load_header
1363 or return;
1384 1364
1385 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait;
1386 $map->reset; 1368 $map->reset;
1387 undef $guard; 1369 undef $guard;
1388 $map = find $path 1370 $map = find $path
1389 or return; 1371 or return;
1390 } 1372 }
1391 1373
1392 $cf::MAP{$key} = $map 1374 $cf::MAP{$path} = $map
1393 } 1375 }
1394} 1376}
1377
1378sub pre_load { }
1379sub post_load { }
1395 1380
1396sub load { 1381sub load {
1397 my ($self) = @_; 1382 my ($self) = @_;
1398 1383
1399 my $path = $self->{path}; 1384 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1385 my $guard = cf::lock_acquire "map_load:$path";
1401 1386
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1388
1404 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1405 1390
1406 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1407 $self->load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1396 or return;
1409 1397
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1399 if delete $self->{load_original};
1412 1400
1413 if (my $uniq = $path->uniq_path) { 1401 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1402 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1403 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1404 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1405 $self->_load_objects ($uniq, 0);
1418 } 1406 }
1419 } 1407 }
1420 1408
1421 Coro::cede; 1409 Coro::cede;
1422 1410
1423 # now do the right thing for maps 1411 # now do the right thing for maps
1424 $self->link_multipart_objects; 1412 $self->link_multipart_objects;
1425 1413
1426 if ($self->{path}->is_style_map) { 1414 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1415 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1416 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1417 $self->update_buttons;
1418 Coro::cede;
1433 $self->set_darkness_map; 1419 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1420 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1421 unless $self->difficulty;
1422 Coro::cede;
1436 $self->activate; 1423 $self->activate;
1437 } 1424 }
1438 1425
1439 Coro::cede; 1426 $self->post_load;
1440 1427
1441 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1429}
1430
1431sub customise_for {
1432 my ($self, $ob) = @_;
1433
1434 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player;
1436
1437 $self
1442} 1438}
1443 1439
1444# find and load all maps in the 3x3 area around a map 1440# find and load all maps in the 3x3 area around a map
1445sub load_diag { 1441sub load_diag {
1446 my ($map) = @_; 1442 my ($map) = @_;
… …
1476 1472
1477 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1478} 1474}
1479 1475
1480our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async { 1477our $MAP_PREFETCHER = undef;
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1490 $map->load;
1491 }
1492 Coro::schedule;
1493 }
1494};
1495 1478
1496sub find_async { 1479sub find_async {
1497 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1498 1481
1499 $path = new cf::path $path, $origin && $origin->path; 1482 $path = normalise $path, $origin && $origin->{path};
1500 my $key = $path->as_string;
1501 1483
1502 if (my $map = $cf::MAP{$key}) { 1484 if (my $map = $cf::MAP{$path}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 } 1486 }
1505 1487
1506 $MAP_PREFETCH{$key} = $path; 1488 undef $MAP_PREFETCH{$path};
1507 $MAP_PREFETCHER->ready; 1489 $MAP_PREFETCHER ||= cf::async {
1490 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) {
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495
1496 delete $MAP_PREFETCH{$path};
1497 }
1498 }
1499 undef $MAP_PREFETCHER;
1500 };
1508 1501
1509 () 1502 ()
1510} 1503}
1511 1504
1512sub save { 1505sub save {
… …
1516 1509
1517 $self->{last_save} = $cf::RUNTIME; 1510 $self->{last_save} = $cf::RUNTIME;
1518 1511
1519 return unless $self->dirty; 1512 return unless $self->dirty;
1520 1513
1521 my $save = $self->{path}->save_path; utf8::encode $save; 1514 my $save = $self->save_path; utf8::encode $save;
1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1515 my $uniq = $self->uniq_path; utf8::encode $uniq;
1523 1516
1524 $self->{load_path} = $save; 1517 $self->{load_path} = $save;
1525 1518
1526 return if $self->{deny_save}; 1519 return if $self->{deny_save};
1527 1520
… …
1530 cf::async { 1523 cf::async {
1531 $_->contr->save for $self->players; 1524 $_->contr->save for $self->players;
1532 }; 1525 };
1533 1526
1534 if ($uniq) { 1527 if ($uniq) {
1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1528 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536 $self->save_objects ($uniq, cf::IO_UNIQUES); 1529 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1537 } else { 1530 } else {
1538 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1531 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1539 } 1532 }
1540} 1533}
1541 1534
1542sub swap_out { 1535sub swap_out {
1543 my ($self) = @_; 1536 my ($self) = @_;
… …
1557 1550
1558sub reset_at { 1551sub reset_at {
1559 my ($self) = @_; 1552 my ($self) = @_;
1560 1553
1561 # TODO: safety, remove and allow resettable per-player maps 1554 # TODO: safety, remove and allow resettable per-player maps
1562 return 1e99 if $self->{path}{user_rel}; 1555 return 1e99 if $self->isa ("ext::map_per_player");#d#
1563 return 1e99 if $self->{deny_reset}; 1556 return 1e99 if $self->{deny_reset};
1564 1557
1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1558 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1559 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1567 1560
… …
1572 my ($self) = @_; 1565 my ($self) = @_;
1573 1566
1574 $self->reset_at <= $cf::RUNTIME 1567 $self->reset_at <= $cf::RUNTIME
1575} 1568}
1576 1569
1577sub unlink_save {
1578 my ($self) = @_;
1579
1580 utf8::encode (my $save = $self->{path}->save_path);
1581 aioreq_pri 3; IO::AIO::aio_unlink $save;
1582 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1583}
1584
1585sub rename {
1586 my ($self, $new_path) = @_;
1587
1588 $self->unlink_save;
1589
1590 delete $cf::MAP{$self->path};
1591 $self->{path} = new cf::path $new_path;
1592 $self->path ($self->{path}->as_string);
1593 $cf::MAP{$self->path} = $self;
1594
1595 $self->save;
1596}
1597
1598sub reset { 1570sub reset {
1599 my ($self) = @_; 1571 my ($self) = @_;
1600 1572
1601 my $lock = cf::lock_acquire "map_data:" . $self->path; 1573 my $lock = cf::lock_acquire "map_data:$self->{path}";
1602 1574
1603 return if $self->players; 1575 return if $self->players;
1604 return if $self->{path}{user_rel};#d# 1576 return if $self->isa ("ext::map_per_player");#d#
1605 1577
1606 warn "resetting map ", $self->path;#d# 1578 warn "resetting map ", $self->path;#d#
1607 1579
1608 delete $cf::MAP{$self->path}; 1580 delete $cf::MAP{$self->path};
1581
1582 $self->in_memory (cf::MAP_SWAPPED);
1583 $self->clear;
1609 1584
1610 $_->clear_links_to ($self) for values %cf::MAP; 1585 $_->clear_links_to ($self) for values %cf::MAP;
1611 1586
1612 $self->unlink_save; 1587 $self->unlink_save;
1613 $self->destroy; 1588 $self->destroy;
… …
1616my $nuke_counter = "aaaa"; 1591my $nuke_counter = "aaaa";
1617 1592
1618sub nuke { 1593sub nuke {
1619 my ($self) = @_; 1594 my ($self) = @_;
1620 1595
1596 delete $cf::MAP{$self->path};
1597
1598 $self->unlink_save;
1599
1600 bless $self, "cf::map";
1601 delete $self->{deny_reset};
1621 $self->{deny_save} = 1; 1602 $self->{deny_save} = 1;
1622 $self->reset_timeout (1); 1603 $self->reset_timeout (1);
1623 $self->rename ("{nuke}/" . ($nuke_counter++)); 1604 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1605
1606 $cf::MAP{$self->path} = $self;
1607
1624 $self->reset; # polite request, might not happen 1608 $self->reset; # polite request, might not happen
1625} 1609}
1626 1610
1627sub customise_for { 1611=item cf::map::unique_maps
1628 my ($map, $ob) = @_;
1629 1612
1630 if ($map->per_player) { 1613Returns an arrayref of paths of all shared maps that have
1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1614instantiated unique items. May block.
1632 }
1633 1615
1634 $map 1616=cut
1617
1618sub unique_maps() {
1619 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1620 or return;
1621
1622 my @paths;
1623
1624 for (@$files) {
1625 utf8::decode $_;
1626 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o;
1628
1629 s/\.map$//;
1630 push @paths, $_;
1631 }
1632
1633 \@paths
1635} 1634}
1636 1635
1637package cf; 1636package cf;
1638 1637
1639=back 1638=back
… …
1711 1710
1712=item $player_object->enter_link 1711=item $player_object->enter_link
1713 1712
1714Freezes the player and moves him/her to a special map (C<{link}>). 1713Freezes the player and moves him/her to a special map (C<{link}>).
1715 1714
1716The player should be reaosnably safe there for short amounts of time. You 1715The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1716I<MUST> call C<leave_link> as soon as possible, though.
1718 1717
1718Will never block.
1719
1719=item $player_object->leave_link ($map, $x, $y) 1720=item $player_object->leave_link ($map, $x, $y)
1720 1721
1721Moves the player out of the specila link map onto the given map. If the 1722Moves the player out of the special C<{link}> map onto the specified
1722map is not valid (or omitted), the player will be moved back to the 1723map. If the map is not valid (or omitted), the player will be moved back
1723location he/she was before the call to C<enter_link>, or, if that fails, 1724to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1725fails, to the emergency map position.
1725 1726
1726Might block. 1727Might block.
1727 1728
1728=cut 1729=cut
1730
1731sub link_map {
1732 unless ($LINK_MAP) {
1733 $LINK_MAP = cf::map::find "{link}"
1734 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1735 $LINK_MAP->load;
1736 }
1737
1738 $LINK_MAP
1739}
1729 1740
1730sub cf::object::player::enter_link { 1741sub cf::object::player::enter_link {
1731 my ($self) = @_; 1742 my ($self) = @_;
1732 1743
1733 $self->deactivate_recursive; 1744 $self->deactivate_recursive;
1734 1745
1735 return if $self->map == $LINK_MAP; 1746 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1747
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1749 if $self->map;
1739 1750
1740 $self->enter_map ($LINK_MAP, 20, 20); 1751 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1752}
1742 1753
1743sub cf::object::player::leave_link { 1754sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1755 my ($self, $map, $x, $y) = @_;
1745 1756
… …
1809=cut 1820=cut
1810 1821
1811sub cf::object::player::goto { 1822sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1823 my ($self, $path, $x, $y) = @_;
1813 1824
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1817 $self->enter_link; 1825 $self->enter_link;
1818 1826
1819 (async { 1827 (async {
1820 my $map = cf::map::find $path->as_string; 1828 my $map = cf::map::find $path;
1821 $map = $map->customise_for ($self) if $map; 1829 $map = $map->customise_for ($self) if $map;
1822 1830
1823# warn "entering ", $map->path, " at ($x, $y)\n" 1831# warn "entering ", $map->path, " at ($x, $y)\n"
1824# if $map; 1832# if $map;
1825 1833
… …
1835 1843
1836sub parse_random_map_params { 1844sub parse_random_map_params {
1837 my ($spec) = @_; 1845 my ($spec) = @_;
1838 1846
1839 my $rmp = { # defaults 1847 my $rmp = { # defaults
1840 xsize => 10, 1848 xsize => (cf::rndm 15, 40),
1841 ysize => 10, 1849 ysize => (cf::rndm 15, 40),
1850 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1851 #layout => string,
1842 }; 1852 };
1843 1853
1844 for (split /\n/, $spec) { 1854 for (split /\n/, $spec) {
1845 my ($k, $v) = split /\s+/, $_, 2; 1855 my ($k, $v) = split /\s+/, $_, 2;
1846 1856
… …
1850 $rmp 1860 $rmp
1851} 1861}
1852 1862
1853sub prepare_random_map { 1863sub prepare_random_map {
1854 my ($exit) = @_; 1864 my ($exit) = @_;
1865
1866 my $guard = cf::lock_acquire "exit_prepare:$exit";
1855 1867
1856 # all this does is basically replace the /! path by 1868 # all this does is basically replace the /! path by
1857 # a new random map path (?random/...) with a seed 1869 # a new random map path (?random/...) with a seed
1858 # that depends on the exit object 1870 # that depends on the exit object
1859 1871
… …
1868 1880
1869 $rmp->{random_seed} ||= $exit->random_seed; 1881 $rmp->{random_seed} ||= $exit->random_seed;
1870 1882
1871 my $data = cf::to_json $rmp; 1883 my $data = cf::to_json $rmp;
1872 my $md5 = Digest::MD5::md5_hex $data; 1884 my $md5 = Digest::MD5::md5_hex $data;
1885 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1873 1886
1874 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1887 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1875 aio_write $fh, 0, (length $data), $data, 0; 1888 aio_write $fh, 0, (length $data), $data, 0;
1889 undef $fh;
1890 aio_rename "$meta~", $meta;
1876 1891
1877 $exit->slaying ("?random/$md5"); 1892 $exit->slaying ("?random/$md5");
1878 $exit->msg (undef); 1893 $exit->msg (undef);
1879 } 1894 }
1880} 1895}
… …
1890 $self->deactivate_recursive; # just to be sure 1905 $self->deactivate_recursive; # just to be sure
1891 unless (eval { 1906 unless (eval {
1892 prepare_random_map $exit 1907 prepare_random_map $exit
1893 if $exit->slaying eq "/!"; 1908 if $exit->slaying eq "/!";
1894 1909
1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1910 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1911 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1897 1912
1898 1; 1913 1;
1899 }) { 1914 }) {
1900 $self->message ("Something went wrong deep within the crossfire server. " 1915 $self->message ("Something went wrong deep within the crossfire server. "
1901 . "I'll try to bring you back to the map you were before. " 1916 . "I'll try to bring you back to the map you were before. "
1902 . "Please report this to the dungeon master", 1917 . "Please report this to the dungeon master!",
1903 cf::NDI_UNIQUE | cf::NDI_RED); 1918 cf::NDI_UNIQUE | cf::NDI_RED);
1904 1919
1905 warn "ERROR in enter_exit: $@"; 1920 warn "ERROR in enter_exit: $@";
1906 $self->leave_link; 1921 $self->leave_link;
1907 } 1922 }
… …
2190 sub db_sync() { 2205 sub db_sync() {
2191 db_save if $dirty; 2206 db_save if $dirty;
2192 undef $dirty; 2207 undef $dirty;
2193 } 2208 }
2194 2209
2195 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2196 db_sync; 2211 db_sync;
2197 }); 2212 });
2198 2213
2199 sub db_dirty() { 2214 sub db_dirty() {
2200 $dirty = 1; 2215 $dirty = 1;
… …
2250 2265
2251sub main { 2266sub main {
2252 # we must not ever block the main coroutine 2267 # we must not ever block the main coroutine
2253 local $Coro::idle = sub { 2268 local $Coro::idle = sub {
2254 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2269 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2270 (async {
2255 async { Event::one_event }; 2271 Event::one_event;
2272 })->prio (Coro::PRIO_MAX);
2256 }; 2273 };
2257 2274
2258 cfg_load; 2275 cfg_load;
2259 db_load; 2276 db_load;
2260 load_extensions; 2277 load_extensions;
2278
2279 $TICK_WATCHER->start;
2261 Event::loop; 2280 Event::loop;
2262} 2281}
2263 2282
2264############################################################################# 2283#############################################################################
2265# initialisation and cleanup 2284# initialisation and cleanup
… …
2283 warn "enter emergency perl save\n"; 2302 warn "enter emergency perl save\n";
2284 2303
2285 cf::sync_job { 2304 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl 2305 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players 2306 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously. 2307 # and maps saved/destroyed asynchronously.
2289 warn "begin emergency player save\n"; 2308 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) { 2309 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next; 2310 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next; 2311 $pl->valid or next;
2293 $pl->save; 2312 $pl->save;
… …
2307} 2326}
2308 2327
2309sub reload() { 2328sub reload() {
2310 # can/must only be called in main 2329 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2330 if ($Coro::current != $Coro::main) {
2312 warn "can only reload from main coroutine\n"; 2331 warn "can only reload from main coroutine";
2313 return; 2332 return;
2314 } 2333 }
2315 2334
2316 warn "reloading..."; 2335 warn "reloading...";
2317 2336
2318 my $guard = freeze_mainloop; 2337 warn "cancelling server ticker";
2338 $TICK_WATCHER->cancel;
2339
2319 cf::emergency_save; 2340 cf::emergency_save;
2320 2341
2321 eval { 2342 eval {
2322 # if anything goes wrong in here, we should simply crash as we already saved 2343 # if anything goes wrong in here, we should simply crash as we already saved
2323 2344
2324 # cancel all watchers 2345 warn "syncing database to disk";
2346 cf::db_sync;
2347
2348 warn "cancelling all WF_AUTOCANCEL watchers";
2325 for (Event::all_watchers) { 2349 for (Event::all_watchers) {
2326 $_->cancel if $_->data & WF_AUTOCANCEL; 2350 $_->cancel if $_->data & WF_AUTOCANCEL;
2327 } 2351 }
2328 2352
2353 warn "flushing outstanding aio requests";
2354 for (;;) {
2355 IO::AIO::flush;
2356 Coro::cede;
2357 last unless IO::AIO::nreqs;
2358 warn "iterate...";
2359 }
2360
2329 # cancel all extension coros 2361 warn "cancelling all extension coros";
2330 $_->cancel for values %EXT_CORO; 2362 $_->cancel for values %EXT_CORO;
2331 %EXT_CORO = (); 2363 %EXT_CORO = ();
2332 2364
2333 # unload all extensions 2365 warn "removing commands";
2334 for (@exts) { 2366 %COMMAND = ();
2367
2368 warn "removing ext commands";
2369 %EXTCMD = ();
2370
2371 warn "unloading/nuking all extensions";
2372 for my $pkg (@EXTS) {
2335 warn "unloading <$_>"; 2373 warn "... unloading $pkg";
2336 unload_extension $_; 2374
2375 if (my $cb = $pkg->can ("unload")) {
2376 eval {
2377 $cb->($pkg);
2378 1
2379 } or warn "$pkg unloaded, but with errors: $@";
2337 } 2380 }
2338 2381
2382 warn "... nuking $pkg";
2383 Symbol::delete_package $pkg;
2384 }
2385
2339 # unload all modules loaded from $LIBDIR 2386 warn "unloading all perl modules loaded from $LIBDIR";
2340 while (my ($k, $v) = each %INC) { 2387 while (my ($k, $v) = each %INC) {
2341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2388 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342 2389
2343 warn "removing <$k>"; 2390 warn "... unloading $k";
2344 delete $INC{$k}; 2391 delete $INC{$k};
2345 2392
2346 $k =~ s/\.pm$//; 2393 $k =~ s/\.pm$//;
2347 $k =~ s/\//::/g; 2394 $k =~ s/\//::/g;
2348 2395
… …
2351 } 2398 }
2352 2399
2353 Symbol::delete_package $k; 2400 Symbol::delete_package $k;
2354 } 2401 }
2355 2402
2356 # sync database to disk
2357 cf::db_sync;
2358 IO::AIO::flush;
2359
2360 # get rid of safe::, as good as possible 2403 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2404 Symbol::delete_package "safe::$_"
2362 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2405 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2363 2406
2364 # remove register_script_function callbacks
2365 # TODO
2366
2367 # unload cf.pm "a bit" 2407 warn "unloading cf.pm \"a bit\"";
2368 delete $INC{"cf.pm"}; 2408 delete $INC{"cf.pm"};
2369 2409
2370 # don't, removes xs symbols, too, 2410 # don't, removes xs symbols, too,
2371 # and global variables created in xs 2411 # and global variables created in xs
2372 #Symbol::delete_package __PACKAGE__; 2412 #Symbol::delete_package __PACKAGE__;
2373 2413
2374 # reload cf.pm 2414 warn "unload completed, starting to reload now";
2415
2375 warn "reloading cf.pm"; 2416 warn "reloading cf.pm";
2376 require cf; 2417 require cf;
2377 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2378 2419
2379 # load config and database again 2420 warn "loading config and database again";
2380 cf::cfg_load; 2421 cf::cfg_load;
2381 cf::db_load; 2422 cf::db_load;
2382 2423
2383 # load extensions
2384 warn "load extensions"; 2424 warn "loading extensions";
2385 cf::load_extensions; 2425 cf::load_extensions;
2386 2426
2387 # reattach attachments to objects 2427 warn "reattaching attachments to objects/players";
2388 warn "reattach";
2389 _global_reattach; 2428 _global_reattach;
2429 warn "reattaching attachments to maps";
2390 reattach $_ for values %MAP; 2430 reattach $_ for values %MAP;
2431
2432 warn "restarting server ticker";
2433
2434 $TICK_WATCHER->start;
2391 }; 2435 };
2392 2436
2393 if ($@) { 2437 if ($@) {
2394 warn $@; 2438 warn $@;
2395 warn "error while reloading, exiting."; 2439 warn "error while reloading, exiting.";
2396 exit 1; 2440 exit 1;
2397 } 2441 }
2398 2442
2399 warn "reloaded successfully"; 2443 warn "reloaded";
2400}; 2444};
2401 2445
2402############################################################################# 2446our $RELOAD_WATCHER; # used only during reload
2403
2404unless ($LINK_MAP) {
2405 $LINK_MAP = cf::map::new;
2406
2407 $LINK_MAP->width (41);
2408 $LINK_MAP->height (41);
2409 $LINK_MAP->alloc;
2410 $LINK_MAP->path ("{link}");
2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2413
2414 # dirty hack because... archetypes are not yet loaded
2415 Event->timer (
2416 after => 10,
2417 cb => sub {
2418 $_[0]->w->cancel;
2419
2420 # provide some exits "home"
2421 my $exit = cf::object::new "exit";
2422
2423 $exit->slaying ($EMERGENCY_POSITION->[0]);
2424 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2425 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2426
2427 $LINK_MAP->insert ($exit->clone, 19, 19);
2428 $LINK_MAP->insert ($exit->clone, 19, 20);
2429 $LINK_MAP->insert ($exit->clone, 19, 21);
2430 $LINK_MAP->insert ($exit->clone, 20, 19);
2431 $LINK_MAP->insert ($exit->clone, 20, 21);
2432 $LINK_MAP->insert ($exit->clone, 21, 19);
2433 $LINK_MAP->insert ($exit->clone, 21, 20);
2434 $LINK_MAP->insert ($exit->clone, 21, 21);
2435
2436 $exit->destroy;
2437 });
2438
2439 $LINK_MAP->{deny_save} = 1;
2440 $LINK_MAP->{deny_reset} = 1;
2441
2442 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2443}
2444
2445register "<global>", __PACKAGE__;
2446 2447
2447register_command "reload" => sub { 2448register_command "reload" => sub {
2448 my ($who, $arg) = @_; 2449 my ($who, $arg) = @_;
2449 2450
2450 if ($who->flag (FLAG_WIZ)) { 2451 if ($who->flag (FLAG_WIZ)) {
2451 $who->message ("start of reload."); 2452 $who->message ("reloading server.");
2453
2454 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here.
2456
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2452 reload; 2458 reload;
2453 $who->message ("end of reload."); 2459 undef $RELOAD_WATCHER;
2460 });
2454 } 2461 }
2455}; 2462};
2456 2463
2457unshift @INC, $LIBDIR; 2464unshift @INC, $LIBDIR;
2465
2466my $bug_warning = 0;
2458 2467
2459$TICK_WATCHER = Event->timer ( 2468$TICK_WATCHER = Event->timer (
2460 reentrant => 0, 2469 reentrant => 0,
2470 parked => 1,
2461 prio => 0, 2471 prio => 0,
2462 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2463 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2464 cb => sub { 2474 cb => sub {
2475 if ($Coro::current != $Coro::main) {
2476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2477 unless ++$bug_warning > 10;
2478 return;
2479 }
2480
2481 $NOW = Event::time;
2482
2465 cf::server_tick; # one server iteration 2483 cf::server_tick; # one server iteration
2466 $RUNTIME += $TICK; 2484 $RUNTIME += $TICK;
2467 $NEXT_TICK += $TICK; 2485 $NEXT_TICK += $TICK;
2468 2486
2469 $WAIT_FOR_TICK->broadcast; 2487 $WAIT_FOR_TICK->broadcast;
… …
2477 }, 2495 },
2478); 2496);
2479 2497
2480IO::AIO::max_poll_time $TICK * 0.2; 2498IO::AIO::max_poll_time $TICK * 0.2;
2481 2499
2482Event->io ( 2500$AIO_POLL_WATCHER = Event->io (
2483 fd => IO::AIO::poll_fileno, 2501 fd => IO::AIO::poll_fileno,
2484 poll => 'r', 2502 poll => 'r',
2485 prio => 5, 2503 prio => 5,
2486 data => WF_AUTOCANCEL, 2504 data => WF_AUTOCANCEL,
2487 cb => \&IO::AIO::poll_cb, 2505 cb => \&IO::AIO::poll_cb,
2488); 2506);
2489 2507
2490Event->timer ( 2508$WRITE_RUNTIME_WATCHER = Event->timer (
2491 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2492 after => 0, 2510 after => 1,
2493 interval => 10, 2511 interval => 10,
2494 cb => sub { 2512 prio => 6, # keep it lowest so it acts like a watchdog
2495 (Coro::unblock_sub { 2513 cb => Coro::unblock_sub {
2496 write_runtime 2514 write_runtime
2497 or warn "ERROR: unable to write runtime file: $!"; 2515 or warn "ERROR: unable to write runtime file: $!";
2498 })->();
2499 }, 2516 },
2500); 2517);
2501 2518
2502END { cf::emergency_save } 2519END { cf::emergency_save }
2503 2520

Diff Legend

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