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.160 by root, Wed Jan 10 22:54:06 2007 UTC vs.
Revision 1.187 by root, Sat Jan 20 21:06: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 }
… …
341 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
342 350
343 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
344 or return; 352 or return;
345 353
354 my $value = $cf::RUNTIME + 90 + 10;
346 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
347 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
348 and return; 359 and return;
349 360
350 aio_fsync $fh 361 aio_fsync $fh
351 and return; 362 and return;
… …
360} 371}
361 372
362=back 373=back
363 374
364=cut 375=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 376
493############################################################################# 377#############################################################################
494 378
495=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
496 380
… …
622our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 507our @CB_MAP = ();
624 508
625my %attachment; 509my %attachment;
626 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
627sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
629 519
630 use sort 'stable'; 520 use sort 'stable';
631 521
… …
802# object support 692# object support
803 693
804sub reattach { 694sub reattach {
805 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 699
808 my $registry = $obj->registry; 700 my $registry = $obj->registry;
809 701
810 @$registry = (); 702 @$registry = ();
811 703
… …
998 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 893 . "\n};\n1";
1002 894
1003 eval $source 895 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
1006 905
1007 push @EXTS, $pkg; 906 push @EXTS, $pkg;
1008} 907}
1009 908
1010sub load_extensions { 909sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1017 } 916 }
1018} 917}
1019 918
1020############################################################################# 919#############################################################################
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 920
1036=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1037 922
1038Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1039 924
… …
1075 960
1076sub exists($) { 961sub exists($) {
1077 my ($login) = @_; 962 my ($login) = @_;
1078 963
1079 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1081} 966}
1082 967
1083sub find($) { 968sub find($) {
1084 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0]; 970 my $login = $_[0];
… …
1175 \@logins 1060 \@logins
1176} 1061}
1177 1062
1178=item $player->maps 1063=item $player->maps
1179 1064
1180Returns an arrayref of cf::path's of all maps that are private for this 1065Returns an arrayref of map paths that are private for this
1181player. May block. 1066player. May block.
1182 1067
1183=cut 1068=cut
1184 1069
1185sub maps($) { 1070sub maps($) {
… …
1193 for (@$files) { 1078 for (@$files) {
1194 utf8::decode $_; 1079 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1197 1082
1083 s/\.map$//;
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1199 } 1085 }
1200 1086
1201 \@paths 1087 \@paths
1202} 1088}
1203 1089
… …
1229package cf::map; 1115package cf::map;
1230 1116
1231use Fcntl; 1117use Fcntl;
1232use Coro::AIO; 1118use Coro::AIO;
1233 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1234our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1236 1126
1237sub generate_random_map { 1127sub generate_random_map {
1238 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1130 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1139 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 )
1143}
1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1153sub register {
1154 my (undef, $regex, $prio) = @_;
1155 my $pkg = caller;
1156
1157 no strict;
1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1159
1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1161}
1162
1163# also paths starting with '/'
1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1177
1178sub normalise {
1179 my ($path, $base) = @_;
1180
1181 # map plan:
1182 #
1183 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths
1186 # ?random/... random maps
1187 # /... normal maps
1188 # ~user/... per-player map of a specific user
1189
1190 $path =~ s/$PATH_SEP/\//go;
1191
1192 # treat it as relative path if it starts with
1193 # something that looks reasonable
1194 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1195 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1196
1197 $base =~ s{[^/]+/?$}{};
1198 $path = "$base/$path";
1199 }
1200
1201 for ($path) {
1202 redo if s{//}{/};
1203 redo if s{/\.?/}{/};
1204 redo if s{/[^/]+/\.\./}{/};
1205 }
1206
1207 $path
1208}
1209
1210sub new_from_path {
1211 my (undef, $path, $base) = @_;
1212
1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1214
1215 $path = normalise $path, $base;
1216
1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1219 my $self = bless cf::map::new, $pkg;
1220 $self->{path} = $path; $self->path ($path);
1221 $self->init; # pass $1 etc.
1222 return $self;
1223 }
1224 }
1225
1226 Carp::carp "unable to resolve path '$path'.";
1227 ()
1228}
1229
1230sub init {
1231 my ($self) = @_;
1232
1233 $self
1234}
1235
1236sub as_string {
1237 my ($self) = @_;
1238
1239 "$self->{path}"
1240}
1241
1242# the displayed name, this is a one way mapping
1243sub visible_name {
1244 &as_string
1245}
1246
1247# the original (read-only) location
1248sub load_path {
1249 my ($self) = @_;
1250
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1252}
1253
1254# the temporary/swap location
1255sub save_path {
1256 my ($self) = @_;
1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1260}
1261
1262# the unique path, undef == no special unique path
1263sub uniq_path {
1264 my ($self) = @_;
1265
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1268}
1255 1269
1256# and all this just because we cannot iterate over 1270# and all this just because we cannot iterate over
1257# all maps in C++... 1271# all maps in C++...
1258sub change_all_map_light { 1272sub change_all_map_light {
… …
1260 1274
1261 $_->change_map_light ($change) 1275 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1276 for grep $_->outdoor, values %cf::MAP;
1263} 1277}
1264 1278
1279sub unlink_save {
1280 my ($self) = @_;
1281
1282 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1285}
1286
1265sub try_load_header($) { 1287sub load_header_from($) {
1266 my ($path) = @_; 1288 my ($self, $path) = @_;
1267 1289
1268 utf8::encode $path; 1290 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1291 aio_open $path, O_RDONLY, 0
1270 or return; 1292 or return;
1271 1293
1272 my $map = cf::map::new 1294 $self->_load_header ($path)
1273 or return; 1295 or return;
1274 1296
1275 # for better error messages only, will be overwritten 1297 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1298
1278 $map->load_header ($path) 1299 1
1300}
1301
1302sub load_orig {
1303 my ($self) = @_;
1304
1305 $self->load_header_from ($self->load_path)
1306}
1307
1308sub load_temp {
1309 my ($self) = @_;
1310
1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub load_header {
1315 my ($self) = @_;
1316
1317 if ($self->load_temp) {
1318 $self->last_access ((delete $self->{last_access})
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else {
1324 $self->load_orig
1279 or return; 1325 or return;
1280 1326
1281 $map->{load_path} = $path; 1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 }
1282 1332
1283 $map 1333 1
1284} 1334}
1285 1335
1286sub find; 1336sub find;
1287sub find { 1337sub find {
1288 my ($path, $origin) = @_; 1338 my ($path, $origin) = @_;
1289 1339
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1340 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1341
1295 cf::lock_wait "map_find:$key"; 1342 cf::lock_wait "map_find:$path";
1296 1343
1297 $cf::MAP{$key} || do { 1344 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1345 my $guard = cf::lock_acquire "map_find:$path";
1299 1346 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; 1347 or return;
1319 1348
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; 1349 $map->{last_save} = $cf::RUNTIME;
1332 1350
1333 Coro::cede; 1351 $map->load_header
1352 or return;
1334 1353
1335 if ($map->should_reset) { 1354 if ($map->should_reset) {
1355 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1357 $map->reset;
1337 undef $guard; 1358 undef $guard;
1338 $map = find $path 1359 $map = find $path
1339 or return; 1360 or return;
1340 } 1361 }
1341 1362
1342 $cf::MAP{$key} = $map 1363 $cf::MAP{$path} = $map
1343 } 1364 }
1344} 1365}
1345 1366
1346sub load { 1367sub load {
1347 my ($self) = @_; 1368 my ($self) = @_;
1348 1369
1349 my $path = $self->{path}; 1370 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1371 my $guard = cf::lock_acquire "map_load:$path";
1351 1372
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1373 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1374
1354 $self->in_memory (cf::MAP_LOADING); 1375 $self->in_memory (cf::MAP_LOADING);
1355 1376
1356 $self->alloc; 1377 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1378 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1379 or return;
1359 1380
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1382 if delete $self->{load_original};
1362 1383
1363 if (my $uniq = $path->uniq_path) { 1384 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1385 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1386 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1387 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1388 $self->_load_objects ($uniq, 0);
1368 } 1389 }
1369 } 1390 }
1370 1391
1371 Coro::cede; 1392 Coro::cede;
1372 1393
1373 # now do the right thing for maps 1394 # now do the right thing for maps
1374 $self->link_multipart_objects; 1395 $self->link_multipart_objects;
1375 1396
1376 if ($self->{path}->is_style_map) { 1397 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1398 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1399 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1400 $self->update_buttons;
1401 Coro::cede;
1383 $self->set_darkness_map; 1402 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1403 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1404 unless $self->difficulty;
1405 Coro::cede;
1386 $self->activate; 1406 $self->activate;
1387 } 1407 }
1388 1408
1389 Coro::cede;
1390
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1409 $self->in_memory (cf::MAP_IN_MEMORY);
1410}
1411
1412sub customise_for {
1413 my ($self, $ob) = @_;
1414
1415 return find "~" . $ob->name . "/" . $self->{path}
1416 if $self->per_player;
1417
1418 $self
1392} 1419}
1393 1420
1394# find and load all maps in the 3x3 area around a map 1421# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1422sub load_diag {
1396 my ($map) = @_; 1423 my ($map) = @_;
… …
1426 1453
1427 cf::sync_job { $map->load }; 1454 cf::sync_job { $map->load };
1428} 1455}
1429 1456
1430our %MAP_PREFETCH; 1457our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1458our $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 1459
1446sub find_async { 1460sub find_async {
1447 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1448 1462
1449 $path = new cf::path $path, $origin && $origin->path; 1463 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1464
1452 if (my $map = $cf::MAP{$key}) { 1465 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1467 }
1455 1468
1456 $MAP_PREFETCH{$key} = $path; 1469 undef $MAP_PREFETCH{$path};
1457 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER ||= cf::async {
1471 while (%MAP_PREFETCH) {
1472 for my $path (keys %MAP_PREFETCH) {
1473 my $map = find $path
1474 or next;
1475 $map->load;
1476
1477 delete $MAP_PREFETCH{$path};
1478 }
1479 }
1480 undef $MAP_PREFETCHER;
1481 };
1458 1482
1459 () 1483 ()
1460} 1484}
1461 1485
1462sub save { 1486sub save {
… …
1466 1490
1467 $self->{last_save} = $cf::RUNTIME; 1491 $self->{last_save} = $cf::RUNTIME;
1468 1492
1469 return unless $self->dirty; 1493 return unless $self->dirty;
1470 1494
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1495 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1496 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1497
1474 $self->{load_path} = $save; 1498 $self->{load_path} = $save;
1475 1499
1476 return if $self->{deny_save}; 1500 return if $self->{deny_save};
1477 1501
… …
1480 cf::async { 1504 cf::async {
1481 $_->contr->save for $self->players; 1505 $_->contr->save for $self->players;
1482 }; 1506 };
1483 1507
1484 if ($uniq) { 1508 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1509 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1510 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1511 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1512 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1513 }
1490} 1514}
1491 1515
1492sub swap_out { 1516sub swap_out {
1493 my ($self) = @_; 1517 my ($self) = @_;
… …
1507 1531
1508sub reset_at { 1532sub reset_at {
1509 my ($self) = @_; 1533 my ($self) = @_;
1510 1534
1511 # TODO: safety, remove and allow resettable per-player maps 1535 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1536 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1537 return 1e99 if $self->{deny_reset};
1514 1538
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1541
… …
1522 my ($self) = @_; 1546 my ($self) = @_;
1523 1547
1524 $self->reset_at <= $cf::RUNTIME 1548 $self->reset_at <= $cf::RUNTIME
1525} 1549}
1526 1550
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 { 1551sub reset {
1549 my ($self) = @_; 1552 my ($self) = @_;
1550 1553
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1554 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1555
1553 return if $self->players; 1556 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1557 return if $self->isa ("ext::map_per_player");#d#
1555 1558
1556 warn "resetting map ", $self->path;#d# 1559 warn "resetting map ", $self->path;#d#
1557 1560
1558 delete $cf::MAP{$self->path}; 1561 delete $cf::MAP{$self->path};
1562
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear;
1559 1565
1560 $_->clear_links_to ($self) for values %cf::MAP; 1566 $_->clear_links_to ($self) for values %cf::MAP;
1561 1567
1562 $self->unlink_save; 1568 $self->unlink_save;
1563 $self->destroy; 1569 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1572my $nuke_counter = "aaaa";
1567 1573
1568sub nuke { 1574sub nuke {
1569 my ($self) = @_; 1575 my ($self) = @_;
1570 1576
1577 delete $cf::MAP{$self->path};
1578
1579 $self->unlink_save;
1580
1581 bless $self, "cf::map";
1582 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1583 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1584 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1585 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1586
1587 $cf::MAP{$self->path} = $self;
1588
1574 $self->reset; # polite request, might not happen 1589 $self->reset; # polite request, might not happen
1575} 1590}
1576 1591
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 1592=item cf::map::unique_maps
1588 1593
1589Returns an arrayref of cf::path's of all shared maps that have 1594Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1595instantiated unique items. May block.
1591 1596
1592=cut 1597=cut
1593 1598
1594sub unique_maps() { 1599sub unique_maps() {
… …
1600 for (@$files) { 1605 for (@$files) {
1601 utf8::decode $_; 1606 utf8::decode $_;
1602 next if /\.pst$/; 1607 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1608 next unless /^$PATH_SEP/o;
1604 1609
1610 s/\.map$//;
1605 push @paths, new cf::path $_; 1611 push @paths, $_;
1606 } 1612 }
1607 1613
1608 \@paths 1614 \@paths
1609} 1615}
1610 1616
… …
1685 1691
1686=item $player_object->enter_link 1692=item $player_object->enter_link
1687 1693
1688Freezes the player and moves him/her to a special map (C<{link}>). 1694Freezes the player and moves him/her to a special map (C<{link}>).
1689 1695
1690The player should be reaosnably safe there for short amounts of time. You 1696The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1697I<MUST> call C<leave_link> as soon as possible, though.
1692 1698
1699Will never block.
1700
1693=item $player_object->leave_link ($map, $x, $y) 1701=item $player_object->leave_link ($map, $x, $y)
1694 1702
1695Moves the player out of the specila link map onto the given map. If the 1703Moves 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 1704map. 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, 1705to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1706fails, to the emergency map position.
1699 1707
1700Might block. 1708Might block.
1701 1709
1702=cut 1710=cut
1711
1712sub link_map {
1713 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1716 $LINK_MAP->load;
1717 }
1718
1719 $LINK_MAP
1720}
1703 1721
1704sub cf::object::player::enter_link { 1722sub cf::object::player::enter_link {
1705 my ($self) = @_; 1723 my ($self) = @_;
1706 1724
1707 $self->deactivate_recursive; 1725 $self->deactivate_recursive;
1708 1726
1709 return if $self->map == $LINK_MAP; 1727 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1728
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1730 if $self->map;
1713 1731
1714 $self->enter_map ($LINK_MAP, 20, 20); 1732 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1733}
1716 1734
1717sub cf::object::player::leave_link { 1735sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1736 my ($self, $map, $x, $y) = @_;
1719 1737
… …
1783=cut 1801=cut
1784 1802
1785sub cf::object::player::goto { 1803sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1804 my ($self, $path, $x, $y) = @_;
1787 1805
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1806 $self->enter_link;
1791 1807
1792 (async { 1808 (async {
1793 my $map = cf::map::find $path->as_string; 1809 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1810 $map = $map->customise_for ($self) if $map;
1795 1811
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1812# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1813# if $map;
1798 1814
… …
1808 1824
1809sub parse_random_map_params { 1825sub parse_random_map_params {
1810 my ($spec) = @_; 1826 my ($spec) = @_;
1811 1827
1812 my $rmp = { # defaults 1828 my $rmp = { # defaults
1813 xsize => 10, 1829 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1830 ysize => (cf::rndm 15, 40),
1831 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1832 #layout => string,
1815 }; 1833 };
1816 1834
1817 for (split /\n/, $spec) { 1835 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1836 my ($k, $v) = split /\s+/, $_, 2;
1819 1837
… …
1823 $rmp 1841 $rmp
1824} 1842}
1825 1843
1826sub prepare_random_map { 1844sub prepare_random_map {
1827 my ($exit) = @_; 1845 my ($exit) = @_;
1846
1847 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1848
1829 # all this does is basically replace the /! path by 1849 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1850 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1851 # that depends on the exit object
1832 1852
… …
1841 1861
1842 $rmp->{random_seed} ||= $exit->random_seed; 1862 $rmp->{random_seed} ||= $exit->random_seed;
1843 1863
1844 my $data = cf::to_json $rmp; 1864 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1865 my $md5 = Digest::MD5::md5_hex $data;
1866 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1867
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1868 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 1869 aio_write $fh, 0, (length $data), $data, 0;
1870 undef $fh;
1871 aio_rename "$meta~", $meta;
1849 1872
1850 $exit->slaying ("?random/$md5"); 1873 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1874 $exit->msg (undef);
1852 } 1875 }
1853} 1876}
… …
1863 $self->deactivate_recursive; # just to be sure 1886 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1887 unless (eval {
1865 prepare_random_map $exit 1888 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1889 if $exit->slaying eq "/!";
1867 1890
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1891 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1892 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1893
1871 1; 1894 1;
1872 }) { 1895 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1896 $self->message ("Something went wrong deep within the crossfire server. "
… …
2163 sub db_sync() { 2186 sub db_sync() {
2164 db_save if $dirty; 2187 db_save if $dirty;
2165 undef $dirty; 2188 undef $dirty;
2166 } 2189 }
2167 2190
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2169 db_sync; 2192 db_sync;
2170 }); 2193 });
2171 2194
2172 sub db_dirty() { 2195 sub db_dirty() {
2173 $dirty = 1; 2196 $dirty = 1;
… …
2223 2246
2224sub main { 2247sub main {
2225 # we must not ever block the main coroutine 2248 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2249 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2250 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2251 (async {
2228 async { Event::one_event }; 2252 Event::one_event;
2253 })->prio (Coro::PRIO_MAX);
2229 }; 2254 };
2230 2255
2231 cfg_load; 2256 cfg_load;
2232 db_load; 2257 db_load;
2233 load_extensions; 2258 load_extensions;
2259
2260 $TICK_WATCHER->start;
2234 Event::loop; 2261 Event::loop;
2235} 2262}
2236 2263
2237############################################################################# 2264#############################################################################
2238# initialisation and cleanup 2265# initialisation and cleanup
… …
2256 warn "enter emergency perl save\n"; 2283 warn "enter emergency perl save\n";
2257 2284
2258 cf::sync_job { 2285 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2286 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2287 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2288 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2289 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2290 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2291 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2292 $pl->valid or next;
2266 $pl->save; 2293 $pl->save;
… …
2280} 2307}
2281 2308
2282sub reload() { 2309sub reload() {
2283 # can/must only be called in main 2310 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine";
2286 return; 2313 return;
2287 } 2314 }
2288 2315
2289 warn "reloading..."; 2316 warn "reloading...";
2290 2317
2291 warn "freezing server"; 2318 warn "cancelling server ticker";
2292 my $guard = freeze_mainloop; 2319 $TICK_WATCHER->cancel;
2320
2293 cf::emergency_save; 2321 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298 2322
2299 eval { 2323 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2301 2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328
2302 warn "cancel all watchers"; 2329 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2330 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2331 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2332 }
2306 2333
2334 warn "flushing outstanding aio requests";
2335 for (;;) {
2336 IO::AIO::flush;
2337 Coro::cede;
2338 last unless IO::AIO::nreqs;
2339 warn "iterate...";
2340 }
2341
2307 warn "cancel all extension coros"; 2342 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2343 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2344 %EXT_CORO = ();
2310 2345
2311 warn "remove commands"; 2346 warn "removing commands";
2312 %COMMAND = (); 2347 %COMMAND = ();
2313 2348
2314 warn "remove ext commands"; 2349 warn "removing ext commands";
2315 %EXTCMD = (); 2350 %EXTCMD = ();
2316 2351
2317 warn "unload/nuke all extensions"; 2352 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2353 for my $pkg (@EXTS) {
2319 warn "... unloading $pkg"; 2354 warn "... unloading $pkg";
2320 2355
2321 if (my $cb = $pkg->can ("unload")) { 2356 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2357 eval {
… …
2327 2362
2328 warn "... nuking $pkg"; 2363 warn "... nuking $pkg";
2329 Symbol::delete_package $pkg; 2364 Symbol::delete_package $pkg;
2330 } 2365 }
2331 2366
2332 warn "unload all perl modules loaded from $LIBDIR"; 2367 warn "unloading all perl modules loaded from $LIBDIR";
2333 while (my ($k, $v) = each %INC) { 2368 while (my ($k, $v) = each %INC) {
2334 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2369 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2335 2370
2336 warn "removing <$k>"; 2371 warn "... unloading $k";
2337 delete $INC{$k}; 2372 delete $INC{$k};
2338 2373
2339 $k =~ s/\.pm$//; 2374 $k =~ s/\.pm$//;
2340 $k =~ s/\//::/g; 2375 $k =~ s/\//::/g;
2341 2376
… …
2344 } 2379 }
2345 2380
2346 Symbol::delete_package $k; 2381 Symbol::delete_package $k;
2347 } 2382 }
2348 2383
2349 warn "get rid of safe::, as good as possible"; 2384 warn "getting rid of safe::, as good as possible";
2350 Symbol::delete_package "safe::$_" 2385 Symbol::delete_package "safe::$_"
2351 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2386 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2352 2387
2353 warn "unload cf.pm \"a bit\""; 2388 warn "unloading cf.pm \"a bit\"";
2354 delete $INC{"cf.pm"}; 2389 delete $INC{"cf.pm"};
2355 2390
2356 # don't, removes xs symbols, too, 2391 # don't, removes xs symbols, too,
2357 # and global variables created in xs 2392 # and global variables created in xs
2358 #Symbol::delete_package __PACKAGE__; 2393 #Symbol::delete_package __PACKAGE__;
2359 2394
2395 warn "unload completed, starting to reload now";
2396
2360 warn "reloading cf.pm"; 2397 warn "reloading cf.pm";
2361 require cf; 2398 require cf;
2362 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2363 2400
2364 warn "load config and database again"; 2401 warn "loading config and database again";
2365 cf::cfg_load; 2402 cf::cfg_load;
2366 cf::db_load; 2403 cf::db_load;
2367 2404
2368 warn "load extensions"; 2405 warn "loading extensions";
2369 cf::load_extensions; 2406 cf::load_extensions;
2370 2407
2371 warn "reattach attachments to objects/players"; 2408 warn "reattaching attachments to objects/players";
2372 _global_reattach; 2409 _global_reattach;
2373 warn "reattach attachments to maps"; 2410 warn "reattaching attachments to maps";
2374 reattach $_ for values %MAP; 2411 reattach $_ for values %MAP;
2412
2413 warn "restarting server ticker";
2414
2415 $TICK_WATCHER->start;
2375 }; 2416 };
2376 2417
2377 if ($@) { 2418 if ($@) {
2378 warn $@; 2419 warn $@;
2379 warn "error while reloading, exiting."; 2420 warn "error while reloading, exiting.";
… …
2381 } 2422 }
2382 2423
2383 warn "reloaded"; 2424 warn "reloaded";
2384}; 2425};
2385 2426
2386############################################################################# 2427our $RELOAD_WATCHER; # used only during reload
2387
2388unless ($LINK_MAP) {
2389 $LINK_MAP = cf::map::new;
2390
2391 $LINK_MAP->width (41);
2392 $LINK_MAP->height (41);
2393 $LINK_MAP->alloc;
2394 $LINK_MAP->path ("{link}");
2395 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2396 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2397
2398 # dirty hack because... archetypes are not yet loaded
2399 Event->timer (
2400 after => 10,
2401 cb => sub {
2402 $_[0]->w->cancel;
2403
2404 # provide some exits "home"
2405 my $exit = cf::object::new "exit";
2406
2407 $exit->slaying ($EMERGENCY_POSITION->[0]);
2408 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2409 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2410
2411 $LINK_MAP->insert ($exit->clone, 19, 19);
2412 $LINK_MAP->insert ($exit->clone, 19, 20);
2413 $LINK_MAP->insert ($exit->clone, 19, 21);
2414 $LINK_MAP->insert ($exit->clone, 20, 19);
2415 $LINK_MAP->insert ($exit->clone, 20, 21);
2416 $LINK_MAP->insert ($exit->clone, 21, 19);
2417 $LINK_MAP->insert ($exit->clone, 21, 20);
2418 $LINK_MAP->insert ($exit->clone, 21, 21);
2419
2420 $exit->destroy;
2421 });
2422
2423 $LINK_MAP->{deny_save} = 1;
2424 $LINK_MAP->{deny_reset} = 1;
2425
2426 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2427}
2428 2428
2429register_command "reload" => sub { 2429register_command "reload" => sub {
2430 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2431 2431
2432 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2433 $who->message ("start of reload."); 2433 $who->message ("reloading server.");
2434
2435 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here.
2437
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2434 reload; 2439 reload;
2435 $who->message ("end of reload."); 2440 undef $RELOAD_WATCHER;
2441 });
2436 } 2442 }
2437}; 2443};
2438 2444
2439unshift @INC, $LIBDIR; 2445unshift @INC, $LIBDIR;
2446
2447my $bug_warning = 0;
2440 2448
2441$TICK_WATCHER = Event->timer ( 2449$TICK_WATCHER = Event->timer (
2442 reentrant => 0, 2450 reentrant => 0,
2451 parked => 1,
2443 prio => 0, 2452 prio => 0,
2444 at => $NEXT_TICK || $TICK, 2453 at => $NEXT_TICK || $TICK,
2445 data => WF_AUTOCANCEL, 2454 data => WF_AUTOCANCEL,
2446 cb => sub { 2455 cb => sub {
2456 if ($Coro::current != $Coro::main) {
2457 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2458 unless ++$bug_warning > 10;
2459 return;
2460 }
2461
2462 $NOW = Event::time;
2463
2447 cf::server_tick; # one server iteration 2464 cf::server_tick; # one server iteration
2448 $RUNTIME += $TICK; 2465 $RUNTIME += $TICK;
2449 $NEXT_TICK += $TICK; 2466 $NEXT_TICK += $TICK;
2450 2467
2451 $WAIT_FOR_TICK->broadcast; 2468 $WAIT_FOR_TICK->broadcast;
… …
2459 }, 2476 },
2460); 2477);
2461 2478
2462IO::AIO::max_poll_time $TICK * 0.2; 2479IO::AIO::max_poll_time $TICK * 0.2;
2463 2480
2464Event->io ( 2481$AIO_POLL_WATCHER = Event->io (
2465 fd => IO::AIO::poll_fileno, 2482 fd => IO::AIO::poll_fileno,
2466 poll => 'r', 2483 poll => 'r',
2467 prio => 5, 2484 prio => 5,
2468 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2469 cb => \&IO::AIO::poll_cb, 2486 cb => \&IO::AIO::poll_cb,
2470); 2487);
2471 2488
2472Event->timer ( 2489$WRITE_RUNTIME_WATCHER = Event->timer (
2473 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2474 after => 0, 2491 after => 1,
2475 interval => 10, 2492 interval => 10,
2476 cb => sub { 2493 prio => 6, # keep it lowest so it acts like a watchdog
2477 (Coro::unblock_sub { 2494 cb => Coro::unblock_sub {
2478 write_runtime 2495 write_runtime
2479 or warn "ERROR: unable to write runtime file: $!"; 2496 or warn "ERROR: unable to write runtime file: $!";
2480 })->();
2481 }, 2497 },
2482); 2498);
2483 2499
2484END { cf::emergency_save } 2500END { cf::emergency_save }
2485 2501

Diff Legend

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