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.159 by root, Wed Jan 10 22:50:12 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 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;
… …
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38 38
39our @EXTS = (); # list of extension package names 39our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
42 43
43our @EVENT; 44our @EVENT;
44our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
45 46
46our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
48our $NEXT_TICK; 51our $NEXT_TICK;
49our $NOW; 52our $NOW;
50 53
51our %CFG; 54our %CFG;
52 55
53our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
54our $RUNTIME; 57our $RUNTIME;
55 58
56our %PLAYER; # all users 59our %PLAYER; # all users
57our %MAP; # all maps 60our %MAP; # all maps
58our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
59our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
60 63
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $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
63 69
64binmode STDOUT; 70binmode STDOUT;
65binmode STDERR; 71binmode STDERR;
66 72
67# read virtual server time, if available 73# read virtual server time, if available
… …
75mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
76mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
77mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
78mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
79 85
80# a special map that is always available
81our $LINK_MAP;
82our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
83 89
84############################################################################# 90#############################################################################
85 91
86=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
87 93
… …
255} 261}
256 262
257sub freeze_mainloop { 263sub freeze_mainloop {
258 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
259 265
260 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;
261 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
262 $guard 272 $guard
263} 273}
264 274
265=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
341 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
342 352
343 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
344 or return; 354 or return;
345 355
356 my $value = $cf::RUNTIME + 90 + 10;
346 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
347 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
348 and return; 361 and return;
349 362
350 aio_fsync $fh 363 aio_fsync $fh
351 and return; 364 and return;
… …
360} 373}
361 374
362=back 375=back
363 376
364=cut 377=cut
365
366#############################################################################
367
368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
375
376sub new {
377 my ($class, $path, $base) = @_;
378
379 $path = $path->as_string if ref $path;
380
381 my $self = bless { }, $class;
382
383 # {... are special paths that are not touched
384 # ?xxx/... are special absolute paths
385 # ?random/... random maps
386 # /! non-realised random map exit
387 # /... normal maps
388 # ~/... per-player maps without a specific player (DO NOT USE)
389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
392
393 if ($path =~ /^{/) {
394 # fine as it is
395 } elsif ($path =~ s{^\?random/}{}) {
396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397 $self->{random} = cf::from_json $data;
398 } else {
399 if ($path =~ s{^~([^/]+)?}{}) {
400 $self->{user_rel} = 1;
401
402 if (defined $1) {
403 $self->{user} = $1;
404 } elsif ($base =~ m{^~([^/]+)/}) {
405 $self->{user} = $1;
406 } else {
407 warn "cannot resolve user-relative path without user <$path,$base>\n";
408 }
409 } elsif ($path =~ /^\//) {
410 # already absolute
411 } else {
412 $base =~ s{[^/]+/?$}{};
413 return $class->new ("$base/$path");
414 }
415
416 for ($path) {
417 redo if s{/\.?/}{/};
418 redo if s{/[^/]+/\.\./}{/};
419 }
420 }
421
422 $self->{path} = $path;
423
424 $self
425}
426
427# the name / primary key / in-game path
428sub as_string {
429 my ($self) = @_;
430
431 $self->{user_rel} ? "~$self->{user}$self->{path}"
432 : $self->{random} ? "?random/$self->{path}"
433 : $self->{path}
434}
435
436# the displayed name, this is a one way mapping
437sub visible_name {
438 my ($self) = @_;
439
440# if (my $rmp = $self->{random}) {
441# # todo: be more intelligent about this
442# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
443# } else {
444 $self->as_string
445# }
446}
447
448# escape the /'s in the path
449sub _escaped_path {
450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
451 $path
452}
453
454# the original (read-only) location
455sub load_path {
456 my ($self) = @_;
457
458 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
459}
460
461# the temporary/swap location
462sub save_path {
463 my ($self) = @_;
464
465 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
466 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
467 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
468}
469
470# the unique path, might be eq to save_path
471sub uniq_path {
472 my ($self) = @_;
473
474 $self->{user_rel} || $self->{random}
475 ? undef
476 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
477}
478
479# return random map parameters, or undef
480sub random_map_params {
481 my ($self) = @_;
482
483 $self->{random}
484}
485
486# this is somewhat ugly, but style maps do need special treatment
487sub is_style_map {
488 $_[0]{path} =~ m{^/styles/}
489}
490
491package cf;
492 378
493############################################################################# 379#############################################################################
494 380
495=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
496 382
… …
622our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 509our @CB_MAP = ();
624 510
625my %attachment; 511my %attachment;
626 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
627sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
629 521
630 use sort 'stable'; 522 use sort 'stable';
631 523
… …
802# object support 694# object support
803 695
804sub reattach { 696sub reattach {
805 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 701
808 my $registry = $obj->registry; 702 my $registry = $obj->registry;
809 703
810 @$registry = (); 704 @$registry = ();
811 705
… …
882 } 776 }
883 } else { 777 } else {
884 aio_unlink $filename; 778 aio_unlink $filename;
885 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
886 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
887 } 787 }
888} 788}
889 789
890sub object_freezer_as_string { 790sub object_freezer_as_string {
891 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
897 797
898sub object_thawer_load { 798sub object_thawer_load {
899 my ($filename) = @_; 799 my ($filename) = @_;
900 800
901 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
902 805
903 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
904 or return; 807 or return;
905 808
906 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
987 my $base = $1; 890 my $base = $1;
988 my $pkg = $1; 891 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 892 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 893 $pkg = "ext::$pkg";
991 894
992 warn "loading '$path' into '$pkg'\n"; 895 warn "... loading '$path' into '$pkg'\n";
993 896
994 open my $fh, "<:utf8", $path 897 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 898 or die "$path: $!";
996 899
997 my $source = 900 my $source =
998 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 904 . "\n};\n1";
1002 905
1003 eval $source 906 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 908 : "extension disabled.\n";
909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
910 warn $@;
911 warn "mandatory extension failed to load, exiting.\n";
912 exit 1;
913 }
914 die $@;
915 }
1006 916
1007 push @EXTS, $pkg; 917 push @EXTS, $pkg;
1008} 918}
1009 919
1010sub load_extensions { 920sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1017 } 927 }
1018} 928}
1019 929
1020############################################################################# 930#############################################################################
1021# load/save/clean perl data associated with a map
1022
1023*cf::mapsupport::on_clean = sub {
1024 my ($map) = @_;
1025
1026 my $path = $map->tmpname;
1027 defined $path or return;
1028
1029 unlink "$path.pst";
1030};
1031
1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1033
1034#############################################################################
1035 931
1036=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1037 933
1038Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1039 935
… …
1075 971
1076sub exists($) { 972sub exists($) {
1077 my ($login) = @_; 973 my ($login) = @_;
1078 974
1079 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1081} 977}
1082 978
1083sub find($) { 979sub find($) {
1084 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0]; 981 my $login = $_[0];
… …
1175 \@logins 1071 \@logins
1176} 1072}
1177 1073
1178=item $player->maps 1074=item $player->maps
1179 1075
1180Returns an arrayref of cf::path's of all maps that are private for this 1076Returns an arrayref of map paths that are private for this
1181player. May block. 1077player. May block.
1182 1078
1183=cut 1079=cut
1184 1080
1185sub maps($) { 1081sub maps($) {
… …
1193 for (@$files) { 1089 for (@$files) {
1194 utf8::decode $_; 1090 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1197 1093
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1199 } 1095 }
1200 1096
1201 \@paths 1097 \@paths
1202} 1098}
1203 1099
… …
1229package cf::map; 1125package cf::map;
1230 1126
1231use Fcntl; 1127use Fcntl;
1232use Coro::AIO; 1128use Coro::AIO;
1233 1129
1130use overload
1131 '""' => \&as_string,
1132 fallback => 1;
1133
1234our $MAX_RESET = 3600; 1134our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1135our $DEFAULT_RESET = 3000;
1236 1136
1237sub generate_random_map { 1137sub generate_random_map {
1238 my ($path, $rmp) = @_; 1138 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1139 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1140 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1141 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1142 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1143 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1144 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1145 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1146 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1147 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1148 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1149 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1152 )
1153}
1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1163sub register {
1164 my (undef, $regex, $prio) = @_;
1165 my $pkg = caller;
1166
1167 no strict;
1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1169
1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1171}
1172
1173# also paths starting with '/'
1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1175
1176sub thawer_merge {
1177 my ($self, $merge) = @_;
1178
1179 # we have to keep some variables in memory intact
1180 local $self->{path};
1181 local $self->{load_path};
1182 local $self->{deny_save};
1183 local $self->{deny_reset};
1184
1185 $self->SUPER::thawer_merge ($merge);
1186}
1187
1188sub normalise {
1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1194
1195 # map plan:
1196 #
1197 # /! non-realised random map exit (special hack!)
1198 # {... are special paths that are not being touched
1199 # ?xxx/... are special absolute paths
1200 # ?random/... random maps
1201 # /... normal maps
1202 # ~user/... per-player map of a specific user
1203
1204 $path =~ s/$PATH_SEP/\//go;
1205
1206 # treat it as relative path if it starts with
1207 # something that looks reasonable
1208 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1209 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1210
1211 $base =~ s{[^/]+/?$}{};
1212 $path = "$base/$path";
1213 }
1214
1215 for ($path) {
1216 redo if s{//}{/};
1217 redo if s{/\.?/}{/};
1218 redo if s{/[^/]+/\.\./}{/};
1219 }
1220
1221 $path
1222}
1223
1224sub new_from_path {
1225 my (undef, $path, $base) = @_;
1226
1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1228
1229 $path = normalise $path, $base;
1230
1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1233 my $self = bless cf::map::new, $pkg;
1234 $self->{path} = $path; $self->path ($path);
1235 $self->init; # pass $1 etc.
1236 return $self;
1237 }
1238 }
1239
1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1241 ()
1242}
1243
1244sub init {
1245 my ($self) = @_;
1246
1247 $self
1248}
1249
1250sub as_string {
1251 my ($self) = @_;
1252
1253 "$self->{path}"
1254}
1255
1256# the displayed name, this is a one way mapping
1257sub visible_name {
1258 &as_string
1259}
1260
1261# the original (read-only) location
1262sub load_path {
1263 my ($self) = @_;
1264
1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1266}
1267
1268# the temporary/swap location
1269sub save_path {
1270 my ($self) = @_;
1271
1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1274}
1275
1276# the unique path, undef == no special unique path
1277sub uniq_path {
1278 my ($self) = @_;
1279
1280 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1281 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1282}
1255 1283
1256# and all this just because we cannot iterate over 1284# and all this just because we cannot iterate over
1257# all maps in C++... 1285# all maps in C++...
1258sub change_all_map_light { 1286sub change_all_map_light {
… …
1260 1288
1261 $_->change_map_light ($change) 1289 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1290 for grep $_->outdoor, values %cf::MAP;
1263} 1291}
1264 1292
1293sub unlink_save {
1294 my ($self) = @_;
1295
1296 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304}
1305
1265sub try_load_header($) { 1306sub load_header_from($) {
1266 my ($path) = @_; 1307 my ($self, $path) = @_;
1267 1308
1268 utf8::encode $path; 1309 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1311 # or return;
1312
1313 $self->_load_header ($path)
1270 or return; 1314 or return;
1271 1315
1272 my $map = cf::map::new 1316 $self->{load_path} = $path;
1317
1318 1
1319}
1320
1321sub load_header_orig {
1322 my ($self) = @_;
1323
1324 $self->load_header_from ($self->load_path)
1325}
1326
1327sub load_header_temp {
1328 my ($self) = @_;
1329
1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1350}
1351
1352sub load_header {
1353 my ($self) = @_;
1354
1355 if ($self->load_header_temp) {
1356 $self->prepare_temp;
1357 } else {
1358 $self->load_header_orig
1273 or return; 1359 or return;
1360 $self->prepare_orig;
1361 }
1274 1362
1275 # for better error messages only, will be overwritten 1363 1
1276 $map->path ($path);
1277
1278 $map->load_header ($path)
1279 or return;
1280
1281 $map->{load_path} = $path;
1282
1283 $map
1284} 1364}
1285 1365
1286sub find; 1366sub find;
1287sub find { 1367sub find {
1288 my ($path, $origin) = @_; 1368 my ($path, $origin) = @_;
1289 1369
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1370 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1371
1295 cf::lock_wait "map_find:$key"; 1372 cf::lock_wait "map_find:$path";
1296 1373
1297 $cf::MAP{$key} || do { 1374 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1375 my $guard = cf::lock_acquire "map_find:$path";
1299 1376 my $map = new_from_path cf::map $path
1300 # do it the slow way
1301 my $map = try_load_header $path->save_path;
1302
1303 Coro::cede;
1304
1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1308 # safety
1309 $map->{instantiate_time} = $cf::RUNTIME
1310 if $map->{instantiate_time} > $cf::RUNTIME;
1311 } else {
1312 if (my $rmp = $path->random_map_params) {
1313 $map = generate_random_map $key, $rmp;
1314 } else {
1315 $map = try_load_header $path->load_path;
1316 }
1317
1318 $map or return; 1377 or return;
1319 1378
1320 $map->{load_original} = 1;
1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1323 $map->instantiate;
1324
1325 # per-player maps become, after loading, normal maps
1326 $map->per_player (0) if $path->{user_rel};
1327 }
1328
1329 $map->path ($key);
1330 $map->{path} = $path;
1331 $map->{last_save} = $cf::RUNTIME; 1379 $map->{last_save} = $cf::RUNTIME;
1332 1380
1333 Coro::cede; 1381 $map->load_header
1382 or return;
1334 1383
1335 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1386 #$cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1387 $map->reset;
1337 undef $guard; 1388 undef $guard;
1338 $map = find $path 1389 return find $path;
1339 or return;
1340 } 1390 }
1341 1391
1342 $cf::MAP{$key} = $map 1392 $cf::MAP{$path} = $map
1343 } 1393 }
1344} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1345 1398
1346sub load { 1399sub load {
1347 my ($self) = @_; 1400 my ($self) = @_;
1348 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1349 my $path = $self->{path}; 1404 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1405 my $guard = cf::lock_acquire "map_load:$path";
1351 1406
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1408
1354 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1355 1410
1356 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1357 $self->load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1416 or return;
1359 1417
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1419 if delete $self->{load_original};
1362 1420
1363 if (my $uniq = $path->uniq_path) { 1421 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1422 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1423 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1424 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1425 $self->_load_objects ($uniq, 0);
1368 } 1426 }
1369 } 1427 }
1370 1428
1371 Coro::cede; 1429 Coro::cede;
1372 1430
1373 # now do the right thing for maps 1431 # now do the right thing for maps
1374 $self->link_multipart_objects; 1432 $self->link_multipart_objects;
1375 1433
1376 if ($self->{path}->is_style_map) { 1434 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1435 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1436 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1437 $self->update_buttons;
1438 Coro::cede;
1383 $self->set_darkness_map; 1439 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1440 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1441 unless $self->difficulty;
1442 Coro::cede;
1386 $self->activate; 1443 $self->activate;
1387 } 1444 }
1388 1445
1389 Coro::cede; 1446 $self->post_load;
1390 1447
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1449}
1450
1451sub customise_for {
1452 my ($self, $ob) = @_;
1453
1454 return find "~" . $ob->name . "/" . $self->{path}
1455 if $self->per_player;
1456
1457 $self
1392} 1458}
1393 1459
1394# find and load all maps in the 3x3 area around a map 1460# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1461sub load_diag {
1396 my ($map) = @_; 1462 my ($map) = @_;
… …
1426 1492
1427 cf::sync_job { $map->load }; 1493 cf::sync_job { $map->load };
1428} 1494}
1429 1495
1430our %MAP_PREFETCH; 1496our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1497our $MAP_PREFETCHER = undef;
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 }
1442 Coro::schedule;
1443 }
1444};
1445 1498
1446sub find_async { 1499sub find_async {
1447 my ($path, $origin) = @_; 1500 my ($path, $origin) = @_;
1448 1501
1449 $path = new cf::path $path, $origin && $origin->path; 1502 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1503
1452 if (my $map = $cf::MAP{$key}) { 1504 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1505 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1506 }
1455 1507
1456 $MAP_PREFETCH{$key} = $path; 1508 undef $MAP_PREFETCH{$path};
1509 $MAP_PREFETCHER ||= cf::async {
1510 while (%MAP_PREFETCH) {
1511 for my $path (keys %MAP_PREFETCH) {
1512 my $map = find $path
1513 or next;
1514 $map->load;
1515
1516 delete $MAP_PREFETCH{$path};
1517 }
1518 }
1519 undef $MAP_PREFETCHER;
1520 };
1457 $MAP_PREFETCHER->ready; 1521 $MAP_PREFETCHER->prio (6);
1458 1522
1459 () 1523 ()
1460} 1524}
1461 1525
1462sub save { 1526sub save {
… …
1466 1530
1467 $self->{last_save} = $cf::RUNTIME; 1531 $self->{last_save} = $cf::RUNTIME;
1468 1532
1469 return unless $self->dirty; 1533 return unless $self->dirty;
1470 1534
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1535 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1536 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1537
1474 $self->{load_path} = $save; 1538 $self->{load_path} = $save;
1475 1539
1476 return if $self->{deny_save}; 1540 return if $self->{deny_save};
1477 1541
… …
1480 cf::async { 1544 cf::async {
1481 $_->contr->save for $self->players; 1545 $_->contr->save for $self->players;
1482 }; 1546 };
1483 1547
1484 if ($uniq) { 1548 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1549 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1550 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1551 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1552 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1553 }
1490} 1554}
1491 1555
1492sub swap_out { 1556sub swap_out {
1493 my ($self) = @_; 1557 my ($self) = @_;
… …
1507 1571
1508sub reset_at { 1572sub reset_at {
1509 my ($self) = @_; 1573 my ($self) = @_;
1510 1574
1511 # TODO: safety, remove and allow resettable per-player maps 1575 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1576 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1577 return 1e99 if $self->{deny_reset};
1514 1578
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1579 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1580 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1581
… …
1522 my ($self) = @_; 1586 my ($self) = @_;
1523 1587
1524 $self->reset_at <= $cf::RUNTIME 1588 $self->reset_at <= $cf::RUNTIME
1525} 1589}
1526 1590
1527sub unlink_save {
1528 my ($self) = @_;
1529
1530 utf8::encode (my $save = $self->{path}->save_path);
1531 aioreq_pri 3; IO::AIO::aio_unlink $save;
1532 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1533}
1534
1535sub rename {
1536 my ($self, $new_path) = @_;
1537
1538 $self->unlink_save;
1539
1540 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path;
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self;
1544
1545 $self->save;
1546}
1547
1548sub reset { 1591sub reset {
1549 my ($self) = @_; 1592 my ($self) = @_;
1550 1593
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1594 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1595
1553 return if $self->players; 1596 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1597 return if $self->isa ("ext::map_per_player");#d#
1555 1598
1556 warn "resetting map ", $self->path;#d# 1599 warn "resetting map ", $self->path;#d#
1557 1600
1558 delete $cf::MAP{$self->path}; 1601 delete $cf::MAP{$self->path};
1602
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear;
1559 1605
1560 $_->clear_links_to ($self) for values %cf::MAP; 1606 $_->clear_links_to ($self) for values %cf::MAP;
1561 1607
1562 $self->unlink_save; 1608 $self->unlink_save;
1563 $self->destroy; 1609 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1612my $nuke_counter = "aaaa";
1567 1613
1568sub nuke { 1614sub nuke {
1569 my ($self) = @_; 1615 my ($self) = @_;
1570 1616
1617 delete $cf::MAP{$self->path};
1618
1619 $self->unlink_save;
1620
1621 bless $self, "cf::map";
1622 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1623 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1624 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1625 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1626
1627 $cf::MAP{$self->path} = $self;
1628
1574 $self->reset; # polite request, might not happen 1629 $self->reset; # polite request, might not happen
1575} 1630}
1576 1631
1577sub customise_for {
1578 my ($map, $ob) = @_;
1579
1580 if ($map->per_player) {
1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1582 }
1583
1584 $map
1585}
1586
1587=item cf::map::unique_maps 1632=item cf::map::unique_maps
1588 1633
1589Returns an arrayref of cf::path's of all shared maps that have 1634Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1635instantiated unique items. May block.
1591 1636
1592=cut 1637=cut
1593 1638
1594sub unique_maps() { 1639sub unique_maps() {
… …
1600 for (@$files) { 1645 for (@$files) {
1601 utf8::decode $_; 1646 utf8::decode $_;
1602 next if /\.pst$/; 1647 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1604 1649
1605 push @paths, new cf::path $_; 1650 push @paths, cf::map::normalise $_;
1606 } 1651 }
1607 1652
1608 \@paths 1653 \@paths
1609} 1654}
1610 1655
… …
1685 1730
1686=item $player_object->enter_link 1731=item $player_object->enter_link
1687 1732
1688Freezes the player and moves him/her to a special map (C<{link}>). 1733Freezes the player and moves him/her to a special map (C<{link}>).
1689 1734
1690The player should be reaosnably safe there for short amounts of time. You 1735The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1736I<MUST> call C<leave_link> as soon as possible, though.
1692 1737
1738Will never block.
1739
1693=item $player_object->leave_link ($map, $x, $y) 1740=item $player_object->leave_link ($map, $x, $y)
1694 1741
1695Moves the player out of the specila link map onto the given map. If the 1742Moves the player out of the special C<{link}> map onto the specified
1696map is not valid (or omitted), the player will be moved back to the 1743map. If the map is not valid (or omitted), the player will be moved back
1697location he/she was before the call to C<enter_link>, or, if that fails, 1744to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1745fails, to the emergency map position.
1699 1746
1700Might block. 1747Might block.
1701 1748
1702=cut 1749=cut
1750
1751sub link_map {
1752 unless ($LINK_MAP) {
1753 $LINK_MAP = cf::map::find "{link}"
1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1755 $LINK_MAP->load;
1756 }
1757
1758 $LINK_MAP
1759}
1703 1760
1704sub cf::object::player::enter_link { 1761sub cf::object::player::enter_link {
1705 my ($self) = @_; 1762 my ($self) = @_;
1706 1763
1707 $self->deactivate_recursive; 1764 $self->deactivate_recursive;
1708 1765
1709 return if $self->map == $LINK_MAP; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1767
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1769 if $self->map;
1713 1770
1714 $self->enter_map ($LINK_MAP, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1772}
1716 1773
1717sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1719 1776
… …
1783=cut 1840=cut
1784 1841
1785sub cf::object::player::goto { 1842sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1787 1844
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1845 $self->enter_link;
1791 1846
1792 (async { 1847 (async {
1848 my $map = eval {
1793 my $map = cf::map::find $path->as_string; 1849 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1795 1851 $map
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1797# if $map;
1798
1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1800 1854
1801 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1802 })->prio (1); 1856 })->prio (1);
1803} 1857}
1804 1858
… …
1808 1862
1809sub parse_random_map_params { 1863sub parse_random_map_params {
1810 my ($spec) = @_; 1864 my ($spec) = @_;
1811 1865
1812 my $rmp = { # defaults 1866 my $rmp = { # defaults
1813 xsize => 10, 1867 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1868 ysize => (cf::rndm 15, 40),
1869 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1870 #layout => string,
1815 }; 1871 };
1816 1872
1817 for (split /\n/, $spec) { 1873 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1874 my ($k, $v) = split /\s+/, $_, 2;
1819 1875
… …
1823 $rmp 1879 $rmp
1824} 1880}
1825 1881
1826sub prepare_random_map { 1882sub prepare_random_map {
1827 my ($exit) = @_; 1883 my ($exit) = @_;
1884
1885 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1886
1829 # all this does is basically replace the /! path by 1887 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1888 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1889 # that depends on the exit object
1832 1890
1833 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1834 1892
1835 if ($exit->map) { 1893 if ($exit->map) {
1836 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1837 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1838 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1839 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1840 } 1898 }
1841 1899
1842 $rmp->{random_seed} ||= $exit->random_seed; 1900 $rmp->{random_seed} ||= $exit->random_seed;
1843 1901
1844 my $data = cf::to_json $rmp; 1902 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1903 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1905
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 1907 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh;
1909 aio_rename "$meta~", $meta;
1849 1910
1850 $exit->slaying ("?random/$md5"); 1911 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1912 $exit->msg (undef);
1852 } 1913 }
1853} 1914}
1854 1915
1855sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1856 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1857 1918
1858 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1859 1929
1860 $self->enter_link; 1930 $self->enter_link;
1861 1931
1862 (async { 1932 (async {
1863 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1934 unless (eval {
1865 prepare_random_map $exit 1935 $self->goto ($slaying, $hp, $sp);
1866 if $exit->slaying eq "/!";
1867
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1936
1871 1; 1937 1;
1872 }) { 1938 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1874 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
… …
2163 sub db_sync() { 2229 sub db_sync() {
2164 db_save if $dirty; 2230 db_save if $dirty;
2165 undef $dirty; 2231 undef $dirty;
2166 } 2232 }
2167 2233
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2169 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2170 }); 2241 );
2171 2242
2172 sub db_dirty() { 2243 sub db_dirty() {
2173 $dirty = 1; 2244 $dirty = 1;
2174 $idle->start; 2245 $idle->start;
2175 } 2246 }
… …
2223 2294
2224sub main { 2295sub main {
2225 # we must not ever block the main coroutine 2296 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2297 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2298 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2299 (async {
2228 async { Event::one_event }; 2300 Event::one_event;
2301 })->prio (Coro::PRIO_MAX);
2229 }; 2302 };
2230 2303
2231 cfg_load; 2304 cfg_load;
2232 db_load; 2305 db_load;
2233 load_extensions; 2306 load_extensions;
2307
2308 $TICK_WATCHER->start;
2234 Event::loop; 2309 Event::loop;
2235} 2310}
2236 2311
2237############################################################################# 2312#############################################################################
2238# initialisation and cleanup 2313# initialisation and cleanup
2239 2314
2240# install some emergency cleanup handlers 2315# install some emergency cleanup handlers
2241BEGIN { 2316BEGIN {
2242 for my $signal (qw(INT HUP TERM)) { 2317 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal ( 2318 Event->signal (
2319 reentrant => 0,
2244 data => WF_AUTOCANCEL, 2320 data => WF_AUTOCANCEL,
2245 signal => $signal, 2321 signal => $signal,
2322 prio => 0,
2246 cb => sub { 2323 cb => sub {
2247 cf::cleanup "SIG$signal"; 2324 cf::cleanup "SIG$signal";
2248 }, 2325 },
2249 ); 2326 );
2250 } 2327 }
2251} 2328}
… …
2256 warn "enter emergency perl save\n"; 2333 warn "enter emergency perl save\n";
2257 2334
2258 cf::sync_job { 2335 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2336 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2337 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2338 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2339 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2340 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2341 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2342 $pl->valid or next;
2266 $pl->save; 2343 $pl->save;
… …
2280} 2357}
2281 2358
2282sub reload() { 2359sub reload() {
2283 # can/must only be called in main 2360 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2286 return; 2363 return;
2287 } 2364 }
2288 2365
2289 warn "reloading..."; 2366 warn "reloading...";
2290 2367
2291 warn "freezing server"; 2368 warn "cancelling server ticker";
2292 my $guard = freeze_mainloop; 2369 $TICK_WATCHER->cancel;
2370
2293 cf::emergency_save; 2371 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298 2372
2299 eval { 2373 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2301 2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378
2302 warn "cancel all watchers"; 2379 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2380 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2381 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2382 }
2306 2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 IO::AIO::flush;
2387 Coro::cede;
2388 last unless IO::AIO::nreqs;
2389 warn "iterate...";
2390 }
2391
2307 warn "cancel all extension coros"; 2392 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2393 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2394 %EXT_CORO = ();
2310 2395
2311 warn "remove commands"; 2396 warn "removing commands";
2312 %COMMAND = (); 2397 %COMMAND = ();
2313 2398
2314 warn "remove ext commands"; 2399 warn "removing ext commands";
2315 %EXTCMD = (); 2400 %EXTCMD = ();
2316 2401
2317 warn "unload/nuke all extensions"; 2402 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2403 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2404 warn "... unloading $pkg";
2320 2405
2321 if (my $cb = $pkg->can ("unload")) { 2406 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2407 eval {
2323 $cb->($pkg); 2408 $cb->($pkg);
2324 1 2409 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2410 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2411 }
2327 2412
2413 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2414 Symbol::delete_package $pkg;
2329 } 2415 }
2330 2416
2331 warn "unload all perl modules loaded from $LIBDIR"; 2417 warn "unloading all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2418 while (my ($k, $v) = each %INC) {
2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2419 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2334 2420
2335 warn "removing <$k>"; 2421 warn "... unloading $k";
2336 delete $INC{$k}; 2422 delete $INC{$k};
2337 2423
2338 $k =~ s/\.pm$//; 2424 $k =~ s/\.pm$//;
2339 $k =~ s/\//::/g; 2425 $k =~ s/\//::/g;
2340 2426
… …
2343 } 2429 }
2344 2430
2345 Symbol::delete_package $k; 2431 Symbol::delete_package $k;
2346 } 2432 }
2347 2433
2348 warn "get rid of safe::, as good as possible"; 2434 warn "getting rid of safe::, as good as possible";
2349 Symbol::delete_package "safe::$_" 2435 Symbol::delete_package "safe::$_"
2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2351 2437
2352 warn "unload cf.pm \"a bit\""; 2438 warn "unloading cf.pm \"a bit\"";
2353 delete $INC{"cf.pm"}; 2439 delete $INC{"cf.pm"};
2354 2440
2355 # don't, removes xs symbols, too, 2441 # don't, removes xs symbols, too,
2356 # and global variables created in xs 2442 # and global variables created in xs
2357 #Symbol::delete_package __PACKAGE__; 2443 #Symbol::delete_package __PACKAGE__;
2358 2444
2445 warn "unload completed, starting to reload now";
2446
2359 warn "reloading cf.pm"; 2447 warn "reloading cf.pm";
2360 require cf; 2448 require cf;
2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2362 2450
2363 warn "load config and database again"; 2451 warn "loading config and database again";
2364 cf::cfg_load; 2452 cf::cfg_load;
2365 cf::db_load; 2453 cf::db_load;
2366 2454
2367 warn "load extensions"; 2455 warn "loading extensions";
2368 cf::load_extensions; 2456 cf::load_extensions;
2369 2457
2370 warn "reattach attachments to objects/players"; 2458 warn "reattaching attachments to objects/players";
2371 _global_reattach; 2459 _global_reattach;
2372 warn "reattach attachments to maps"; 2460 warn "reattaching attachments to maps";
2373 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "restarting server ticker";
2464
2465 $TICK_WATCHER->start;
2374 }; 2466 };
2375 2467
2376 if ($@) { 2468 if ($@) {
2377 warn $@; 2469 warn $@;
2378 warn "error while reloading, exiting."; 2470 warn "error while reloading, exiting.";
… …
2380 } 2472 }
2381 2473
2382 warn "reloaded"; 2474 warn "reloaded";
2383}; 2475};
2384 2476
2385############################################################################# 2477our $RELOAD_WATCHER; # used only during reload
2386
2387unless ($LINK_MAP) {
2388 $LINK_MAP = cf::map::new;
2389
2390 $LINK_MAP->width (41);
2391 $LINK_MAP->height (41);
2392 $LINK_MAP->alloc;
2393 $LINK_MAP->path ("{link}");
2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2396
2397 # dirty hack because... archetypes are not yet loaded
2398 Event->timer (
2399 after => 10,
2400 cb => sub {
2401 $_[0]->w->cancel;
2402
2403 # provide some exits "home"
2404 my $exit = cf::object::new "exit";
2405
2406 $exit->slaying ($EMERGENCY_POSITION->[0]);
2407 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2408 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2409
2410 $LINK_MAP->insert ($exit->clone, 19, 19);
2411 $LINK_MAP->insert ($exit->clone, 19, 20);
2412 $LINK_MAP->insert ($exit->clone, 19, 21);
2413 $LINK_MAP->insert ($exit->clone, 20, 19);
2414 $LINK_MAP->insert ($exit->clone, 20, 21);
2415 $LINK_MAP->insert ($exit->clone, 21, 19);
2416 $LINK_MAP->insert ($exit->clone, 21, 20);
2417 $LINK_MAP->insert ($exit->clone, 21, 21);
2418
2419 $exit->destroy;
2420 });
2421
2422 $LINK_MAP->{deny_save} = 1;
2423 $LINK_MAP->{deny_reset} = 1;
2424
2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2426}
2427 2478
2428register_command "reload" => sub { 2479register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2480 my ($who, $arg) = @_;
2430 2481
2431 if ($who->flag (FLAG_WIZ)) { 2482 if ($who->flag (FLAG_WIZ)) {
2432 $who->message ("start of reload."); 2483 $who->message ("reloading server.");
2484
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2433 reload; 2493 reload;
2434 $who->message ("end of reload."); 2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2435 } 2497 }
2436}; 2498};
2437 2499
2438unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2501
2502my $bug_warning = 0;
2439 2503
2440$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2441 reentrant => 0, 2505 reentrant => 0,
2506 parked => 1,
2442 prio => 0, 2507 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2445 cb => sub { 2510 cb => sub {
2511 if ($Coro::current != $Coro::main) {
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10;
2514 return;
2515 }
2516
2517 $NOW = Event::time;
2518
2446 cf::server_tick; # one server iteration 2519 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2520 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2449 2522
2450 $WAIT_FOR_TICK->broadcast; 2523 $WAIT_FOR_TICK->broadcast;
2451 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2452 2531
2453 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2455 2534
2456 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2457 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2458 }, 2537 },
2459); 2538);
2460 2539
2461IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2462 2541
2463Event->io ( 2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2464 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2465 poll => 'r', 2546 poll => 'r',
2466 prio => 5, 2547 prio => 6,
2467 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2469); 2550);
2470 2551
2471Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2472 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2473 after => 0, 2555 after => 1,
2474 interval => 10, 2556 interval => 10,
2475 cb => sub { 2557 prio => 6, # keep it lowest so it acts like a watchdog
2476 (Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2477 write_runtime 2559 write_runtime
2478 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2479 })->();
2480 }, 2561 },
2481); 2562);
2482 2563
2483END { cf::emergency_save } 2564END { cf::emergency_save }
2484 2565

Diff Legend

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