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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.159 by root, Wed Jan 10 22:50:12 2007 UTC vs.
Revision 1.186 by root, Sat Jan 20 01:12:39 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
… …
987 my $base = $1; 879 my $base = $1;
988 my $pkg = $1; 880 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 881 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 882 $pkg = "ext::$pkg";
991 883
992 warn "loading '$path' into '$pkg'\n"; 884 warn "... loading '$path' into '$pkg'\n";
993 885
994 open my $fh, "<:utf8", $path 886 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 887 or die "$path: $!";
996 888
997 my $source = 889 my $source =
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
1145sub register {
1146 my (undef, $regex) = @_;
1147 my $pkg = caller;
1148
1149 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__;
1151
1152 $EXT_MAP{$pkg} = qr<$regex>;
1153}
1154
1155# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)};
1157
1158sub thawer_merge {
1159 my ($self, $merge) = @_;
1160
1161 # we have to keep some variables in memory intact
1162 local $self->{path};
1163 local $self->{load_path};
1164 local $self->{deny_save};
1165 local $self->{deny_reset};
1166
1167 $self->SUPER::thawer_merge ($merge);
1168}
1169
1170sub normalise {
1171 my ($path, $base) = @_;
1172
1173 # map plan:
1174 #
1175 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched
1177 # ?xxx/... are special absolute paths
1178 # ?random/... random maps
1179 # /... normal maps
1180 # ~user/... per-player map of a specific user
1181
1182 $path =~ s/$PATH_SEP/\//go;
1183
1184 # treat it as relative path if it starts with
1185 # something that looks reasonable
1186 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1187 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1188
1189 $base =~ s{[^/]+/?$}{};
1190 $path = "$base/$path";
1191 }
1192
1193 for ($path) {
1194 redo if s{//}{/};
1195 redo if s{/\.?/}{/};
1196 redo if s{/[^/]+/\.\./}{/};
1197 }
1198
1199 $path
1200}
1201
1202sub new_from_path {
1203 my (undef, $path, $base) = @_;
1204
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206
1207 $path = normalise $path, $base;
1208
1209 for my $pkg (keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) {
1211 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc.
1214 return $self;
1215 }
1216 }
1217
1218 Carp::carp "unable to resolve path '$path'.";
1219 ()
1220}
1221
1222sub init {
1223 my ($self) = @_;
1224
1225 $self
1226}
1227
1228sub as_string {
1229 my ($self) = @_;
1230
1231 "$self->{path}"
1232}
1233
1234# the displayed name, this is a one way mapping
1235sub visible_name {
1236 &as_string
1237}
1238
1239# the original (read-only) location
1240sub load_path {
1241 my ($self) = @_;
1242
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1244}
1245
1246# the temporary/swap location
1247sub save_path {
1248 my ($self) = @_;
1249
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1252}
1253
1254# the unique path, undef == no special unique path
1255sub uniq_path {
1256 my ($self) = @_;
1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1260}
1255 1261
1256# and all this just because we cannot iterate over 1262# and all this just because we cannot iterate over
1257# all maps in C++... 1263# all maps in C++...
1258sub change_all_map_light { 1264sub change_all_map_light {
… …
1260 1266
1261 $_->change_map_light ($change) 1267 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1268 for grep $_->outdoor, values %cf::MAP;
1263} 1269}
1264 1270
1271sub unlink_save {
1272 my ($self) = @_;
1273
1274 utf8::encode (my $save = $self->save_path);
1275 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1276 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1277}
1278
1265sub try_load_header($) { 1279sub load_header_from($) {
1266 my ($path) = @_; 1280 my ($self, $path) = @_;
1267 1281
1268 utf8::encode $path; 1282 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1283 aio_open $path, O_RDONLY, 0
1270 or return; 1284 or return;
1271 1285
1272 my $map = cf::map::new 1286 $self->_load_header ($path)
1273 or return; 1287 or return;
1274 1288
1275 # for better error messages only, will be overwritten 1289 $self->{load_path} = $path;
1276 $map->path ($path);
1277 1290
1278 $map->load_header ($path) 1291 1
1292}
1293
1294sub load_orig {
1295 my ($self) = @_;
1296
1297 $self->load_header_from ($self->load_path)
1298}
1299
1300sub load_temp {
1301 my ($self) = @_;
1302
1303 $self->load_header_from ($self->save_path)
1304}
1305
1306sub load_header {
1307 my ($self) = @_;
1308
1309 if ($self->load_temp) {
1310 $self->last_access ((delete $self->{last_access})
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else {
1316 $self->load_orig
1279 or return; 1317 or return;
1280 1318
1281 $map->{load_path} = $path; 1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 }
1282 1324
1283 $map 1325 1
1284} 1326}
1285 1327
1286sub find; 1328sub find;
1287sub find { 1329sub find {
1288 my ($path, $origin) = @_; 1330 my ($path, $origin) = @_;
1289 1331
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1332 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1333
1295 cf::lock_wait "map_find:$key"; 1334 cf::lock_wait "map_find:$path";
1296 1335
1297 $cf::MAP{$key} || do { 1336 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1337 my $guard = cf::lock_acquire "map_find:$path";
1299 1338 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; 1339 or return;
1319 1340
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; 1341 $map->{last_save} = $cf::RUNTIME;
1332 1342
1333 Coro::cede; 1343 $map->load_header
1344 or return;
1334 1345
1335 if ($map->should_reset) { 1346 if ($map->should_reset) {
1347 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1349 $map->reset;
1337 undef $guard; 1350 undef $guard;
1338 $map = find $path 1351 $map = find $path
1339 or return; 1352 or return;
1340 } 1353 }
1341 1354
1342 $cf::MAP{$key} = $map 1355 $cf::MAP{$path} = $map
1343 } 1356 }
1344} 1357}
1345 1358
1346sub load { 1359sub load {
1347 my ($self) = @_; 1360 my ($self) = @_;
1348 1361
1349 my $path = $self->{path}; 1362 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1363 my $guard = cf::lock_acquire "map_load:$path";
1351 1364
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1365 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1366
1354 $self->in_memory (cf::MAP_LOADING); 1367 $self->in_memory (cf::MAP_LOADING);
1355 1368
1356 $self->alloc; 1369 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1370 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1371 or return;
1359 1372
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1374 if delete $self->{load_original};
1362 1375
1363 if (my $uniq = $path->uniq_path) { 1376 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1377 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1378 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1379 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1380 $self->_load_objects ($uniq, 0);
1368 } 1381 }
1369 } 1382 }
1370 1383
1371 Coro::cede; 1384 Coro::cede;
1372 1385
1373 # now do the right thing for maps 1386 # now do the right thing for maps
1374 $self->link_multipart_objects; 1387 $self->link_multipart_objects;
1375 1388
1376 if ($self->{path}->is_style_map) { 1389 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1390 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1391 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1392 $self->update_buttons;
1393 Coro::cede;
1383 $self->set_darkness_map; 1394 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1395 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1396 unless $self->difficulty;
1397 Coro::cede;
1386 $self->activate; 1398 $self->activate;
1387 } 1399 }
1388 1400
1389 Coro::cede;
1390
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1401 $self->in_memory (cf::MAP_IN_MEMORY);
1402}
1403
1404sub customise_for {
1405 my ($self, $ob) = @_;
1406
1407 return find "~" . $ob->name . "/" . $self->{path}
1408 if $self->per_player;
1409
1410 $self
1392} 1411}
1393 1412
1394# find and load all maps in the 3x3 area around a map 1413# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1414sub load_diag {
1396 my ($map) = @_; 1415 my ($map) = @_;
… …
1426 1445
1427 cf::sync_job { $map->load }; 1446 cf::sync_job { $map->load };
1428} 1447}
1429 1448
1430our %MAP_PREFETCH; 1449our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1450our $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 1451
1446sub find_async { 1452sub find_async {
1447 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1448 1454
1449 $path = new cf::path $path, $origin && $origin->path; 1455 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1456
1452 if (my $map = $cf::MAP{$key}) { 1457 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1459 }
1455 1460
1456 $MAP_PREFETCH{$key} = $path; 1461 undef $MAP_PREFETCH{$path};
1457 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER ||= cf::async {
1463 while (%MAP_PREFETCH) {
1464 for my $path (keys %MAP_PREFETCH) {
1465 my $map = find $path
1466 or next;
1467 $map->load;
1468
1469 delete $MAP_PREFETCH{$path};
1470 }
1471 }
1472 undef $MAP_PREFETCHER;
1473 };
1458 1474
1459 () 1475 ()
1460} 1476}
1461 1477
1462sub save { 1478sub save {
… …
1466 1482
1467 $self->{last_save} = $cf::RUNTIME; 1483 $self->{last_save} = $cf::RUNTIME;
1468 1484
1469 return unless $self->dirty; 1485 return unless $self->dirty;
1470 1486
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1487 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1488 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1489
1474 $self->{load_path} = $save; 1490 $self->{load_path} = $save;
1475 1491
1476 return if $self->{deny_save}; 1492 return if $self->{deny_save};
1477 1493
… …
1480 cf::async { 1496 cf::async {
1481 $_->contr->save for $self->players; 1497 $_->contr->save for $self->players;
1482 }; 1498 };
1483 1499
1484 if ($uniq) { 1500 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1502 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1503 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1504 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1505 }
1490} 1506}
1491 1507
1492sub swap_out { 1508sub swap_out {
1493 my ($self) = @_; 1509 my ($self) = @_;
… …
1507 1523
1508sub reset_at { 1524sub reset_at {
1509 my ($self) = @_; 1525 my ($self) = @_;
1510 1526
1511 # TODO: safety, remove and allow resettable per-player maps 1527 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1528 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1529 return 1e99 if $self->{deny_reset};
1514 1530
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1531 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1532 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1533
… …
1522 my ($self) = @_; 1538 my ($self) = @_;
1523 1539
1524 $self->reset_at <= $cf::RUNTIME 1540 $self->reset_at <= $cf::RUNTIME
1525} 1541}
1526 1542
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 { 1543sub reset {
1549 my ($self) = @_; 1544 my ($self) = @_;
1550 1545
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1546 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1547
1553 return if $self->players; 1548 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1549 return if $self->isa ("ext::map_per_player");#d#
1555 1550
1556 warn "resetting map ", $self->path;#d# 1551 warn "resetting map ", $self->path;#d#
1557 1552
1558 delete $cf::MAP{$self->path}; 1553 delete $cf::MAP{$self->path};
1554
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear;
1559 1557
1560 $_->clear_links_to ($self) for values %cf::MAP; 1558 $_->clear_links_to ($self) for values %cf::MAP;
1561 1559
1562 $self->unlink_save; 1560 $self->unlink_save;
1563 $self->destroy; 1561 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1564my $nuke_counter = "aaaa";
1567 1565
1568sub nuke { 1566sub nuke {
1569 my ($self) = @_; 1567 my ($self) = @_;
1570 1568
1569 delete $cf::MAP{$self->path};
1570
1571 $self->unlink_save;
1572
1573 bless $self, "cf::map";
1574 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1575 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1578
1579 $cf::MAP{$self->path} = $self;
1580
1574 $self->reset; # polite request, might not happen 1581 $self->reset; # polite request, might not happen
1575} 1582}
1576 1583
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 1584=item cf::map::unique_maps
1588 1585
1589Returns an arrayref of cf::path's of all shared maps that have 1586Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1587instantiated unique items. May block.
1591 1588
1592=cut 1589=cut
1593 1590
1594sub unique_maps() { 1591sub unique_maps() {
… …
1600 for (@$files) { 1597 for (@$files) {
1601 utf8::decode $_; 1598 utf8::decode $_;
1602 next if /\.pst$/; 1599 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1600 next unless /^$PATH_SEP/o;
1604 1601
1602 s/\.map$//;
1605 push @paths, new cf::path $_; 1603 push @paths, $_;
1606 } 1604 }
1607 1605
1608 \@paths 1606 \@paths
1609} 1607}
1610 1608
… …
1685 1683
1686=item $player_object->enter_link 1684=item $player_object->enter_link
1687 1685
1688Freezes the player and moves him/her to a special map (C<{link}>). 1686Freezes the player and moves him/her to a special map (C<{link}>).
1689 1687
1690The player should be reaosnably safe there for short amounts of time. You 1688The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1689I<MUST> call C<leave_link> as soon as possible, though.
1692 1690
1691Will never block.
1692
1693=item $player_object->leave_link ($map, $x, $y) 1693=item $player_object->leave_link ($map, $x, $y)
1694 1694
1695Moves the player out of the specila link map onto the given map. If the 1695Moves 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 1696map. 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, 1697to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1698fails, to the emergency map position.
1699 1699
1700Might block. 1700Might block.
1701 1701
1702=cut 1702=cut
1703
1704sub link_map {
1705 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1708 $LINK_MAP->load;
1709 }
1710
1711 $LINK_MAP
1712}
1703 1713
1704sub cf::object::player::enter_link { 1714sub cf::object::player::enter_link {
1705 my ($self) = @_; 1715 my ($self) = @_;
1706 1716
1707 $self->deactivate_recursive; 1717 $self->deactivate_recursive;
1708 1718
1709 return if $self->map == $LINK_MAP; 1719 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1720
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1722 if $self->map;
1713 1723
1714 $self->enter_map ($LINK_MAP, 20, 20); 1724 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1715} 1725}
1716 1726
1717sub cf::object::player::leave_link { 1727sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1728 my ($self, $map, $x, $y) = @_;
1719 1729
… …
1783=cut 1793=cut
1784 1794
1785sub cf::object::player::goto { 1795sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1796 my ($self, $path, $x, $y) = @_;
1787 1797
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1798 $self->enter_link;
1791 1799
1792 (async { 1800 (async {
1793 my $map = cf::map::find $path->as_string; 1801 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1802 $map = $map->customise_for ($self) if $map;
1795 1803
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1804# warn "entering ", $map->path, " at ($x, $y)\n"
1797# if $map; 1805# if $map;
1798 1806
… …
1808 1816
1809sub parse_random_map_params { 1817sub parse_random_map_params {
1810 my ($spec) = @_; 1818 my ($spec) = @_;
1811 1819
1812 my $rmp = { # defaults 1820 my $rmp = { # defaults
1813 xsize => 10, 1821 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1822 ysize => (cf::rndm 15, 40),
1823 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1824 #layout => string,
1815 }; 1825 };
1816 1826
1817 for (split /\n/, $spec) { 1827 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1828 my ($k, $v) = split /\s+/, $_, 2;
1819 1829
… …
1823 $rmp 1833 $rmp
1824} 1834}
1825 1835
1826sub prepare_random_map { 1836sub prepare_random_map {
1827 my ($exit) = @_; 1837 my ($exit) = @_;
1838
1839 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1840
1829 # all this does is basically replace the /! path by 1841 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1842 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1843 # that depends on the exit object
1832 1844
… …
1841 1853
1842 $rmp->{random_seed} ||= $exit->random_seed; 1854 $rmp->{random_seed} ||= $exit->random_seed;
1843 1855
1844 my $data = cf::to_json $rmp; 1856 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1857 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1859
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1860 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 1861 aio_write $fh, 0, (length $data), $data, 0;
1862 undef $fh;
1863 aio_rename "$meta~", $meta;
1849 1864
1850 $exit->slaying ("?random/$md5"); 1865 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1866 $exit->msg (undef);
1852 } 1867 }
1853} 1868}
… …
1863 $self->deactivate_recursive; # just to be sure 1878 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1879 unless (eval {
1865 prepare_random_map $exit 1880 prepare_random_map $exit
1866 if $exit->slaying eq "/!"; 1881 if $exit->slaying eq "/!";
1867 1882
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1885
1871 1; 1886 1;
1872 }) { 1887 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1888 $self->message ("Something went wrong deep within the crossfire server. "
… …
2163 sub db_sync() { 2178 sub db_sync() {
2164 db_save if $dirty; 2179 db_save if $dirty;
2165 undef $dirty; 2180 undef $dirty;
2166 } 2181 }
2167 2182
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2169 db_sync; 2184 db_sync;
2170 }); 2185 });
2171 2186
2172 sub db_dirty() { 2187 sub db_dirty() {
2173 $dirty = 1; 2188 $dirty = 1;
… …
2223 2238
2224sub main { 2239sub main {
2225 # we must not ever block the main coroutine 2240 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2241 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2242 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2243 (async {
2228 async { Event::one_event }; 2244 Event::one_event;
2245 })->prio (Coro::PRIO_MAX);
2229 }; 2246 };
2230 2247
2231 cfg_load; 2248 cfg_load;
2232 db_load; 2249 db_load;
2233 load_extensions; 2250 load_extensions;
2251
2252 $TICK_WATCHER->start;
2234 Event::loop; 2253 Event::loop;
2235} 2254}
2236 2255
2237############################################################################# 2256#############################################################################
2238# initialisation and cleanup 2257# initialisation and cleanup
… …
2256 warn "enter emergency perl save\n"; 2275 warn "enter emergency perl save\n";
2257 2276
2258 cf::sync_job { 2277 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2278 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2279 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2280 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2281 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2282 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2283 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2284 $pl->valid or next;
2266 $pl->save; 2285 $pl->save;
… …
2280} 2299}
2281 2300
2282sub reload() { 2301sub reload() {
2283 # can/must only be called in main 2302 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2303 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2304 warn "can only reload from main coroutine";
2286 return; 2305 return;
2287 } 2306 }
2288 2307
2289 warn "reloading..."; 2308 warn "reloading...";
2290 2309
2291 warn "freezing server"; 2310 warn "cancelling server ticker";
2292 my $guard = freeze_mainloop; 2311 $TICK_WATCHER->cancel;
2312
2293 cf::emergency_save; 2313 cf::emergency_save;
2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298 2314
2299 eval { 2315 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 2316 # if anything goes wrong in here, we should simply crash as we already saved
2301 2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320
2302 warn "cancel all watchers"; 2321 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2322 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2323 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2324 }
2306 2325
2326 warn "flushing outstanding aio requests";
2327 for (;;) {
2328 IO::AIO::flush;
2329 Coro::cede;
2330 last unless IO::AIO::nreqs;
2331 warn "iterate...";
2332 }
2333
2307 warn "cancel all extension coros"; 2334 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2335 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2336 %EXT_CORO = ();
2310 2337
2311 warn "remove commands"; 2338 warn "removing commands";
2312 %COMMAND = (); 2339 %COMMAND = ();
2313 2340
2314 warn "remove ext commands"; 2341 warn "removing ext commands";
2315 %EXTCMD = (); 2342 %EXTCMD = ();
2316 2343
2317 warn "unload/nuke all extensions"; 2344 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2345 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2346 warn "... unloading $pkg";
2320 2347
2321 if (my $cb = $pkg->can ("unload")) { 2348 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2349 eval {
2323 $cb->($pkg); 2350 $cb->($pkg);
2324 1 2351 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2352 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2353 }
2327 2354
2355 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2356 Symbol::delete_package $pkg;
2329 } 2357 }
2330 2358
2331 warn "unload all perl modules loaded from $LIBDIR"; 2359 warn "unloading all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2360 while (my ($k, $v) = each %INC) {
2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2334 2362
2335 warn "removing <$k>"; 2363 warn "... unloading $k";
2336 delete $INC{$k}; 2364 delete $INC{$k};
2337 2365
2338 $k =~ s/\.pm$//; 2366 $k =~ s/\.pm$//;
2339 $k =~ s/\//::/g; 2367 $k =~ s/\//::/g;
2340 2368
… …
2343 } 2371 }
2344 2372
2345 Symbol::delete_package $k; 2373 Symbol::delete_package $k;
2346 } 2374 }
2347 2375
2348 warn "get rid of safe::, as good as possible"; 2376 warn "getting rid of safe::, as good as possible";
2349 Symbol::delete_package "safe::$_" 2377 Symbol::delete_package "safe::$_"
2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2351 2379
2352 warn "unload cf.pm \"a bit\""; 2380 warn "unloading cf.pm \"a bit\"";
2353 delete $INC{"cf.pm"}; 2381 delete $INC{"cf.pm"};
2354 2382
2355 # don't, removes xs symbols, too, 2383 # don't, removes xs symbols, too,
2356 # and global variables created in xs 2384 # and global variables created in xs
2357 #Symbol::delete_package __PACKAGE__; 2385 #Symbol::delete_package __PACKAGE__;
2358 2386
2387 warn "unload completed, starting to reload now";
2388
2359 warn "reloading cf.pm"; 2389 warn "reloading cf.pm";
2360 require cf; 2390 require cf;
2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2362 2392
2363 warn "load config and database again"; 2393 warn "loading config and database again";
2364 cf::cfg_load; 2394 cf::cfg_load;
2365 cf::db_load; 2395 cf::db_load;
2366 2396
2367 warn "load extensions"; 2397 warn "loading extensions";
2368 cf::load_extensions; 2398 cf::load_extensions;
2369 2399
2370 warn "reattach attachments to objects/players"; 2400 warn "reattaching attachments to objects/players";
2371 _global_reattach; 2401 _global_reattach;
2372 warn "reattach attachments to maps"; 2402 warn "reattaching attachments to maps";
2373 reattach $_ for values %MAP; 2403 reattach $_ for values %MAP;
2404
2405 warn "restarting server ticker";
2406
2407 $TICK_WATCHER->start;
2374 }; 2408 };
2375 2409
2376 if ($@) { 2410 if ($@) {
2377 warn $@; 2411 warn $@;
2378 warn "error while reloading, exiting."; 2412 warn "error while reloading, exiting.";
… …
2380 } 2414 }
2381 2415
2382 warn "reloaded"; 2416 warn "reloaded";
2383}; 2417};
2384 2418
2385############################################################################# 2419our $RELOAD_WATCHER; # used only during reload
2386
2387unless ($LINK_MAP) {
2388 $LINK_MAP = cf::map::new;
2389
2390 $LINK_MAP->width (41);
2391 $LINK_MAP->height (41);
2392 $LINK_MAP->alloc;
2393 $LINK_MAP->path ("{link}");
2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2396
2397 # dirty hack because... archetypes are not yet loaded
2398 Event->timer (
2399 after => 10,
2400 cb => sub {
2401 $_[0]->w->cancel;
2402
2403 # provide some exits "home"
2404 my $exit = cf::object::new "exit";
2405
2406 $exit->slaying ($EMERGENCY_POSITION->[0]);
2407 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2408 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2409
2410 $LINK_MAP->insert ($exit->clone, 19, 19);
2411 $LINK_MAP->insert ($exit->clone, 19, 20);
2412 $LINK_MAP->insert ($exit->clone, 19, 21);
2413 $LINK_MAP->insert ($exit->clone, 20, 19);
2414 $LINK_MAP->insert ($exit->clone, 20, 21);
2415 $LINK_MAP->insert ($exit->clone, 21, 19);
2416 $LINK_MAP->insert ($exit->clone, 21, 20);
2417 $LINK_MAP->insert ($exit->clone, 21, 21);
2418
2419 $exit->destroy;
2420 });
2421
2422 $LINK_MAP->{deny_save} = 1;
2423 $LINK_MAP->{deny_reset} = 1;
2424
2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2426}
2427 2420
2428register_command "reload" => sub { 2421register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2422 my ($who, $arg) = @_;
2430 2423
2431 if ($who->flag (FLAG_WIZ)) { 2424 if ($who->flag (FLAG_WIZ)) {
2432 $who->message ("start of reload."); 2425 $who->message ("reloading server.");
2426
2427 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here.
2429
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2433 reload; 2431 reload;
2434 $who->message ("end of reload."); 2432 undef $RELOAD_WATCHER;
2433 });
2435 } 2434 }
2436}; 2435};
2437 2436
2438unshift @INC, $LIBDIR; 2437unshift @INC, $LIBDIR;
2438
2439my $bug_warning = 0;
2439 2440
2440$TICK_WATCHER = Event->timer ( 2441$TICK_WATCHER = Event->timer (
2441 reentrant => 0, 2442 reentrant => 0,
2443 parked => 1,
2442 prio => 0, 2444 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2445 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2446 data => WF_AUTOCANCEL,
2445 cb => sub { 2447 cb => sub {
2448 if ($Coro::current != $Coro::main) {
2449 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2450 unless ++$bug_warning > 10;
2451 return;
2452 }
2453
2454 $NOW = Event::time;
2455
2446 cf::server_tick; # one server iteration 2456 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2457 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2458 $NEXT_TICK += $TICK;
2449 2459
2450 $WAIT_FOR_TICK->broadcast; 2460 $WAIT_FOR_TICK->broadcast;
… …
2458 }, 2468 },
2459); 2469);
2460 2470
2461IO::AIO::max_poll_time $TICK * 0.2; 2471IO::AIO::max_poll_time $TICK * 0.2;
2462 2472
2463Event->io ( 2473$AIO_POLL_WATCHER = Event->io (
2464 fd => IO::AIO::poll_fileno, 2474 fd => IO::AIO::poll_fileno,
2465 poll => 'r', 2475 poll => 'r',
2466 prio => 5, 2476 prio => 5,
2467 data => WF_AUTOCANCEL, 2477 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb, 2478 cb => \&IO::AIO::poll_cb,
2469); 2479);
2470 2480
2471Event->timer ( 2481$WRITE_RUNTIME_WATCHER = Event->timer (
2472 data => WF_AUTOCANCEL, 2482 data => WF_AUTOCANCEL,
2473 after => 0, 2483 after => 1,
2474 interval => 10, 2484 interval => 10,
2475 cb => sub { 2485 prio => 6, # keep it lowest so it acts like a watchdog
2476 (Coro::unblock_sub { 2486 cb => Coro::unblock_sub {
2477 write_runtime 2487 write_runtime
2478 or warn "ERROR: unable to write runtime file: $!"; 2488 or warn "ERROR: unable to write runtime file: $!";
2479 })->();
2480 }, 2489 },
2481); 2490);
2482 2491
2483END { cf::emergency_save } 2492END { cf::emergency_save }
2484 2493

Diff Legend

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