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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.184 by root, Fri Jan 19 22:47:57 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
33 33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
44our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
45our $NEXT_TICK; 51our $NEXT_TICK;
46our $NOW; 52our $NOW;
47 53
48our %CFG; 54our %CFG;
49 55
50our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 57our $RUNTIME;
52 58
53our %PLAYER; # all users 59our %PLAYER; # all users
54our %MAP; # all maps 60our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions
58 63
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61 69
62binmode STDOUT; 70binmode STDOUT;
63binmode STDERR; 71binmode STDERR;
64 72
65# read virtual server time, if available 73# read virtual server time, if available
… …
73mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
77 85
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
81 87
82############################################################################# 88#############################################################################
83 89
84=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
156} 162}
157 163
158$Event::DIED = sub { 164$Event::DIED = sub {
159 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
160}; 166};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 167
166=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
167 169
168=over 4 170=over 4
169 171
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
319 } 325 }
320} 326}
321 327
322=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
323 329
324Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 331extension calling this is being unloaded.
326 332
327=cut 333=cut
328 334
329sub async_ext(&) { 335sub async_ext(&) {
… …
362} 368}
363 369
364=back 370=back
365 371
366=cut 372=cut
367
368#############################################################################
369
370package cf::path;
371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378sub new {
379 my ($class, $path, $base) = @_;
380
381 $path = $path->as_string if ref $path;
382
383 my $self = bless { }, $class;
384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else {
401 if ($path =~ s{^~([^/]+)?}{}) {
402 $self->{user_rel} = 1;
403
404 if (defined $1) {
405 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1;
408 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 }
411 } elsif ($path =~ /^\//) {
412 # already absolute
413 } else {
414 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path");
416 }
417
418 for ($path) {
419 redo if s{/\.?/}{/};
420 redo if s{/[^/]+/\.\./}{/};
421 }
422 }
423
424 $self->{path} = $path;
425
426 $self
427}
428
429# the name / primary key / in-game path
430sub as_string {
431 my ($self) = @_;
432
433 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}"
435 : $self->{path}
436}
437
438# the displayed name, this is a one way mapping
439sub visible_name {
440 my ($self) = @_;
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448}
449
450# escape the /'s in the path
451sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453 $path
454}
455
456# the original (read-only) location
457sub load_path {
458 my ($self) = @_;
459
460 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461}
462
463# the temporary/swap location
464sub save_path {
465 my ($self) = @_;
466
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470}
471
472# the unique path, might be eq to save_path
473sub uniq_path {
474 my ($self) = @_;
475
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486}
487
488# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map {
490 $_[0]{path} =~ m{^/styles/}
491}
492
493package cf;
494 373
495############################################################################# 374#############################################################################
496 375
497=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
498 377
… …
624our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
625our @CB_MAP = (); 504our @CB_MAP = ();
626 505
627my %attachment; 506my %attachment;
628 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
629sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
630 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
631 516
632 use sort 'stable'; 517 use sort 'stable';
633 518
… …
804# object support 689# object support
805 690
806sub reattach { 691sub reattach {
807 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
808 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
809 696
810 my $registry = $obj->registry; 697 my $registry = $obj->registry;
811 698
812 @$registry = (); 699 @$registry = ();
813 700
… …
945=cut 832=cut
946 833
947sub register_extcmd { 834sub register_extcmd {
948 my ($name, $cb) = @_; 835 my ($name, $cb) = @_;
949 836
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 837 $EXTCMD{$name} = $cb;
954} 838}
955 839
956cf::player->attach ( 840cf::player->attach (
957 on_command => sub { 841 on_command => sub {
958 my ($pl, $name, $params) = @_; 842 my ($pl, $name, $params) = @_;
… …
971 855
972 my $msg = eval { from_json $buf }; 856 my $msg = eval { from_json $buf };
973 857
974 if (ref $msg) { 858 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 859 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 860 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 861 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 862 }
979 } 863 }
980 } else { 864 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 867
984 cf::override; 868 cf::override;
985 }, 869 },
986); 870);
987 871
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 872sub load_extension {
995 my ($path) = @_; 873 my ($path) = @_;
996 874
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 876 my $base = $1;
999 my $pkg = $1; 877 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 878 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 879 $pkg = "ext::$pkg";
1002 880
1003 warn "loading '$path' into '$pkg'\n"; 881 warn "... loading '$path' into '$pkg'\n";
1004 882
1005 open my $fh, "<:utf8", $path 883 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 884 or die "$path: $!";
1007 885
1008 my $source = 886 my $source =
1009 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 890 . "\n};\n1";
1013 891
1014 eval $source 892 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 894 : "extension disabled.\n";
1017 895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 896 warn $@;
1019 $ext_pkg{$base} = $pkg; 897 warn "mandatory extension failed to load, exiting.\n";
1020 898 exit 1;
1021# no strict 'refs'; 899 }
1022# @{"$pkg\::ISA"} = ext::; 900 die $@;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# } 901 }
1037 902
1038 # remove commands 903 push @EXTS, $pkg;
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 904}
1063 905
1064sub load_extensions { 906sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 907 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 908 next unless -r $ext;
… …
1070 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1071 } 913 }
1072} 914}
1073 915
1074############################################################################# 916#############################################################################
1075# load/save/clean perl data associated with a map
1076
1077*cf::mapsupport::on_clean = sub {
1078 my ($map) = @_;
1079
1080 my $path = $map->tmpname;
1081 defined $path or return;
1082
1083 unlink "$path.pst";
1084};
1085
1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088#############################################################################
1089 917
1090=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1091 919
1092Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1093 921
… …
1129 957
1130sub exists($) { 958sub exists($) {
1131 my ($login) = @_; 959 my ($login) = @_;
1132 960
1133 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
1135} 963}
1136 964
1137sub find($) { 965sub find($) {
1138 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0]; 967 my $login = $_[0];
… …
1229 \@logins 1057 \@logins
1230} 1058}
1231 1059
1232=item $player->maps 1060=item $player->maps
1233 1061
1234Returns an arrayref of cf::path's of all maps that are private for this 1062Returns an arrayref of map paths that are private for this
1235player. May block. 1063player. May block.
1236 1064
1237=cut 1065=cut
1238 1066
1239sub maps($) { 1067sub maps($) {
… …
1247 for (@$files) { 1075 for (@$files) {
1248 utf8::decode $_; 1076 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1251 1079
1080 s/\.map$//;
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1253 } 1082 }
1254 1083
1255 \@paths 1084 \@paths
1256} 1085}
1257 1086
… …
1283package cf::map; 1112package cf::map;
1284 1113
1285use Fcntl; 1114use Fcntl;
1286use Coro::AIO; 1115use Coro::AIO;
1287 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1288our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1290 1123
1291sub generate_random_map { 1124sub generate_random_map {
1292 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1293
1294 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1127 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region}) 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 )
1140}
1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1167sub normalise {
1168 my ($path, $base) = @_;
1169
1170 # map plan:
1171 #
1172 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched
1174 # ?xxx/... are special absolute paths
1175 # ?random/... random maps
1176 # /... normal maps
1177 # ~user/... per-player map of a specific user
1178
1179 $path =~ s/$PATH_SEP/\//go;
1180
1181 # treat it as relative path if it starts with
1182 # something that looks reasonable
1183 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1184 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1185
1186 $base =~ s{[^/]+/?$}{};
1187 $path = "$base/$path";
1188 }
1189
1190 for ($path) {
1191 redo if s{//}{/};
1192 redo if s{/\.?/}{/};
1193 redo if s{/[^/]+/\.\./}{/};
1194 }
1195
1196 $path
1197}
1198
1199sub new_from_path {
1200 my (undef, $path, $base) = @_;
1201
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203
1204 $path = normalise $path, $base;
1205
1206 for my $pkg (keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) {
1208 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc.
1211 return $self;
1212 }
1213 }
1214
1215 Carp::carp "unable to resolve path '$path'.";
1216 ()
1217}
1218
1219sub init {
1220 my ($self) = @_;
1221
1222 $self
1223}
1224
1225sub as_string {
1226 my ($self) = @_;
1227
1228 "$self->{path}"
1229}
1230
1231# the displayed name, this is a one way mapping
1232sub visible_name {
1233 &as_string
1234}
1235
1236# the original (read-only) location
1237sub load_path {
1238 my ($self) = @_;
1239
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1241}
1242
1243# the temporary/swap location
1244sub save_path {
1245 my ($self) = @_;
1246
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1249}
1250
1251# the unique path, undef == no special unique path
1252sub uniq_path {
1253 my ($self) = @_;
1254
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1308} 1257}
1309 1258
1310# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1311# all maps in C++... 1260# all maps in C++...
1312sub change_all_map_light { 1261sub change_all_map_light {
… …
1314 1263
1315 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1317} 1266}
1318 1267
1268sub unlink_save {
1269 my ($self) = @_;
1270
1271 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1274}
1275
1319sub try_load_header($) { 1276sub load_header_from($) {
1320 my ($path) = @_; 1277 my ($self, $path) = @_;
1321 1278
1322 utf8::encode $path; 1279 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1324 or return; 1281 or return;
1325 1282
1326 my $map = cf::map::new 1283 $self->_load_header ($path)
1327 or return; 1284 or return;
1328 1285
1329 # for better error messages only, will be overwritten 1286 $self->{load_path} = $path;
1330 $map->path ($path);
1331 1287
1332 $map->load_header ($path) 1288 1
1289}
1290
1291sub load_orig {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->load_path)
1295}
1296
1297sub load_temp {
1298 my ($self) = @_;
1299
1300 $self->load_header_from ($self->save_path)
1301}
1302
1303sub load_header {
1304 my ($self) = @_;
1305
1306 if ($self->load_temp) {
1307 $self->last_access ((delete $self->{last_access})
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else {
1313 $self->load_orig
1333 or return; 1314 or return;
1334 1315
1335 $map->{load_path} = $path; 1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 }
1336 1321
1337 $map 1322 1
1338} 1323}
1339 1324
1340sub find; 1325sub find;
1341sub find { 1326sub find {
1342 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1343 1328
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1330
1349 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1350 1332
1351 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1353 1335 my $map = new_from_path cf::map $path
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1336 or return;
1373 1337
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME; 1338 $map->{last_save} = $cf::RUNTIME;
1386 1339
1387 Coro::cede; 1340 $map->load_header
1341 or return;
1388 1342
1389 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1390 $map->reset; 1345 $map->reset;
1391 undef $guard; 1346 undef $guard;
1392 $map = find $path 1347 $map = find $path
1393 or return; 1348 or return;
1394 } 1349 }
1395 1350
1396 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1397 } 1352 }
1398} 1353}
1399 1354
1400sub load { 1355sub load {
1401 my ($self) = @_; 1356 my ($self) = @_;
1402 1357
1403 my $path = $self->{path}; 1358 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1405 1360
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1362
1408 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1409 1364
1410 $self->alloc; 1365 $self->alloc;
1411 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1367 or return;
1413 1368
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1416 1371
1417 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1373 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1375 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1422 } 1377 }
1423 } 1378 }
1424 1379
1425 Coro::cede; 1380 Coro::cede;
1426 1381
1427 # now do the right thing for maps 1382 # now do the right thing for maps
1428 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1429 1384
1430 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1386 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1437 $self->set_darkness_map; 1390 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1440 $self->activate; 1394 $self->activate;
1441 } 1395 }
1442 1396
1443 Coro::cede;
1444
1445 $self->in_memory (cf::MAP_IN_MEMORY); 1397 $self->in_memory (cf::MAP_IN_MEMORY);
1398}
1399
1400sub customise_for {
1401 my ($self, $ob) = @_;
1402
1403 return find "~" . $ob->name . "/" . $self->{path}
1404 if $self->per_player;
1405
1406 $self
1446} 1407}
1447 1408
1448# find and load all maps in the 3x3 area around a map 1409# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1410sub load_diag {
1450 my ($map) = @_; 1411 my ($map) = @_;
… …
1480 1441
1481 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1482} 1443}
1483 1444
1484our %MAP_PREFETCH; 1445our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1446our $MAP_PREFETCHER = undef;
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495 }
1496 Coro::schedule;
1497 }
1498};
1499 1447
1500sub find_async { 1448sub find_async {
1501 my ($path, $origin) = @_; 1449 my ($path, $origin) = @_;
1502 1450
1503 $path = new cf::path $path, $origin && $origin->path; 1451 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1452
1506 if (my $map = $cf::MAP{$key}) { 1453 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1454 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1455 }
1509 1456
1510 $MAP_PREFETCH{$key} = $path; 1457 undef $MAP_PREFETCH{$path};
1511 $MAP_PREFETCHER->ready; 1458 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) {
1461 my $map = find $path
1462 or next;
1463 $map->load;
1464
1465 delete $MAP_PREFETCH{$path};
1466 }
1467 }
1468 undef $MAP_PREFETCHER;
1469 };
1512 1470
1513 () 1471 ()
1514} 1472}
1515 1473
1516sub save { 1474sub save {
… …
1520 1478
1521 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1522 1480
1523 return unless $self->dirty; 1481 return unless $self->dirty;
1524 1482
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1485
1528 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1529 1487
1530 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1531 1489
… …
1534 cf::async { 1492 cf::async {
1535 $_->contr->save for $self->players; 1493 $_->contr->save for $self->players;
1536 }; 1494 };
1537 1495
1538 if ($uniq) { 1496 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1499 } else {
1542 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1500 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1543 } 1501 }
1544} 1502}
1545 1503
1546sub swap_out { 1504sub swap_out {
1547 my ($self) = @_; 1505 my ($self) = @_;
… …
1561 1519
1562sub reset_at { 1520sub reset_at {
1563 my ($self) = @_; 1521 my ($self) = @_;
1564 1522
1565 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1567 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1568 1526
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1571 1529
… …
1576 my ($self) = @_; 1534 my ($self) = @_;
1577 1535
1578 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1579} 1537}
1580 1538
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename {
1590 my ($self, $new_path) = @_;
1591
1592 $self->unlink_save;
1593
1594 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path;
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self;
1598
1599 $self->save;
1600}
1601
1602sub reset { 1539sub reset {
1603 my ($self) = @_; 1540 my ($self) = @_;
1604 1541
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1543
1607 return if $self->players; 1544 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1545 return if $self->isa ("ext::map_per_player");#d#
1609 1546
1610 warn "resetting map ", $self->path;#d# 1547 warn "resetting map ", $self->path;#d#
1611 1548
1612 delete $cf::MAP{$self->path}; 1549 delete $cf::MAP{$self->path};
1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1613 1553
1614 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1615 1555
1616 $self->unlink_save; 1556 $self->unlink_save;
1617 $self->destroy; 1557 $self->destroy;
… …
1620my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1621 1561
1622sub nuke { 1562sub nuke {
1623 my ($self) = @_; 1563 my ($self) = @_;
1624 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1625 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1626 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1628 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1629} 1578}
1630 1579
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps 1580=item cf::map::unique_maps
1642 1581
1643Returns an arrayref of cf::path's of all shared maps that have 1582Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1583instantiated unique items. May block.
1645 1584
1646=cut 1585=cut
1647 1586
1648sub unique_maps() { 1587sub unique_maps() {
… …
1654 for (@$files) { 1593 for (@$files) {
1655 utf8::decode $_; 1594 utf8::decode $_;
1656 next if /\.pst$/; 1595 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1596 next unless /^$PATH_SEP/o;
1658 1597
1598 s/\.map$//;
1659 push @paths, new cf::path $_; 1599 push @paths, $_;
1660 } 1600 }
1661 1601
1662 \@paths 1602 \@paths
1663} 1603}
1664 1604
… …
1739 1679
1740=item $player_object->enter_link 1680=item $player_object->enter_link
1741 1681
1742Freezes the player and moves him/her to a special map (C<{link}>). 1682Freezes the player and moves him/her to a special map (C<{link}>).
1743 1683
1744The player should be reaosnably safe there for short amounts of time. You 1684The player should be reasonably safe there for short amounts of time. You
1745I<MUST> call C<leave_link> as soon as possible, though. 1685I<MUST> call C<leave_link> as soon as possible, though.
1746 1686
1687Will never block.
1688
1747=item $player_object->leave_link ($map, $x, $y) 1689=item $player_object->leave_link ($map, $x, $y)
1748 1690
1749Moves the player out of the specila link map onto the given map. If the 1691Moves the player out of the special C<{link}> map onto the specified
1750map is not valid (or omitted), the player will be moved back to the 1692map. If the map is not valid (or omitted), the player will be moved back
1751location he/she was before the call to C<enter_link>, or, if that fails, 1693to the location he/she was before the call to C<enter_link>, or, if that
1752to the emergency map position. 1694fails, to the emergency map position.
1753 1695
1754Might block. 1696Might block.
1755 1697
1756=cut 1698=cut
1699
1700sub link_map {
1701 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1704 $LINK_MAP->load;
1705 }
1706
1707 $LINK_MAP
1708}
1757 1709
1758sub cf::object::player::enter_link { 1710sub cf::object::player::enter_link {
1759 my ($self) = @_; 1711 my ($self) = @_;
1760 1712
1761 $self->deactivate_recursive; 1713 $self->deactivate_recursive;
1762 1714
1763 return if $self->map == $LINK_MAP; 1715 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1716
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1718 if $self->map;
1767 1719
1768 $self->enter_map ($LINK_MAP, 20, 20); 1720 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1769} 1721}
1770 1722
1771sub cf::object::player::leave_link { 1723sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1724 my ($self, $map, $x, $y) = @_;
1773 1725
… …
1837=cut 1789=cut
1838 1790
1839sub cf::object::player::goto { 1791sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1792 my ($self, $path, $x, $y) = @_;
1841 1793
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1794 $self->enter_link;
1845 1795
1846 (async { 1796 (async {
1847 my $map = cf::map::find $path->as_string; 1797 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1798 $map = $map->customise_for ($self) if $map;
1849 1799
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1800# warn "entering ", $map->path, " at ($x, $y)\n"
1851# if $map; 1801# if $map;
1852 1802
… …
1862 1812
1863sub parse_random_map_params { 1813sub parse_random_map_params {
1864 my ($spec) = @_; 1814 my ($spec) = @_;
1865 1815
1866 my $rmp = { # defaults 1816 my $rmp = { # defaults
1867 xsize => 10, 1817 xsize => (cf::rndm 15, 40),
1868 ysize => 10, 1818 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string,
1869 }; 1821 };
1870 1822
1871 for (split /\n/, $spec) { 1823 for (split /\n/, $spec) {
1872 my ($k, $v) = split /\s+/, $_, 2; 1824 my ($k, $v) = split /\s+/, $_, 2;
1873 1825
… …
1877 $rmp 1829 $rmp
1878} 1830}
1879 1831
1880sub prepare_random_map { 1832sub prepare_random_map {
1881 my ($exit) = @_; 1833 my ($exit) = @_;
1834
1835 my $guard = cf::lock_acquire "exit_prepare:$exit";
1882 1836
1883 # all this does is basically replace the /! path by 1837 # all this does is basically replace the /! path by
1884 # a new random map path (?random/...) with a seed 1838 # a new random map path (?random/...) with a seed
1885 # that depends on the exit object 1839 # that depends on the exit object
1886 1840
… …
1895 1849
1896 $rmp->{random_seed} ||= $exit->random_seed; 1850 $rmp->{random_seed} ||= $exit->random_seed;
1897 1851
1898 my $data = cf::to_json $rmp; 1852 my $data = cf::to_json $rmp;
1899 my $md5 = Digest::MD5::md5_hex $data; 1853 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1900 1855
1901 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1856 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1902 aio_write $fh, 0, (length $data), $data, 0; 1857 aio_write $fh, 0, (length $data), $data, 0;
1858 undef $fh;
1859 aio_rename "$meta~", $meta;
1903 1860
1904 $exit->slaying ("?random/$md5"); 1861 $exit->slaying ("?random/$md5");
1905 $exit->msg (undef); 1862 $exit->msg (undef);
1906 } 1863 }
1907} 1864}
… …
1917 $self->deactivate_recursive; # just to be sure 1874 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1875 unless (eval {
1919 prepare_random_map $exit 1876 prepare_random_map $exit
1920 if $exit->slaying eq "/!"; 1877 if $exit->slaying eq "/!";
1921 1878
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1881
1925 1; 1882 1;
1926 }) { 1883 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1884 $self->message ("Something went wrong deep within the crossfire server. "
… …
2217 sub db_sync() { 2174 sub db_sync() {
2218 db_save if $dirty; 2175 db_save if $dirty;
2219 undef $dirty; 2176 undef $dirty;
2220 } 2177 }
2221 2178
2222 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2179 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2223 db_sync; 2180 db_sync;
2224 }); 2181 });
2225 2182
2226 sub db_dirty() { 2183 sub db_dirty() {
2227 $dirty = 1; 2184 $dirty = 1;
… …
2277 2234
2278sub main { 2235sub main {
2279 # we must not ever block the main coroutine 2236 # we must not ever block the main coroutine
2280 local $Coro::idle = sub { 2237 local $Coro::idle = sub {
2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2238 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2239 (async {
2282 async { Event::one_event }; 2240 Event::one_event;
2241 })->prio (Coro::PRIO_MAX);
2283 }; 2242 };
2284 2243
2285 cfg_load; 2244 cfg_load;
2286 db_load; 2245 db_load;
2287 load_extensions; 2246 load_extensions;
2247
2248 $TICK_WATCHER->start;
2288 Event::loop; 2249 Event::loop;
2289} 2250}
2290 2251
2291############################################################################# 2252#############################################################################
2292# initialisation and cleanup 2253# initialisation and cleanup
… …
2310 warn "enter emergency perl save\n"; 2271 warn "enter emergency perl save\n";
2311 2272
2312 cf::sync_job { 2273 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2274 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2275 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2276 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2277 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2278 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2279 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2280 $pl->valid or next;
2320 $pl->save; 2281 $pl->save;
… …
2334} 2295}
2335 2296
2336sub reload() { 2297sub reload() {
2337 # can/must only be called in main 2298 # can/must only be called in main
2338 if ($Coro::current != $Coro::main) { 2299 if ($Coro::current != $Coro::main) {
2339 warn "can only reload from main coroutine\n"; 2300 warn "can only reload from main coroutine";
2340 return; 2301 return;
2341 } 2302 }
2342 2303
2343 warn "reloading..."; 2304 warn "reloading...";
2344 2305
2345 my $guard = freeze_mainloop; 2306 warn "cancelling server ticker";
2307 $TICK_WATCHER->cancel;
2308
2346 cf::emergency_save; 2309 cf::emergency_save;
2347 2310
2348 eval { 2311 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2312 # if anything goes wrong in here, we should simply crash as we already saved
2350 2313
2351 # cancel all watchers 2314 warn "syncing database to disk";
2315 cf::db_sync;
2316
2317 warn "cancelling all WF_AUTOCANCEL watchers";
2352 for (Event::all_watchers) { 2318 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2319 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2320 }
2355 2321
2322 warn "flushing outstanding aio requests";
2323 for (;;) {
2324 IO::AIO::flush;
2325 Coro::cede;
2326 last unless IO::AIO::nreqs;
2327 warn "iterate...";
2328 }
2329
2356 # cancel all extension coros 2330 warn "cancelling all extension coros";
2357 $_->cancel for values %EXT_CORO; 2331 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2332 %EXT_CORO = ();
2359 2333
2360 # unload all extensions 2334 warn "removing commands";
2361 for (@exts) { 2335 %COMMAND = ();
2336
2337 warn "removing ext commands";
2338 %EXTCMD = ();
2339
2340 warn "unloading/nuking all extensions";
2341 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2342 warn "... unloading $pkg";
2363 unload_extension $_; 2343
2344 if (my $cb = $pkg->can ("unload")) {
2345 eval {
2346 $cb->($pkg);
2347 1
2348 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2349 }
2365 2350
2351 warn "... nuking $pkg";
2352 Symbol::delete_package $pkg;
2353 }
2354
2366 # unload all modules loaded from $LIBDIR 2355 warn "unloading all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2356 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2357 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2358
2370 warn "removing <$k>"; 2359 warn "... unloading $k";
2371 delete $INC{$k}; 2360 delete $INC{$k};
2372 2361
2373 $k =~ s/\.pm$//; 2362 $k =~ s/\.pm$//;
2374 $k =~ s/\//::/g; 2363 $k =~ s/\//::/g;
2375 2364
… …
2378 } 2367 }
2379 2368
2380 Symbol::delete_package $k; 2369 Symbol::delete_package $k;
2381 } 2370 }
2382 2371
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2372 warn "getting rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2373 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2374 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2375
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2376 warn "unloading cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2377 delete $INC{"cf.pm"};
2396 2378
2397 # don't, removes xs symbols, too, 2379 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2380 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2381 #Symbol::delete_package __PACKAGE__;
2400 2382
2401 # reload cf.pm 2383 warn "unload completed, starting to reload now";
2384
2402 warn "reloading cf.pm"; 2385 warn "reloading cf.pm";
2403 require cf; 2386 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2388
2406 # load config and database again 2389 warn "loading config and database again";
2407 cf::cfg_load; 2390 cf::cfg_load;
2408 cf::db_load; 2391 cf::db_load;
2409 2392
2410 # load extensions
2411 warn "load extensions"; 2393 warn "loading extensions";
2412 cf::load_extensions; 2394 cf::load_extensions;
2413 2395
2414 # reattach attachments to objects 2396 warn "reattaching attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2397 _global_reattach;
2398 warn "reattaching attachments to maps";
2417 reattach $_ for values %MAP; 2399 reattach $_ for values %MAP;
2400
2401 warn "restarting server ticker";
2402
2403 $TICK_WATCHER->start;
2418 }; 2404 };
2419 2405
2420 if ($@) { 2406 if ($@) {
2421 warn $@; 2407 warn $@;
2422 warn "error while reloading, exiting."; 2408 warn "error while reloading, exiting.";
2423 exit 1; 2409 exit 1;
2424 } 2410 }
2425 2411
2426 warn "reloaded successfully"; 2412 warn "reloaded";
2427}; 2413};
2428 2414
2429############################################################################# 2415our $RELOAD_WATCHER; # used only during reload
2430
2431unless ($LINK_MAP) {
2432 $LINK_MAP = cf::map::new;
2433
2434 $LINK_MAP->width (41);
2435 $LINK_MAP->height (41);
2436 $LINK_MAP->alloc;
2437 $LINK_MAP->path ("{link}");
2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470}
2471
2472register "<global>", __PACKAGE__;
2473 2416
2474register_command "reload" => sub { 2417register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2418 my ($who, $arg) = @_;
2476 2419
2477 if ($who->flag (FLAG_WIZ)) { 2420 if ($who->flag (FLAG_WIZ)) {
2478 $who->message ("start of reload."); 2421 $who->message ("reloading server.");
2422
2423 # doing reload synchronously and two reloads happen back-to-back,
2424 # coro crashes during coro_state_free->destroy here.
2425
2426 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2479 reload; 2427 reload;
2480 $who->message ("end of reload."); 2428 undef $RELOAD_WATCHER;
2429 });
2481 } 2430 }
2482}; 2431};
2483 2432
2484unshift @INC, $LIBDIR; 2433unshift @INC, $LIBDIR;
2434
2435my $bug_warning = 0;
2485 2436
2486$TICK_WATCHER = Event->timer ( 2437$TICK_WATCHER = Event->timer (
2487 reentrant => 0, 2438 reentrant => 0,
2439 parked => 1,
2488 prio => 0, 2440 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2441 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2491 cb => sub { 2443 cb => sub {
2444 if ($Coro::current != $Coro::main) {
2445 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2446 unless ++$bug_warning > 10;
2447 return;
2448 }
2449
2450 $NOW = Event::time;
2451
2492 cf::server_tick; # one server iteration 2452 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2453 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2454 $NEXT_TICK += $TICK;
2495 2455
2496 $WAIT_FOR_TICK->broadcast; 2456 $WAIT_FOR_TICK->broadcast;
… …
2504 }, 2464 },
2505); 2465);
2506 2466
2507IO::AIO::max_poll_time $TICK * 0.2; 2467IO::AIO::max_poll_time $TICK * 0.2;
2508 2468
2509Event->io ( 2469$AIO_POLL_WATCHER = Event->io (
2510 fd => IO::AIO::poll_fileno, 2470 fd => IO::AIO::poll_fileno,
2511 poll => 'r', 2471 poll => 'r',
2512 prio => 5, 2472 prio => 5,
2513 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2514 cb => \&IO::AIO::poll_cb, 2474 cb => \&IO::AIO::poll_cb,
2515); 2475);
2516 2476
2517Event->timer ( 2477$WRITE_RUNTIME_WATCHER = Event->timer (
2518 data => WF_AUTOCANCEL, 2478 data => WF_AUTOCANCEL,
2519 after => 0, 2479 after => 1,
2520 interval => 10, 2480 interval => 10,
2521 cb => sub { 2481 cb => Coro::unblock_sub {
2522 (Coro::unblock_sub {
2523 write_runtime 2482 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!"; 2483 or warn "ERROR: unable to write runtime file: $!";
2525 })->();
2526 }, 2484 },
2527); 2485);
2528 2486
2529END { cf::emergency_save } 2487END { cf::emergency_save }
2530 2488

Diff Legend

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