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.185 by root, Fri Jan 19 23:32:52 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;
… …
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;
83 87
84############################################################################# 88#############################################################################
85 89
86=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
255} 259}
256 260
257sub freeze_mainloop { 261sub freeze_mainloop {
258 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
259 263
260 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;
261 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
262 $guard 270 $guard
263} 271}
264 272
265=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
360} 368}
361 369
362=back 370=back
363 371
364=cut 372=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 373
493############################################################################# 374#############################################################################
494 375
495=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
496 377
… …
622our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 504our @CB_MAP = ();
624 505
625my %attachment; 506my %attachment;
626 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
627sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
629 516
630 use sort 'stable'; 517 use sort 'stable';
631 518
… …
802# object support 689# object support
803 690
804sub reattach { 691sub reattach {
805 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 696
808 my $registry = $obj->registry; 697 my $registry = $obj->registry;
809 698
810 @$registry = (); 699 @$registry = ();
811 700
… …
987 my $base = $1; 876 my $base = $1;
988 my $pkg = $1; 877 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 878 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 879 $pkg = "ext::$pkg";
991 880
992 warn "loading '$path' into '$pkg'\n"; 881 warn "... loading '$path' into '$pkg'\n";
993 882
994 open my $fh, "<:utf8", $path 883 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 884 or die "$path: $!";
996 885
997 my $source = 886 my $source =
998 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 890 . "\n};\n1";
1002 891
1003 eval $source 892 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 894 : "extension disabled.\n";
895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
896 warn $@;
897 warn "mandatory extension failed to load, exiting.\n";
898 exit 1;
899 }
900 die $@;
901 }
1006 902
1007 push @EXTS, $pkg; 903 push @EXTS, $pkg;
1008} 904}
1009 905
1010sub load_extensions { 906sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1017 } 913 }
1018} 914}
1019 915
1020############################################################################# 916#############################################################################
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 917
1036=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1037 919
1038Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1039 921
… …
1075 957
1076sub exists($) { 958sub exists($) {
1077 my ($login) = @_; 959 my ($login) = @_;
1078 960
1079 $cf::PLAYER{$login} 961 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login } 962 or cf::sync_job { !aio_stat path $login }
1081} 963}
1082 964
1083sub find($) { 965sub find($) {
1084 return $cf::PLAYER{$_[0]} || do { 966 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0]; 967 my $login = $_[0];
… …
1175 \@logins 1057 \@logins
1176} 1058}
1177 1059
1178=item $player->maps 1060=item $player->maps
1179 1061
1180Returns 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
1181player. May block. 1063player. May block.
1182 1064
1183=cut 1065=cut
1184 1066
1185sub maps($) { 1067sub maps($) {
… …
1193 for (@$files) { 1075 for (@$files) {
1194 utf8::decode $_; 1076 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1197 1079
1080 s/\.map$//;
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1199 } 1082 }
1200 1083
1201 \@paths 1084 \@paths
1202} 1085}
1203 1086
… …
1229package cf::map; 1112package cf::map;
1230 1113
1231use Fcntl; 1114use Fcntl;
1232use Coro::AIO; 1115use Coro::AIO;
1233 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1234our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1236 1123
1237sub generate_random_map { 1124sub generate_random_map {
1238 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1127 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $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},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (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
1254} 1257}
1255 1258
1256# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1257# all maps in C++... 1260# all maps in C++...
1258sub change_all_map_light { 1261sub change_all_map_light {
… …
1260 1263
1261 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1263} 1266}
1264 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
1265sub try_load_header($) { 1276sub load_header_from($) {
1266 my ($path) = @_; 1277 my ($self, $path) = @_;
1267 1278
1268 utf8::encode $path; 1279 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1270 or return; 1281 or return;
1271 1282
1272 my $map = cf::map::new 1283 $self->_load_header ($path)
1273 or return; 1284 or return;
1274 1285
1275 # for better error messages only, will be overwritten 1286 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1287
1278 $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
1279 or return; 1314 or return;
1280 1315
1281 $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 }
1282 1321
1283 $map 1322 1
1284} 1323}
1285 1324
1286sub find; 1325sub find;
1287sub find { 1326sub find {
1288 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1289 1328
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1330
1295 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1296 1332
1297 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1299 1335 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; 1336 or return;
1319 1337
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; 1338 $map->{last_save} = $cf::RUNTIME;
1332 1339
1333 Coro::cede; 1340 $map->load_header
1341 or return;
1334 1342
1335 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 # doing this can freeze the server in a sync job, obviously
1345 #$cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1346 $map->reset;
1337 undef $guard; 1347 undef $guard;
1338 $map = find $path 1348 $map = find $path
1339 or return; 1349 or return;
1340 } 1350 }
1341 1351
1342 $cf::MAP{$key} = $map 1352 $cf::MAP{$path} = $map
1343 } 1353 }
1344} 1354}
1345 1355
1346sub load { 1356sub load {
1347 my ($self) = @_; 1357 my ($self) = @_;
1348 1358
1349 my $path = $self->{path}; 1359 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1360 my $guard = cf::lock_acquire "map_load:$path";
1351 1361
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1362 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1363
1354 $self->in_memory (cf::MAP_LOADING); 1364 $self->in_memory (cf::MAP_LOADING);
1355 1365
1356 $self->alloc; 1366 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1367 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1368 or return;
1359 1369
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1371 if delete $self->{load_original};
1362 1372
1363 if (my $uniq = $path->uniq_path) { 1373 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1374 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1375 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1376 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1377 $self->_load_objects ($uniq, 0);
1368 } 1378 }
1369 } 1379 }
1370 1380
1371 Coro::cede; 1381 Coro::cede;
1372 1382
1373 # now do the right thing for maps 1383 # now do the right thing for maps
1374 $self->link_multipart_objects; 1384 $self->link_multipart_objects;
1375 1385
1376 if ($self->{path}->is_style_map) { 1386 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1387 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1388 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1389 $self->update_buttons;
1390 Coro::cede;
1383 $self->set_darkness_map; 1391 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1392 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1393 unless $self->difficulty;
1394 Coro::cede;
1386 $self->activate; 1395 $self->activate;
1387 } 1396 }
1388 1397
1389 Coro::cede;
1390
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1398 $self->in_memory (cf::MAP_IN_MEMORY);
1399}
1400
1401sub customise_for {
1402 my ($self, $ob) = @_;
1403
1404 return find "~" . $ob->name . "/" . $self->{path}
1405 if $self->per_player;
1406
1407 $self
1392} 1408}
1393 1409
1394# find and load all maps in the 3x3 area around a map 1410# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1411sub load_diag {
1396 my ($map) = @_; 1412 my ($map) = @_;
… …
1426 1442
1427 cf::sync_job { $map->load }; 1443 cf::sync_job { $map->load };
1428} 1444}
1429 1445
1430our %MAP_PREFETCH; 1446our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1447our $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 1448
1446sub find_async { 1449sub find_async {
1447 my ($path, $origin) = @_; 1450 my ($path, $origin) = @_;
1448 1451
1449 $path = new cf::path $path, $origin && $origin->path; 1452 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1453
1452 if (my $map = $cf::MAP{$key}) { 1454 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1455 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1456 }
1455 1457
1456 $MAP_PREFETCH{$key} = $path; 1458 undef $MAP_PREFETCH{$path};
1457 $MAP_PREFETCHER->ready; 1459 $MAP_PREFETCHER ||= cf::async {
1460 while (%MAP_PREFETCH) {
1461 for my $path (keys %MAP_PREFETCH) {
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465
1466 delete $MAP_PREFETCH{$path};
1467 }
1468 }
1469 undef $MAP_PREFETCHER;
1470 };
1458 1471
1459 () 1472 ()
1460} 1473}
1461 1474
1462sub save { 1475sub save {
… …
1466 1479
1467 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1468 1481
1469 return unless $self->dirty; 1482 return unless $self->dirty;
1470 1483
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1486
1474 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1475 1488
1476 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1477 1490
… …
1480 cf::async { 1493 cf::async {
1481 $_->contr->save for $self->players; 1494 $_->contr->save for $self->players;
1482 }; 1495 };
1483 1496
1484 if ($uniq) { 1497 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1500 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1502 }
1490} 1503}
1491 1504
1492sub swap_out { 1505sub swap_out {
1493 my ($self) = @_; 1506 my ($self) = @_;
… …
1507 1520
1508sub reset_at { 1521sub reset_at {
1509 my ($self) = @_; 1522 my ($self) = @_;
1510 1523
1511 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1514 1527
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1530
… …
1522 my ($self) = @_; 1535 my ($self) = @_;
1523 1536
1524 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1525} 1538}
1526 1539
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 { 1540sub reset {
1549 my ($self) = @_; 1541 my ($self) = @_;
1550 1542
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1543 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1544
1553 return if $self->players; 1545 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1546 return if $self->isa ("ext::map_per_player");#d#
1555 1547
1556 warn "resetting map ", $self->path;#d# 1548 warn "resetting map ", $self->path;#d#
1557 1549
1558 delete $cf::MAP{$self->path}; 1550 delete $cf::MAP{$self->path};
1551
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear;
1559 1554
1560 $_->clear_links_to ($self) for values %cf::MAP; 1555 $_->clear_links_to ($self) for values %cf::MAP;
1561 1556
1562 $self->unlink_save; 1557 $self->unlink_save;
1563 $self->destroy; 1558 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1561my $nuke_counter = "aaaa";
1567 1562
1568sub nuke { 1563sub nuke {
1569 my ($self) = @_; 1564 my ($self) = @_;
1570 1565
1566 delete $cf::MAP{$self->path};
1567
1568 $self->unlink_save;
1569
1570 bless $self, "cf::map";
1571 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1572 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1573 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1574 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1575
1576 $cf::MAP{$self->path} = $self;
1577
1574 $self->reset; # polite request, might not happen 1578 $self->reset; # polite request, might not happen
1575} 1579}
1576 1580
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 1581=item cf::map::unique_maps
1588 1582
1589Returns an arrayref of cf::path's of all shared maps that have 1583Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1584instantiated unique items. May block.
1591 1585
1592=cut 1586=cut
1593 1587
1594sub unique_maps() { 1588sub unique_maps() {
… …
1600 for (@$files) { 1594 for (@$files) {
1601 utf8::decode $_; 1595 utf8::decode $_;
1602 next if /\.pst$/; 1596 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1597 next unless /^$PATH_SEP/o;
1604 1598
1599 s/\.map$//;
1605 push @paths, new cf::path $_; 1600 push @paths, $_;
1606 } 1601 }
1607 1602
1608 \@paths 1603 \@paths
1609} 1604}
1610 1605
… …
1685 1680
1686=item $player_object->enter_link 1681=item $player_object->enter_link
1687 1682
1688Freezes the player and moves him/her to a special map (C<{link}>). 1683Freezes the player and moves him/her to a special map (C<{link}>).
1689 1684
1690The player should be reaosnably safe there for short amounts of time. You 1685The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1686I<MUST> call C<leave_link> as soon as possible, though.
1692 1687
1688Will never block.
1689
1693=item $player_object->leave_link ($map, $x, $y) 1690=item $player_object->leave_link ($map, $x, $y)
1694 1691
1695Moves the player out of the specila link map onto the given map. If the 1692Moves 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 1693map. 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, 1694to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1695fails, to the emergency map position.
1699 1696
1700Might block. 1697Might block.
1701 1698
1702=cut 1699=cut
1700
1701sub link_map {
1702 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1705 $LINK_MAP->load;
1706 }
1707
1708 $LINK_MAP
1709}
1703 1710
1704sub cf::object::player::enter_link { 1711sub cf::object::player::enter_link {
1705 my ($self) = @_; 1712 my ($self) = @_;
1706 1713
1707 $self->deactivate_recursive; 1714 $self->deactivate_recursive;
1708 1715
1709 return if $self->map == $LINK_MAP; 1716 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1717
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1719 if $self->map;
1713 1720
1714 $self->enter_map ($LINK_MAP, 20, 20); 1721 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1722}
1716 1723
1717sub cf::object::player::leave_link { 1724sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1725 my ($self, $map, $x, $y) = @_;
1719 1726
… …
1783=cut 1790=cut
1784 1791
1785sub cf::object::player::goto { 1792sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1793 my ($self, $path, $x, $y) = @_;
1787 1794
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1795 $self->enter_link;
1791 1796
1792 (async { 1797 (async {
1793 my $map = cf::map::find $path->as_string; 1798 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1799 $map = $map->customise_for ($self) if $map;
1795 1800
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1801# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1802# if $map;
1798 1803
… …
1808 1813
1809sub parse_random_map_params { 1814sub parse_random_map_params {
1810 my ($spec) = @_; 1815 my ($spec) = @_;
1811 1816
1812 my $rmp = { # defaults 1817 my $rmp = { # defaults
1813 xsize => 10, 1818 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1819 ysize => (cf::rndm 15, 40),
1820 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1821 #layout => string,
1815 }; 1822 };
1816 1823
1817 for (split /\n/, $spec) { 1824 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1825 my ($k, $v) = split /\s+/, $_, 2;
1819 1826
… …
1823 $rmp 1830 $rmp
1824} 1831}
1825 1832
1826sub prepare_random_map { 1833sub prepare_random_map {
1827 my ($exit) = @_; 1834 my ($exit) = @_;
1835
1836 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1837
1829 # all this does is basically replace the /! path by 1838 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1839 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1840 # that depends on the exit object
1832 1841
… …
1841 1850
1842 $rmp->{random_seed} ||= $exit->random_seed; 1851 $rmp->{random_seed} ||= $exit->random_seed;
1843 1852
1844 my $data = cf::to_json $rmp; 1853 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1854 my $md5 = Digest::MD5::md5_hex $data;
1855 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1856
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1857 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 1858 aio_write $fh, 0, (length $data), $data, 0;
1859 undef $fh;
1860 aio_rename "$meta~", $meta;
1849 1861
1850 $exit->slaying ("?random/$md5"); 1862 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1863 $exit->msg (undef);
1852 } 1864 }
1853} 1865}
… …
1863 $self->deactivate_recursive; # just to be sure 1875 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1876 unless (eval {
1865 prepare_random_map $exit 1877 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1878 if $exit->slaying eq "/!";
1867 1879
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1880 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1882
1871 1; 1883 1;
1872 }) { 1884 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1885 $self->message ("Something went wrong deep within the crossfire server. "
… …
2163 sub db_sync() { 2175 sub db_sync() {
2164 db_save if $dirty; 2176 db_save if $dirty;
2165 undef $dirty; 2177 undef $dirty;
2166 } 2178 }
2167 2179
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2169 db_sync; 2181 db_sync;
2170 }); 2182 });
2171 2183
2172 sub db_dirty() { 2184 sub db_dirty() {
2173 $dirty = 1; 2185 $dirty = 1;
… …
2223 2235
2224sub main { 2236sub main {
2225 # we must not ever block the main coroutine 2237 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2238 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2239 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2240 (async {
2228 async { Event::one_event }; 2241 Event::one_event;
2242 })->prio (Coro::PRIO_MAX);
2229 }; 2243 };
2230 2244
2231 cfg_load; 2245 cfg_load;
2232 db_load; 2246 db_load;
2233 load_extensions; 2247 load_extensions;
2248
2249 $TICK_WATCHER->start;
2234 Event::loop; 2250 Event::loop;
2235} 2251}
2236 2252
2237############################################################################# 2253#############################################################################
2238# initialisation and cleanup 2254# initialisation and cleanup
… …
2256 warn "enter emergency perl save\n"; 2272 warn "enter emergency perl save\n";
2257 2273
2258 cf::sync_job { 2274 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2275 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2276 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2277 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2278 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2279 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2280 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2281 $pl->valid or next;
2266 $pl->save; 2282 $pl->save;
… …
2280} 2296}
2281 2297
2282sub reload() { 2298sub reload() {
2283 # can/must only be called in main 2299 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2300 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2301 warn "can only reload from main coroutine";
2286 return; 2302 return;
2287 } 2303 }
2288 2304
2289 warn "reloading..."; 2305 warn "reloading...";
2290 2306
2291 warn "freezing server"; 2307 warn "cancelling server ticker";
2292 my $guard = freeze_mainloop; 2308 $TICK_WATCHER->cancel;
2309
2293 cf::emergency_save; 2310 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298 2311
2299 eval { 2312 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 2313 # if anything goes wrong in here, we should simply crash as we already saved
2301 2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317
2302 warn "cancel all watchers"; 2318 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2319 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2320 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2321 }
2306 2322
2323 warn "flushing outstanding aio requests";
2324 for (;;) {
2325 IO::AIO::flush;
2326 Coro::cede;
2327 last unless IO::AIO::nreqs;
2328 warn "iterate...";
2329 }
2330
2307 warn "cancel all extension coros"; 2331 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2333 %EXT_CORO = ();
2310 2334
2311 warn "remove commands"; 2335 warn "removing commands";
2312 %COMMAND = (); 2336 %COMMAND = ();
2313 2337
2314 warn "remove ext commands"; 2338 warn "removing ext commands";
2315 %EXTCMD = (); 2339 %EXTCMD = ();
2316 2340
2317 warn "unload/nuke all extensions"; 2341 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2342 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2343 warn "... unloading $pkg";
2320 2344
2321 if (my $cb = $pkg->can ("unload")) { 2345 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2346 eval {
2323 $cb->($pkg); 2347 $cb->($pkg);
2324 1 2348 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2349 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2350 }
2327 2351
2352 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2353 Symbol::delete_package $pkg;
2329 } 2354 }
2330 2355
2331 warn "unload all perl modules loaded from $LIBDIR"; 2356 warn "unloading all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2334 2359
2335 warn "removing <$k>"; 2360 warn "... unloading $k";
2336 delete $INC{$k}; 2361 delete $INC{$k};
2337 2362
2338 $k =~ s/\.pm$//; 2363 $k =~ s/\.pm$//;
2339 $k =~ s/\//::/g; 2364 $k =~ s/\//::/g;
2340 2365
… …
2343 } 2368 }
2344 2369
2345 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2346 } 2371 }
2347 2372
2348 warn "get rid of safe::, as good as possible"; 2373 warn "getting rid of safe::, as good as possible";
2349 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2351 2376
2352 warn "unload cf.pm \"a bit\""; 2377 warn "unloading cf.pm \"a bit\"";
2353 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2354 2379
2355 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2356 # and global variables created in xs 2381 # and global variables created in xs
2357 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2358 2383
2384 warn "unload completed, starting to reload now";
2385
2359 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2360 require cf; 2387 require cf;
2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2362 2389
2363 warn "load config and database again"; 2390 warn "loading config and database again";
2364 cf::cfg_load; 2391 cf::cfg_load;
2365 cf::db_load; 2392 cf::db_load;
2366 2393
2367 warn "load extensions"; 2394 warn "loading extensions";
2368 cf::load_extensions; 2395 cf::load_extensions;
2369 2396
2370 warn "reattach attachments to objects/players"; 2397 warn "reattaching attachments to objects/players";
2371 _global_reattach; 2398 _global_reattach;
2372 warn "reattach attachments to maps"; 2399 warn "reattaching attachments to maps";
2373 reattach $_ for values %MAP; 2400 reattach $_ for values %MAP;
2401
2402 warn "restarting server ticker";
2403
2404 $TICK_WATCHER->start;
2374 }; 2405 };
2375 2406
2376 if ($@) { 2407 if ($@) {
2377 warn $@; 2408 warn $@;
2378 warn "error while reloading, exiting."; 2409 warn "error while reloading, exiting.";
… …
2380 } 2411 }
2381 2412
2382 warn "reloaded"; 2413 warn "reloaded";
2383}; 2414};
2384 2415
2385############################################################################# 2416our $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 2417
2428register_command "reload" => sub { 2418register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2419 my ($who, $arg) = @_;
2430 2420
2431 if ($who->flag (FLAG_WIZ)) { 2421 if ($who->flag (FLAG_WIZ)) {
2432 $who->message ("start of reload."); 2422 $who->message ("reloading server.");
2423
2424 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here.
2426
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2433 reload; 2428 reload;
2434 $who->message ("end of reload."); 2429 undef $RELOAD_WATCHER;
2430 });
2435 } 2431 }
2436}; 2432};
2437 2433
2438unshift @INC, $LIBDIR; 2434unshift @INC, $LIBDIR;
2435
2436my $bug_warning = 0;
2439 2437
2440$TICK_WATCHER = Event->timer ( 2438$TICK_WATCHER = Event->timer (
2441 reentrant => 0, 2439 reentrant => 0,
2440 parked => 1,
2442 prio => 0, 2441 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2442 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2443 data => WF_AUTOCANCEL,
2445 cb => sub { 2444 cb => sub {
2445 if ($Coro::current != $Coro::main) {
2446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2447 unless ++$bug_warning > 10;
2448 return;
2449 }
2450
2451 $NOW = Event::time;
2452
2446 cf::server_tick; # one server iteration 2453 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2454 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2455 $NEXT_TICK += $TICK;
2449 2456
2450 $WAIT_FOR_TICK->broadcast; 2457 $WAIT_FOR_TICK->broadcast;
… …
2458 }, 2465 },
2459); 2466);
2460 2467
2461IO::AIO::max_poll_time $TICK * 0.2; 2468IO::AIO::max_poll_time $TICK * 0.2;
2462 2469
2463Event->io ( 2470$AIO_POLL_WATCHER = Event->io (
2464 fd => IO::AIO::poll_fileno, 2471 fd => IO::AIO::poll_fileno,
2465 poll => 'r', 2472 poll => 'r',
2466 prio => 5, 2473 prio => 5,
2467 data => WF_AUTOCANCEL, 2474 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb, 2475 cb => \&IO::AIO::poll_cb,
2469); 2476);
2470 2477
2471Event->timer ( 2478$WRITE_RUNTIME_WATCHER = Event->timer (
2472 data => WF_AUTOCANCEL, 2479 data => WF_AUTOCANCEL,
2473 after => 0, 2480 after => 1,
2474 interval => 10, 2481 interval => 10,
2475 cb => sub { 2482 cb => Coro::unblock_sub {
2476 (Coro::unblock_sub {
2477 write_runtime 2483 write_runtime
2478 or warn "ERROR: unable to write runtime file: $!"; 2484 or warn "ERROR: unable to write runtime file: $!";
2479 })->();
2480 }, 2485 },
2481); 2486);
2482 2487
2483END { cf::emergency_save } 2488END { cf::emergency_save }
2484 2489

Diff Legend

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