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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.173 by root, Sun Jan 14 18:00:34 2007 UTC

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

Diff Legend

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