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

Diff Legend

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