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.191 by root, Tue Jan 23 01:05:18 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_header_orig {
1303 my ($self) = @_;
1304
1305 $self->load_header_from ($self->load_path)
1306}
1307
1308sub load_header_temp {
1309 my ($self) = @_;
1310
1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub prepare_temp {
1315 my ($self) = @_;
1316
1317 $self->last_access ((delete $self->{last_access})
1318 || $cf::RUNTIME); #d#
1319 # safety
1320 $self->{instantiate_time} = $cf::RUNTIME
1321 if $self->{instantiate_time} > $cf::RUNTIME;
1322}
1323
1324sub prepare_orig {
1325 my ($self) = @_;
1326
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331}
1332
1333sub load_header {
1334 my ($self) = @_;
1335
1336 if ($self->load_header_temp) {
1337 $self->prepare_temp;
1338 } else {
1339 $self->load_header_orig
1279 or return; 1340 or return;
1341 $self->prepare_orig;
1342 }
1280 1343
1281 $map->{load_path} = $path; 1344 1
1282
1283 $map
1284} 1345}
1285 1346
1286sub find; 1347sub find;
1287sub find { 1348sub find {
1288 my ($path, $origin) = @_; 1349 my ($path, $origin) = @_;
1289 1350
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1351 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1352
1295 cf::lock_wait "map_find:$key"; 1353 cf::lock_wait "map_find:$path";
1296 1354
1297 $cf::MAP{$key} || do { 1355 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1356 my $guard = cf::lock_acquire "map_find:$path";
1299 1357 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; 1358 or return;
1319 1359
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; 1360 $map->{last_save} = $cf::RUNTIME;
1332 1361
1333 Coro::cede; 1362 $map->load_header
1363 or return;
1334 1364
1335 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1368 $map->reset;
1337 undef $guard; 1369 undef $guard;
1338 $map = find $path 1370 $map = find $path
1339 or return; 1371 or return;
1340 } 1372 }
1341 1373
1342 $cf::MAP{$key} = $map 1374 $cf::MAP{$path} = $map
1343 } 1375 }
1344} 1376}
1377
1378sub pre_load { }
1379sub post_load { }
1345 1380
1346sub load { 1381sub load {
1347 my ($self) = @_; 1382 my ($self) = @_;
1348 1383
1349 my $path = $self->{path}; 1384 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1385 my $guard = cf::lock_acquire "map_load:$path";
1351 1386
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1388
1354 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1355 1390
1356 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1357 $self->load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1396 or return;
1359 1397
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1399 if delete $self->{load_original};
1362 1400
1363 if (my $uniq = $path->uniq_path) { 1401 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1402 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1403 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1404 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1405 $self->_load_objects ($uniq, 0);
1368 } 1406 }
1369 } 1407 }
1370 1408
1371 Coro::cede; 1409 Coro::cede;
1372 1410
1373 # now do the right thing for maps 1411 # now do the right thing for maps
1374 $self->link_multipart_objects; 1412 $self->link_multipart_objects;
1375 1413
1376 if ($self->{path}->is_style_map) { 1414 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1415 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1416 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1417 $self->update_buttons;
1418 Coro::cede;
1383 $self->set_darkness_map; 1419 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1420 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1421 unless $self->difficulty;
1422 Coro::cede;
1386 $self->activate; 1423 $self->activate;
1387 } 1424 }
1388 1425
1389 Coro::cede; 1426 $self->post_load;
1390 1427
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1429}
1430
1431sub customise_for {
1432 my ($self, $ob) = @_;
1433
1434 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player;
1436
1437 $self
1392} 1438}
1393 1439
1394# find and load all maps in the 3x3 area around a map 1440# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1441sub load_diag {
1396 my ($map) = @_; 1442 my ($map) = @_;
… …
1426 1472
1427 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1428} 1474}
1429 1475
1430our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1477our $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 1478
1446sub find_async { 1479sub find_async {
1447 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1448 1481
1449 $path = new cf::path $path, $origin && $origin->path; 1482 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1483
1452 if (my $map = $cf::MAP{$key}) { 1484 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1486 }
1455 1487
1456 $MAP_PREFETCH{$key} = $path; 1488 undef $MAP_PREFETCH{$path};
1489 $MAP_PREFETCHER ||= cf::async {
1490 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) {
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495
1496 delete $MAP_PREFETCH{$path};
1497 }
1498 }
1499 undef $MAP_PREFETCHER;
1500 };
1457 $MAP_PREFETCHER->ready; 1501 $MAP_PREFETCHER->prio (6);
1458 1502
1459 () 1503 ()
1460} 1504}
1461 1505
1462sub save { 1506sub save {
… …
1466 1510
1467 $self->{last_save} = $cf::RUNTIME; 1511 $self->{last_save} = $cf::RUNTIME;
1468 1512
1469 return unless $self->dirty; 1513 return unless $self->dirty;
1470 1514
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1515 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1516 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1517
1474 $self->{load_path} = $save; 1518 $self->{load_path} = $save;
1475 1519
1476 return if $self->{deny_save}; 1520 return if $self->{deny_save};
1477 1521
… …
1480 cf::async { 1524 cf::async {
1481 $_->contr->save for $self->players; 1525 $_->contr->save for $self->players;
1482 }; 1526 };
1483 1527
1484 if ($uniq) { 1528 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1529 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1530 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1531 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1532 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1533 }
1490} 1534}
1491 1535
1492sub swap_out { 1536sub swap_out {
1493 my ($self) = @_; 1537 my ($self) = @_;
… …
1507 1551
1508sub reset_at { 1552sub reset_at {
1509 my ($self) = @_; 1553 my ($self) = @_;
1510 1554
1511 # TODO: safety, remove and allow resettable per-player maps 1555 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1556 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1557 return 1e99 if $self->{deny_reset};
1514 1558
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1559 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1560 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1561
… …
1522 my ($self) = @_; 1566 my ($self) = @_;
1523 1567
1524 $self->reset_at <= $cf::RUNTIME 1568 $self->reset_at <= $cf::RUNTIME
1525} 1569}
1526 1570
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 { 1571sub reset {
1549 my ($self) = @_; 1572 my ($self) = @_;
1550 1573
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1574 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1575
1553 return if $self->players; 1576 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1577 return if $self->isa ("ext::map_per_player");#d#
1555 1578
1556 warn "resetting map ", $self->path;#d# 1579 warn "resetting map ", $self->path;#d#
1557 1580
1558 delete $cf::MAP{$self->path}; 1581 delete $cf::MAP{$self->path};
1582
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear;
1559 1585
1560 $_->clear_links_to ($self) for values %cf::MAP; 1586 $_->clear_links_to ($self) for values %cf::MAP;
1561 1587
1562 $self->unlink_save; 1588 $self->unlink_save;
1563 $self->destroy; 1589 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1567 1593
1568sub nuke { 1594sub nuke {
1569 my ($self) = @_; 1595 my ($self) = @_;
1570 1596
1597 delete $cf::MAP{$self->path};
1598
1599 $self->unlink_save;
1600
1601 bless $self, "cf::map";
1602 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1603 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1604 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1605 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1606
1607 $cf::MAP{$self->path} = $self;
1608
1574 $self->reset; # polite request, might not happen 1609 $self->reset; # polite request, might not happen
1575} 1610}
1576 1611
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 1612=item cf::map::unique_maps
1588 1613
1589Returns an arrayref of cf::path's of all shared maps that have 1614Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1615instantiated unique items. May block.
1591 1616
1592=cut 1617=cut
1593 1618
1594sub unique_maps() { 1619sub unique_maps() {
… …
1600 for (@$files) { 1625 for (@$files) {
1601 utf8::decode $_; 1626 utf8::decode $_;
1602 next if /\.pst$/; 1627 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1628 next unless /^$PATH_SEP/o;
1604 1629
1630 s/\.map$//;
1605 push @paths, new cf::path $_; 1631 push @paths, $_;
1606 } 1632 }
1607 1633
1608 \@paths 1634 \@paths
1609} 1635}
1610 1636
… …
1685 1711
1686=item $player_object->enter_link 1712=item $player_object->enter_link
1687 1713
1688Freezes the player and moves him/her to a special map (C<{link}>). 1714Freezes the player and moves him/her to a special map (C<{link}>).
1689 1715
1690The player should be reaosnably safe there for short amounts of time. You 1716The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1717I<MUST> call C<leave_link> as soon as possible, though.
1692 1718
1719Will never block.
1720
1693=item $player_object->leave_link ($map, $x, $y) 1721=item $player_object->leave_link ($map, $x, $y)
1694 1722
1695Moves the player out of the specila link map onto the given map. If the 1723Moves 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 1724map. 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, 1725to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1726fails, to the emergency map position.
1699 1727
1700Might block. 1728Might block.
1701 1729
1702=cut 1730=cut
1731
1732sub link_map {
1733 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1736 $LINK_MAP->load;
1737 }
1738
1739 $LINK_MAP
1740}
1703 1741
1704sub cf::object::player::enter_link { 1742sub cf::object::player::enter_link {
1705 my ($self) = @_; 1743 my ($self) = @_;
1706 1744
1707 $self->deactivate_recursive; 1745 $self->deactivate_recursive;
1708 1746
1709 return if $self->map == $LINK_MAP; 1747 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1748
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1750 if $self->map;
1713 1751
1714 $self->enter_map ($LINK_MAP, 20, 20); 1752 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1753}
1716 1754
1717sub cf::object::player::leave_link { 1755sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1756 my ($self, $map, $x, $y) = @_;
1719 1757
… …
1783=cut 1821=cut
1784 1822
1785sub cf::object::player::goto { 1823sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1824 my ($self, $path, $x, $y) = @_;
1787 1825
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1826 $self->enter_link;
1791 1827
1792 (async { 1828 (async {
1793 my $map = cf::map::find $path->as_string; 1829 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1830 $map = $map->customise_for ($self) if $map;
1795 1831
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1832# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1833# if $map;
1798 1834
… …
1808 1844
1809sub parse_random_map_params { 1845sub parse_random_map_params {
1810 my ($spec) = @_; 1846 my ($spec) = @_;
1811 1847
1812 my $rmp = { # defaults 1848 my $rmp = { # defaults
1813 xsize => 10, 1849 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1850 ysize => (cf::rndm 15, 40),
1851 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1852 #layout => string,
1815 }; 1853 };
1816 1854
1817 for (split /\n/, $spec) { 1855 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1856 my ($k, $v) = split /\s+/, $_, 2;
1819 1857
… …
1823 $rmp 1861 $rmp
1824} 1862}
1825 1863
1826sub prepare_random_map { 1864sub prepare_random_map {
1827 my ($exit) = @_; 1865 my ($exit) = @_;
1866
1867 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1868
1829 # all this does is basically replace the /! path by 1869 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1870 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1871 # that depends on the exit object
1832 1872
… …
1841 1881
1842 $rmp->{random_seed} ||= $exit->random_seed; 1882 $rmp->{random_seed} ||= $exit->random_seed;
1843 1883
1844 my $data = cf::to_json $rmp; 1884 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1885 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1887
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 1889 aio_write $fh, 0, (length $data), $data, 0;
1890 undef $fh;
1891 aio_rename "$meta~", $meta;
1849 1892
1850 $exit->slaying ("?random/$md5"); 1893 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1894 $exit->msg (undef);
1852 } 1895 }
1853} 1896}
… …
1863 $self->deactivate_recursive; # just to be sure 1906 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1907 unless (eval {
1865 prepare_random_map $exit 1908 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1909 if $exit->slaying eq "/!";
1867 1910
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1913
1871 1; 1914 1;
1872 }) { 1915 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1916 $self->message ("Something went wrong deep within the crossfire server. "
… …
2163 sub db_sync() { 2206 sub db_sync() {
2164 db_save if $dirty; 2207 db_save if $dirty;
2165 undef $dirty; 2208 undef $dirty;
2166 } 2209 }
2167 2210
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2211 my $idle = Event->idle (
2169 db_sync; 2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2170 }); 2218 );
2171 2219
2172 sub db_dirty() { 2220 sub db_dirty() {
2173 $dirty = 1; 2221 $dirty = 1;
2174 $idle->start; 2222 $idle->start;
2175 } 2223 }
… …
2223 2271
2224sub main { 2272sub main {
2225 # we must not ever block the main coroutine 2273 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2274 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2275 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2276 (async {
2228 async { Event::one_event }; 2277 Event::one_event;
2278 })->prio (Coro::PRIO_MAX);
2229 }; 2279 };
2230 2280
2231 cfg_load; 2281 cfg_load;
2232 db_load; 2282 db_load;
2233 load_extensions; 2283 load_extensions;
2284
2285 $TICK_WATCHER->start;
2234 Event::loop; 2286 Event::loop;
2235} 2287}
2236 2288
2237############################################################################# 2289#############################################################################
2238# initialisation and cleanup 2290# initialisation and cleanup
2239 2291
2240# install some emergency cleanup handlers 2292# install some emergency cleanup handlers
2241BEGIN { 2293BEGIN {
2242 for my $signal (qw(INT HUP TERM)) { 2294 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal ( 2295 Event->signal (
2296 reentrant => 0,
2244 data => WF_AUTOCANCEL, 2297 data => WF_AUTOCANCEL,
2245 signal => $signal, 2298 signal => $signal,
2299 prio => 0,
2246 cb => sub { 2300 cb => sub {
2247 cf::cleanup "SIG$signal"; 2301 cf::cleanup "SIG$signal";
2248 }, 2302 },
2249 ); 2303 );
2250 } 2304 }
2251} 2305}
… …
2256 warn "enter emergency perl save\n"; 2310 warn "enter emergency perl save\n";
2257 2311
2258 cf::sync_job { 2312 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2313 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2314 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2315 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2316 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2317 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2318 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2319 $pl->valid or next;
2266 $pl->save; 2320 $pl->save;
… …
2280} 2334}
2281 2335
2282sub reload() { 2336sub reload() {
2283 # can/must only be called in main 2337 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine";
2286 return; 2340 return;
2287 } 2341 }
2288 2342
2289 warn "reloading..."; 2343 warn "reloading...";
2290 2344
2291 warn "freezing server"; 2345 warn "cancelling server ticker";
2292 my $guard = freeze_mainloop; 2346 $TICK_WATCHER->cancel;
2347
2293 cf::emergency_save; 2348 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298 2349
2299 eval { 2350 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 2351 # if anything goes wrong in here, we should simply crash as we already saved
2301 2352
2353 warn "syncing database to disk";
2354 cf::db_sync;
2355
2302 warn "cancel all watchers"; 2356 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2357 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2358 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2359 }
2306 2360
2361 warn "flushing outstanding aio requests";
2362 for (;;) {
2363 IO::AIO::flush;
2364 Coro::cede;
2365 last unless IO::AIO::nreqs;
2366 warn "iterate...";
2367 }
2368
2307 warn "cancel all extension coros"; 2369 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2370 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2371 %EXT_CORO = ();
2310 2372
2311 warn "remove commands"; 2373 warn "removing commands";
2312 %COMMAND = (); 2374 %COMMAND = ();
2313 2375
2314 warn "remove ext commands"; 2376 warn "removing ext commands";
2315 %EXTCMD = (); 2377 %EXTCMD = ();
2316 2378
2317 warn "unload/nuke all extensions"; 2379 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2380 for my $pkg (@EXTS) {
2319 warn "... unloading $pkg"; 2381 warn "... unloading $pkg";
2320 2382
2321 if (my $cb = $pkg->can ("unload")) { 2383 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2384 eval {
… …
2327 2389
2328 warn "... nuking $pkg"; 2390 warn "... nuking $pkg";
2329 Symbol::delete_package $pkg; 2391 Symbol::delete_package $pkg;
2330 } 2392 }
2331 2393
2332 warn "unload all perl modules loaded from $LIBDIR"; 2394 warn "unloading all perl modules loaded from $LIBDIR";
2333 while (my ($k, $v) = each %INC) { 2395 while (my ($k, $v) = each %INC) {
2334 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2396 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2335 2397
2336 warn "removing <$k>"; 2398 warn "... unloading $k";
2337 delete $INC{$k}; 2399 delete $INC{$k};
2338 2400
2339 $k =~ s/\.pm$//; 2401 $k =~ s/\.pm$//;
2340 $k =~ s/\//::/g; 2402 $k =~ s/\//::/g;
2341 2403
… …
2344 } 2406 }
2345 2407
2346 Symbol::delete_package $k; 2408 Symbol::delete_package $k;
2347 } 2409 }
2348 2410
2349 warn "get rid of safe::, as good as possible"; 2411 warn "getting rid of safe::, as good as possible";
2350 Symbol::delete_package "safe::$_" 2412 Symbol::delete_package "safe::$_"
2351 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2413 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2352 2414
2353 warn "unload cf.pm \"a bit\""; 2415 warn "unloading cf.pm \"a bit\"";
2354 delete $INC{"cf.pm"}; 2416 delete $INC{"cf.pm"};
2355 2417
2356 # don't, removes xs symbols, too, 2418 # don't, removes xs symbols, too,
2357 # and global variables created in xs 2419 # and global variables created in xs
2358 #Symbol::delete_package __PACKAGE__; 2420 #Symbol::delete_package __PACKAGE__;
2359 2421
2422 warn "unload completed, starting to reload now";
2423
2360 warn "reloading cf.pm"; 2424 warn "reloading cf.pm";
2361 require cf; 2425 require cf;
2362 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2426 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2363 2427
2364 warn "load config and database again"; 2428 warn "loading config and database again";
2365 cf::cfg_load; 2429 cf::cfg_load;
2366 cf::db_load; 2430 cf::db_load;
2367 2431
2368 warn "load extensions"; 2432 warn "loading extensions";
2369 cf::load_extensions; 2433 cf::load_extensions;
2370 2434
2371 warn "reattach attachments to objects/players"; 2435 warn "reattaching attachments to objects/players";
2372 _global_reattach; 2436 _global_reattach;
2373 warn "reattach attachments to maps"; 2437 warn "reattaching attachments to maps";
2374 reattach $_ for values %MAP; 2438 reattach $_ for values %MAP;
2439
2440 warn "restarting server ticker";
2441
2442 $TICK_WATCHER->start;
2375 }; 2443 };
2376 2444
2377 if ($@) { 2445 if ($@) {
2378 warn $@; 2446 warn $@;
2379 warn "error while reloading, exiting."; 2447 warn "error while reloading, exiting.";
… …
2381 } 2449 }
2382 2450
2383 warn "reloaded"; 2451 warn "reloaded";
2384}; 2452};
2385 2453
2386############################################################################# 2454our $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 2455
2429register_command "reload" => sub { 2456register_command "reload" => sub {
2430 my ($who, $arg) = @_; 2457 my ($who, $arg) = @_;
2431 2458
2432 if ($who->flag (FLAG_WIZ)) { 2459 if ($who->flag (FLAG_WIZ)) {
2433 $who->message ("start of reload."); 2460 $who->message ("reloading server.");
2461
2462 # doing reload synchronously and two reloads happen back-to-back,
2463 # coro crashes during coro_state_free->destroy here.
2464
2465 $RELOAD_WATCHER ||= Event->timer (
2466 reentrant => 0,
2467 after => 0,
2468 data => WF_AUTOCANCEL,
2469 cb => sub {
2434 reload; 2470 reload;
2435 $who->message ("end of reload."); 2471 undef $RELOAD_WATCHER;
2472 },
2473 );
2436 } 2474 }
2437}; 2475};
2438 2476
2439unshift @INC, $LIBDIR; 2477unshift @INC, $LIBDIR;
2478
2479my $bug_warning = 0;
2440 2480
2441$TICK_WATCHER = Event->timer ( 2481$TICK_WATCHER = Event->timer (
2442 reentrant => 0, 2482 reentrant => 0,
2483 parked => 1,
2443 prio => 0, 2484 prio => 0,
2444 at => $NEXT_TICK || $TICK, 2485 at => $NEXT_TICK || $TICK,
2445 data => WF_AUTOCANCEL, 2486 data => WF_AUTOCANCEL,
2446 cb => sub { 2487 cb => sub {
2488 if ($Coro::current != $Coro::main) {
2489 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2490 unless ++$bug_warning > 10;
2491 return;
2492 }
2493
2494 $NOW = Event::time;
2495
2447 cf::server_tick; # one server iteration 2496 cf::server_tick; # one server iteration
2448 $RUNTIME += $TICK; 2497 $RUNTIME += $TICK;
2449 $NEXT_TICK += $TICK; 2498 $NEXT_TICK += $TICK;
2450 2499
2451 $WAIT_FOR_TICK->broadcast; 2500 $WAIT_FOR_TICK->broadcast;
2452 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2501 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2502
2503 Event::sweep;
2504 Coro::cede_notself;
2505
2506# my $AFTER = Event::time;
2507# warn $AFTER - $NOW;#d#
2453 2508
2454 # if we are delayed by four ticks or more, skip them all 2509 # if we are delayed by four ticks or more, skip them all
2455 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2510 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2456 2511
2457 $TICK_WATCHER->at ($NEXT_TICK); 2512 $TICK_WATCHER->at ($NEXT_TICK);
2458 $TICK_WATCHER->start; 2513 $TICK_WATCHER->start;
2459 }, 2514 },
2460); 2515);
2461 2516
2462IO::AIO::max_poll_time $TICK * 0.2; 2517IO::AIO::max_poll_time $TICK * 0.1;
2463 2518
2464Event->io ( 2519undef $Coro::AIO::WATCHER;
2520$AIO_POLL_WATCHER = Event->io (
2521 reentrant => 0,
2465 fd => IO::AIO::poll_fileno, 2522 fd => IO::AIO::poll_fileno,
2466 poll => 'r', 2523 poll => 'r',
2467 prio => 5, 2524 prio => 6,
2468 data => WF_AUTOCANCEL, 2525 data => WF_AUTOCANCEL,
2469 cb => \&IO::AIO::poll_cb, 2526 cb => \&IO::AIO::poll_cb,
2470); 2527);
2471 2528
2472Event->timer ( 2529$WRITE_RUNTIME_WATCHER = Event->timer (
2530 reentrant => 0,
2473 data => WF_AUTOCANCEL, 2531 data => WF_AUTOCANCEL,
2474 after => 0, 2532 after => 1,
2475 interval => 10, 2533 interval => 10,
2476 cb => sub { 2534 prio => 6, # keep it lowest so it acts like a watchdog
2477 (Coro::unblock_sub { 2535 cb => Coro::unblock_sub {
2478 write_runtime 2536 write_runtime
2479 or warn "ERROR: unable to write runtime file: $!"; 2537 or warn "ERROR: unable to write runtime file: $!";
2480 })->();
2481 }, 2538 },
2482); 2539);
2483 2540
2484END { cf::emergency_save } 2541END { cf::emergency_save }
2485 2542

Diff Legend

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