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.154 by root, Tue Jan 9 15:36:19 2007 UTC vs.
Revision 1.164 by root, Thu Jan 11 01:24:25 2007 UTC

… …
24use YAML::Syck (); 24use YAML::Syck ();
25use Time::HiRes; 25use Time::HiRes;
26 26
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
29# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
30$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
31 33
32$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
33 35
34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
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;
… …
52 56
53our %PLAYER; # all users 57our %PLAYER; # all users
54our %MAP; # all maps 58our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map
56our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
58 64
59binmode STDOUT; 65binmode STDOUT;
60binmode STDERR; 66binmode STDERR;
61 67
62# read virtual server time, if available 68# read virtual server time, if available
… …
106 112
107=item %cf::CFG 113=item %cf::CFG
108 114
109Configuration for the server, loaded from C</etc/crossfire/config>, or 115Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 116from wherever your confdir points to.
117
118=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
119
120These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
121or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
122processing has been done. Call C<< ->wait >> on them to maximise the
123window of cpu time available, or simply to synchronise to the server tick.
111 124
112=back 125=back
113 126
114=cut 127=cut
115 128
… …
146} 159}
147 160
148$Event::DIED = sub { 161$Event::DIED = sub {
149 warn "error in event callback: @_"; 162 warn "error in event callback: @_";
150}; 163};
151
152my %ext_pkg;
153my @exts;
154my @hook;
155 164
156=head2 UTILITY FUNCTIONS 165=head2 UTILITY FUNCTIONS
157 166
158=over 4 167=over 4
159 168
… …
309 } 318 }
310} 319}
311 320
312=item $coro = cf::async_ext { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
313 322
314Like async, but this coro is automcatially being canceled when the 323Like async, but this coro is automatically being canceled when the
315extension calling this is being unloaded. 324extension calling this is being unloaded.
316 325
317=cut 326=cut
318 327
319sub async_ext(&) { 328sub async_ext(&) {
… …
357 366
358############################################################################# 367#############################################################################
359 368
360package cf::path; 369package cf::path;
361 370
371use overload
372 '""' => \&as_string;
373
362# used to convert map paths into valid unix filenames by repalcing / by ∕ 374# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
364 376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
365sub new { 383sub new {
366 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
367 385
368 $path = $path->as_string if ref $path; 386 return $path if ref $path;
369 387
370 my $self = bless { }, $class; 388 my $self = {};
371 389
372 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
373 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
374 # ?random/... random maps 392 # ?random/... random maps
375 # /! non-realised random map exit 393 # /! non-realised random map exit
376 # /... normal maps 394 # /... normal maps
377 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
378 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
379 397
398 $path =~ s/$PATH_SEP/\//go;
399
380 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
381 # fine as it is 401 # fine as it is
382 } elsif ($path =~ s{^\?random/}{}) {
383 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
384 $self->{random} = cf::from_json $data;
385 } else { 402 } else {
386 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
387 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
388 406
389 if (defined $1) { 407 if (defined $1) {
390 $self->{user} = $1; 408 $self->{user} = $1;
391 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
392 $self->{user} = $1; 410 $self->{user} = $1;
393 } else { 411 } else {
394 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
395 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
396 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
397 # already absolute 422 # already absolute
398 } else { 423 } else {
424 # relative
399 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
400 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
401 } 427 }
402 428
403 for ($path) { 429 for ($path) {
… …
406 } 432 }
407 } 433 }
408 434
409 $self->{path} = $path; 435 $self->{path} = $path;
410 436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
411 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
412} 458}
413 459
414# the name / primary key / in-game path 460# the name / primary key / in-game path
415sub as_string { 461sub as_string {
416 my ($self) = @_; 462 my ($self) = @_;
417 463
418 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
419 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
420 : $self->{path} 466 : $self->{path}
421} 467}
422 468
423# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
424sub visible_name { 470sub visible_name {
425 my ($self) = @_; 471 &as_string
426
427# if (my $rmp = $self->{random}) {
428# # todo: be more intelligent about this
429# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
430# } else {
431 $self->as_string
432# }
433} 472}
434 473
435# escape the /'s in the path 474# escape the /'s in the path
436sub _escaped_path { 475sub _escaped_path {
437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
438 $path 478 $path
439} 479}
440 480
441# the original (read-only) location 481# the original (read-only) location
442sub load_path { 482sub load_path {
… …
447 487
448# the temporary/swap location 488# the temporary/swap location
449sub save_path { 489sub save_path {
450 my ($self) = @_; 490 my ($self) = @_;
451 491
492 $self->{user_rel}
452 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
453 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
454 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
455} 495}
456 496
457# the unique path, might be eq to save_path 497# the unique path, undef == no special unique path
458sub uniq_path { 498sub uniq_path {
459 my ($self) = @_; 499 my ($self) = @_;
460 500
461 $self->{user_rel} || $self->{random}
462 ? undef
463 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
464}
465
466# return random map parameters, or undef
467sub random_map_params {
468 my ($self) = @_;
469
470 $self->{random}
471} 502}
472 503
473# this is somewhat ugly, but style maps do need special treatment 504# this is somewhat ugly, but style maps do need special treatment
474sub is_style_map { 505sub is_style_map {
475 $_[0]{path} =~ m{^/styles/} 506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
476} 527}
477 528
478package cf; 529package cf;
479 530
480############################################################################# 531#############################################################################
… …
930=cut 981=cut
931 982
932sub register_extcmd { 983sub register_extcmd {
933 my ($name, $cb) = @_; 984 my ($name, $cb) = @_;
934 985
935 my $caller = caller;
936 #warn "registering extcmd '$name' to '$caller'";
937
938 $EXTCMD{$name} = [$cb, $caller]; 986 $EXTCMD{$name} = $cb;
939} 987}
940 988
941cf::player->attach ( 989cf::player->attach (
942 on_command => sub { 990 on_command => sub {
943 my ($pl, $name, $params) = @_; 991 my ($pl, $name, $params) = @_;
… …
956 1004
957 my $msg = eval { from_json $buf }; 1005 my $msg = eval { from_json $buf };
958 1006
959 if (ref $msg) { 1007 if (ref $msg) {
960 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1008 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
961 if (my %reply = $cb->[0]->($pl, $msg)) { 1009 if (my %reply = $cb->($pl, $msg)) {
962 $pl->ext_reply ($msg->{msgid}, %reply); 1010 $pl->ext_reply ($msg->{msgid}, %reply);
963 } 1011 }
964 } 1012 }
965 } else { 1013 } else {
966 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1014 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
968 1016
969 cf::override; 1017 cf::override;
970 }, 1018 },
971); 1019);
972 1020
973sub register {
974 my ($base, $pkg) = @_;
975
976 #TODO
977}
978
979sub load_extension { 1021sub load_extension {
980 my ($path) = @_; 1022 my ($path) = @_;
981 1023
982 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1024 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
983 my $base = $1; 1025 my $base = $1;
984 my $pkg = $1; 1026 my $pkg = $1;
985 $pkg =~ s/[^[:word:]]/_/g; 1027 $pkg =~ s/[^[:word:]]/_/g;
986 $pkg = "ext::$pkg"; 1028 $pkg = "ext::$pkg";
987 1029
988 warn "loading '$path' into '$pkg'\n"; 1030 warn "... loading '$path' into '$pkg'\n";
989 1031
990 open my $fh, "<:utf8", $path 1032 open my $fh, "<:utf8", $path
991 or die "$path: $!"; 1033 or die "$path: $!";
992 1034
993 my $source = 1035 my $source =
… …
998 1040
999 eval $source 1041 eval $source
1000 or die $@ ? "$path: $@\n" 1042 or die $@ ? "$path: $@\n"
1001 : "extension disabled.\n"; 1043 : "extension disabled.\n";
1002 1044
1003 push @exts, $pkg; 1045 push @EXTS, $pkg;
1004 $ext_pkg{$base} = $pkg;
1005
1006# no strict 'refs';
1007# @{"$pkg\::ISA"} = ext::;
1008
1009 register $base, $pkg;
1010}
1011
1012sub unload_extension {
1013 my ($pkg) = @_;
1014
1015 warn "removing extension $pkg\n";
1016
1017 # remove hooks
1018 #TODO
1019# for my $idx (0 .. $#PLUGIN_EVENT) {
1020# delete $hook[$idx]{$pkg};
1021# }
1022
1023 # remove commands
1024 for my $name (keys %COMMAND) {
1025 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1026
1027 if (@cb) {
1028 $COMMAND{$name} = \@cb;
1029 } else {
1030 delete $COMMAND{$name};
1031 }
1032 }
1033
1034 # remove extcmds
1035 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1036 delete $EXTCMD{$name};
1037 }
1038
1039 if (my $cb = $pkg->can ("unload")) {
1040 eval {
1041 $cb->($pkg);
1042 1
1043 } or warn "$pkg unloaded, but with errors: $@";
1044 }
1045
1046 Symbol::delete_package $pkg;
1047} 1046}
1048 1047
1049sub load_extensions { 1048sub load_extensions {
1050 for my $ext (<$LIBDIR/*.ext>) { 1049 for my $ext (<$LIBDIR/*.ext>) {
1051 next unless -r $ext; 1050 next unless -r $ext;
… …
1069}; 1068};
1070 1069
1071cf::map->attach (prio => -10000, package => cf::mapsupport::); 1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1072 1071
1073############################################################################# 1072#############################################################################
1074# load/save perl data associated with player->ob objects
1075
1076sub all_objects(@) {
1077 @_, map all_objects ($_->inv), @_
1078}
1079
1080# TODO: compatibility cruft, remove when no longer needed
1081cf::player->attach (
1082 on_load => sub {
1083 my ($pl, $path) = @_;
1084
1085 for my $o (all_objects $pl->ob) {
1086 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1087 $o->set_ob_key_value ("_perl_data");
1088
1089 %$o = %{ Storable::thaw pack "H*", $value };
1090 }
1091 }
1092 },
1093);
1094
1095#############################################################################
1096 1073
1097=head2 CORE EXTENSIONS 1074=head2 CORE EXTENSIONS
1098 1075
1099Functions and methods that extend core crossfire objects. 1076Functions and methods that extend core crossfire objects.
1100 1077
… …
1225 my @logins; 1202 my @logins;
1226 1203
1227 for my $login (@$dirs) { 1204 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1205 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next; 1206 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag 1207 $buf !~ /^password -------------$/m or next; # official not-valid tag
1231 1208
1232 utf8::decode $login; 1209 utf8::decode $login;
1233 push @logins, $login; 1210 push @logins, $login;
1234 } 1211 }
1235 1212
… …
1252 my @paths; 1229 my @paths;
1253 1230
1254 for (@$files) { 1231 for (@$files) {
1255 utf8::decode $_; 1232 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/; 1233 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/; 1234 next unless /^$PATH_SEP/o;
1258 1235
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 } 1237 }
1262 1238
1263 \@paths 1239 \@paths
1264} 1240}
… …
1298 1274
1299sub generate_random_map { 1275sub generate_random_map {
1300 my ($path, $rmp) = @_; 1276 my ($path, $rmp) = @_;
1301 1277
1302 # mit "rum" bekleckern, nicht 1278 # mit "rum" bekleckern, nicht
1303 cf::map::_create_random_map 1279 cf::map::_create_random_map (
1304 $path, 1280 $path,
1305 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1306 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1307 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1308 $rmp->{exit_on_final_map}, 1284 $rmp->{exit_on_final_map},
… …
1310 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1286 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1311 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1287 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1312 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1288 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1313 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1289 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1314 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1315 (cf::region::find $rmp->{region}) 1291 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 )
1316} 1293}
1317 1294
1318# and all this just because we cannot iterate over 1295# and all this just because we cannot iterate over
1319# all maps in C++... 1296# all maps in C++...
1320sub change_all_map_light { 1297sub change_all_map_light {
… …
1322 1299
1323 $_->change_map_light ($change) 1300 $_->change_map_light ($change)
1324 for grep $_->outdoor, values %cf::MAP; 1301 for grep $_->outdoor, values %cf::MAP;
1325} 1302}
1326 1303
1327sub try_load_header($) { 1304sub load_map_header($) {
1328 my ($path) = @_; 1305 my ($path) = @_;
1329 1306
1330 utf8::encode $path; 1307 utf8::encode $path;
1331 aio_open $path, O_RDONLY, 0 1308 aio_open $path, O_RDONLY, 0
1332 or return; 1309 or return;
1333 1310
1334 my $map = cf::map::new 1311 my $map = cf::map::new
1335 or return; 1312 or return;
1336 1313
1337 # for better error messages only, will be overwritten 1314 # for better error messages only, will be overwritten later
1338 $map->path ($path); 1315 $map->path ($path);
1339 1316
1340 $map->load_header ($path) 1317 $map->load_header ($path)
1341 or return; 1318 or return;
1342 1319
… …
1358 1335
1359 $cf::MAP{$key} || do { 1336 $cf::MAP{$key} || do {
1360 my $guard = cf::lock_acquire "map_find:$key"; 1337 my $guard = cf::lock_acquire "map_find:$key";
1361 1338
1362 # do it the slow way 1339 # do it the slow way
1363 my $map = try_load_header $path->save_path; 1340 my $map = $path->load_temp;
1364 1341
1365 Coro::cede; 1342 Coro::cede;
1366 1343
1367 if ($map) { 1344 if ($map) {
1368 $map->last_access ((delete $map->{last_access}) 1345 $map->last_access ((delete $map->{last_access})
1369 || $cf::RUNTIME); #d# 1346 || $cf::RUNTIME); #d#
1370 # safety 1347 # safety
1371 $map->{instantiate_time} = $cf::RUNTIME 1348 $map->{instantiate_time} = $cf::RUNTIME
1372 if $map->{instantiate_time} > $cf::RUNTIME; 1349 if $map->{instantiate_time} > $cf::RUNTIME;
1373 } else { 1350 } else {
1374 if (my $rmp = $path->random_map_params) { 1351 $map = $path->load_orig
1375 $map = generate_random_map $key, $rmp;
1376 } else {
1377 $map = try_load_header $path->load_path;
1378 }
1379
1380 $map or return; 1352 or return;
1381 1353
1382 $map->{load_original} = 1; 1354 $map->{load_original} = 1;
1383 $map->{instantiate_time} = $cf::RUNTIME; 1355 $map->{instantiate_time} = $cf::RUNTIME;
1384 $map->last_access ($cf::RUNTIME); 1356 $map->last_access ($cf::RUNTIME);
1385 $map->instantiate; 1357 $map->instantiate;
… …
1437 1409
1438 if ($self->{path}->is_style_map) { 1410 if ($self->{path}->is_style_map) {
1439 $self->{deny_save} = 1; 1411 $self->{deny_save} = 1;
1440 $self->{deny_reset} = 1; 1412 $self->{deny_reset} = 1;
1441 } else { 1413 } else {
1414 $self->decay_objects;
1442 $self->fix_auto_apply; 1415 $self->fix_auto_apply;
1443 $self->decay_objects;
1444 $self->update_buttons; 1416 $self->update_buttons;
1445 $self->set_darkness_map; 1417 $self->set_darkness_map;
1446 $self->difficulty ($self->estimate_difficulty) 1418 $self->difficulty ($self->estimate_difficulty)
1447 unless $self->difficulty; 1419 unless $self->difficulty;
1448 $self->activate; 1420 $self->activate;
… …
1451 Coro::cede; 1423 Coro::cede;
1452 1424
1453 $self->in_memory (cf::MAP_IN_MEMORY); 1425 $self->in_memory (cf::MAP_IN_MEMORY);
1454} 1426}
1455 1427
1428# find and load all maps in the 3x3 area around a map
1429sub load_diag {
1430 my ($map) = @_;
1431
1432 my @diag; # diagonal neighbours
1433
1434 for (0 .. 3) {
1435 my $neigh = $map->tile_path ($_)
1436 or next;
1437 $neigh = find $neigh, $map
1438 or next;
1439 $neigh->load;
1440
1441 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1442 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1443 }
1444
1445 for (@diag) {
1446 my $neigh = find @$_
1447 or next;
1448 $neigh->load;
1449 }
1450}
1451
1456sub find_sync { 1452sub find_sync {
1457 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1458 1454
1459 cf::sync_job { cf::map::find $path, $origin } 1455 cf::sync_job { find $path, $origin }
1460} 1456}
1461 1457
1462sub do_load_sync { 1458sub do_load_sync {
1463 my ($map) = @_; 1459 my ($map) = @_;
1464 1460
1465 cf::sync_job { $map->load }; 1461 cf::sync_job { $map->load };
1462}
1463
1464our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async {
1466 while () {
1467 while (%MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path
1473 or next;
1474 $map->load;
1475 }
1476 Coro::schedule;
1477 }
1478};
1479
1480sub find_async {
1481 my ($path, $origin) = @_;
1482
1483 $path = new cf::path $path, $origin && $origin->path;
1484 my $key = $path->as_string;
1485
1486 if (my $map = $cf::MAP{$key}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 }
1489
1490 $MAP_PREFETCH{$key} = $path;
1491 $MAP_PREFETCHER->ready;
1492
1493 ()
1466} 1494}
1467 1495
1468sub save { 1496sub save {
1469 my ($self) = @_; 1497 my ($self) = @_;
1470 1498
… …
1528 my ($self) = @_; 1556 my ($self) = @_;
1529 1557
1530 $self->reset_at <= $cf::RUNTIME 1558 $self->reset_at <= $cf::RUNTIME
1531} 1559}
1532 1560
1533sub unlink_save {
1534 my ($self) = @_;
1535
1536 utf8::encode (my $save = $self->{path}->save_path);
1537 aioreq_pri 3; IO::AIO::aio_unlink $save;
1538 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1539}
1540
1541sub rename { 1561sub rename {
1542 my ($self, $new_path) = @_; 1562 my ($self, $new_path) = @_;
1543 1563
1544 $self->unlink_save; 1564 $self->{path}->unlink_save;
1545 1565
1546 delete $cf::MAP{$self->path}; 1566 delete $cf::MAP{$self->path};
1547 $self->{path} = new cf::path $new_path; 1567 $self->{path} = new cf::path $new_path;
1548 $self->path ($self->{path}->as_string); 1568 $self->path ($self->{path}->as_string);
1549 $cf::MAP{$self->path} = $self; 1569 $cf::MAP{$self->path} = $self;
… …
1563 1583
1564 delete $cf::MAP{$self->path}; 1584 delete $cf::MAP{$self->path};
1565 1585
1566 $_->clear_links_to ($self) for values %cf::MAP; 1586 $_->clear_links_to ($self) for values %cf::MAP;
1567 1587
1568 $self->unlink_save; 1588 $self->{path}->unlink_save;
1569 $self->destroy; 1589 $self->destroy;
1570} 1590}
1571 1591
1572my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1573 1593
… …
1588 } 1608 }
1589 1609
1590 $map 1610 $map
1591} 1611}
1592 1612
1593sub emergency_save { 1613=item cf::map::unique_maps
1594 my $freeze_guard = cf::freeze_mainloop;
1595 1614
1596 warn "enter emergency perl save\n"; 1615Returns an arrayref of cf::path's of all shared maps that have
1616instantiated unique items. May block.
1597 1617
1598 cf::sync_job { 1618=cut
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602 1619
1603 warn "begin emergency map save\n"; 1620sub unique_maps() {
1604 $_->save for values %cf::MAP; 1621 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1605 warn "end emergency map save\n"; 1622 or return;
1623
1624 my @paths;
1625
1626 for (@$files) {
1627 utf8::decode $_;
1628 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o;
1630
1631 push @paths, new cf::path $_;
1606 }; 1632 }
1607 1633
1608 warn "leave emergency perl save\n"; 1634 \@paths
1609} 1635}
1610 1636
1611package cf; 1637package cf;
1612 1638
1613=back 1639=back
1614 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1615 1667
1616=head3 cf::object::player 1668=head3 cf::object::player
1617 1669
1618=over 4 1670=over 4
1619 1671
… …
1711 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1712 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1713 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1714 1766
1715 $map->load; 1767 $map->load;
1768 $map->load_diag;
1716 1769
1717 return unless $self->contr->active; 1770 return unless $self->contr->active;
1718 $self->activate_recursive; 1771 $self->activate_recursive;
1719 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1720} 1773}
… …
1757 1810
1758sub cf::object::player::goto { 1811sub cf::object::player::goto {
1759 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1760 1813
1761 $path = new cf::path $path; 1814 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763 1815
1764 $self->enter_link; 1816 $self->enter_link;
1765 1817
1766 (async { 1818 (async {
1767 my $map = cf::map::find $path->as_string; 1819 my $map = cf::map::find $path->as_string;
… …
1844 1896
1845 1; 1897 1;
1846 }) { 1898 }) {
1847 $self->message ("Something went wrong deep within the crossfire server. " 1899 $self->message ("Something went wrong deep within the crossfire server. "
1848 . "I'll try to bring you back to the map you were before. " 1900 . "I'll try to bring you back to the map you were before. "
1849 . "Please report this to the dungeon master", 1901 . "Please report this to the dungeon master!",
1850 cf::NDI_UNIQUE | cf::NDI_RED); 1902 cf::NDI_UNIQUE | cf::NDI_RED);
1851 1903
1852 warn "ERROR in enter_exit: $@"; 1904 warn "ERROR in enter_exit: $@";
1853 $self->leave_link; 1905 $self->leave_link;
1854 } 1906 }
… …
2207 load_extensions; 2259 load_extensions;
2208 Event::loop; 2260 Event::loop;
2209} 2261}
2210 2262
2211############################################################################# 2263#############################################################################
2212# initialisation 2264# initialisation and cleanup
2265
2266# install some emergency cleanup handlers
2267BEGIN {
2268 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal (
2270 data => WF_AUTOCANCEL,
2271 signal => $signal,
2272 cb => sub {
2273 cf::cleanup "SIG$signal";
2274 },
2275 );
2276 }
2277}
2278
2279sub emergency_save() {
2280 my $freeze_guard = cf::freeze_mainloop;
2281
2282 warn "enter emergency perl save\n";
2283
2284 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously.
2288 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next;
2292 $pl->save;
2293 }
2294 warn "end emergency player save\n";
2295
2296 warn "begin emergency map save\n";
2297 for my $path (keys %cf::MAP) {
2298 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next;
2300 $map->save;
2301 }
2302 warn "end emergency map save\n";
2303 };
2304
2305 warn "leave emergency perl save\n";
2306}
2213 2307
2214sub reload() { 2308sub reload() {
2215 # can/must only be called in main 2309 # can/must only be called in main
2216 if ($Coro::current != $Coro::main) { 2310 if ($Coro::current != $Coro::main) {
2217 warn "can only reload from main coroutine\n"; 2311 warn "can only reload from main coroutine\n";
2218 return; 2312 return;
2219 } 2313 }
2220 2314
2221 warn "reloading..."; 2315 warn "reloading...";
2222 2316
2317 warn "freezing server";
2223 my $guard = freeze_mainloop; 2318 my $guard = freeze_mainloop;
2224 cf::emergency_save; 2319 cf::emergency_save;
2225 2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324
2226 eval { 2325 eval {
2227 # if anything goes wrong in here, we should simply crash as we already saved 2326 # if anything goes wrong in here, we should simply crash as we already saved
2228 2327
2229 # cancel all watchers 2328 warn "cancel all watchers";
2230 for (Event::all_watchers) { 2329 for (Event::all_watchers) {
2231 $_->cancel if $_->data & WF_AUTOCANCEL; 2330 $_->cancel if $_->data & WF_AUTOCANCEL;
2232 } 2331 }
2233 2332
2234 # cancel all extension coros 2333 warn "cancel all extension coros";
2235 $_->cancel for values %EXT_CORO; 2334 $_->cancel for values %EXT_CORO;
2236 %EXT_CORO = (); 2335 %EXT_CORO = ();
2237 2336
2337 warn "remove commands";
2338 %COMMAND = ();
2339
2340 warn "remove ext commands";
2341 %EXTCMD = ();
2342
2238 # unload all extensions 2343 warn "unload/nuke all extensions";
2239 for (@exts) { 2344 for my $pkg (@EXTS) {
2240 warn "unloading <$_>"; 2345 warn "... unloading $pkg";
2241 unload_extension $_; 2346
2347 if (my $cb = $pkg->can ("unload")) {
2348 eval {
2349 $cb->($pkg);
2350 1
2351 } or warn "$pkg unloaded, but with errors: $@";
2242 } 2352 }
2243 2353
2354 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg;
2356 }
2357
2244 # unload all modules loaded from $LIBDIR 2358 warn "unload all perl modules loaded from $LIBDIR";
2245 while (my ($k, $v) = each %INC) { 2359 while (my ($k, $v) = each %INC) {
2246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2247 2361
2248 warn "removing <$k>"; 2362 warn "removing <$k>";
2249 delete $INC{$k}; 2363 delete $INC{$k};
… …
2256 } 2370 }
2257 2371
2258 Symbol::delete_package $k; 2372 Symbol::delete_package $k;
2259 } 2373 }
2260 2374
2261 # sync database to disk
2262 cf::db_sync;
2263 IO::AIO::flush;
2264
2265 # get rid of safe::, as good as possible 2375 warn "get rid of safe::, as good as possible";
2266 Symbol::delete_package "safe::$_" 2376 Symbol::delete_package "safe::$_"
2267 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2268 2378
2269 # remove register_script_function callbacks
2270 # TODO
2271
2272 # unload cf.pm "a bit" 2379 warn "unload cf.pm \"a bit\"";
2273 delete $INC{"cf.pm"}; 2380 delete $INC{"cf.pm"};
2274 2381
2275 # don't, removes xs symbols, too, 2382 # don't, removes xs symbols, too,
2276 # and global variables created in xs 2383 # and global variables created in xs
2277 #Symbol::delete_package __PACKAGE__; 2384 #Symbol::delete_package __PACKAGE__;
2278 2385
2279 # reload cf.pm
2280 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2281 require cf; 2387 require cf;
2282 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2283 2389
2284 # load config and database again 2390 warn "load config and database again";
2285 cf::cfg_load; 2391 cf::cfg_load;
2286 cf::db_load; 2392 cf::db_load;
2287 2393
2288 # load extensions
2289 warn "load extensions"; 2394 warn "load extensions";
2290 cf::load_extensions; 2395 cf::load_extensions;
2291 2396
2292 # reattach attachments to objects 2397 warn "reattach attachments to objects/players";
2293 warn "reattach";
2294 _global_reattach; 2398 _global_reattach;
2399 warn "reattach attachments to maps";
2295 reattach $_ for values %MAP; 2400 reattach $_ for values %MAP;
2296 }; 2401 };
2297 2402
2298 if ($@) { 2403 if ($@) {
2299 warn $@; 2404 warn $@;
2300 warn "error while reloading, exiting."; 2405 warn "error while reloading, exiting.";
2301 exit 1; 2406 exit 1;
2302 } 2407 }
2303 2408
2304 warn "reloaded successfully"; 2409 warn "reloaded";
2305}; 2410};
2306 2411
2307############################################################################# 2412#############################################################################
2308 2413
2309unless ($LINK_MAP) { 2414unless ($LINK_MAP) {
… …
2345 $LINK_MAP->{deny_reset} = 1; 2450 $LINK_MAP->{deny_reset} = 1;
2346 2451
2347 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2348} 2453}
2349 2454
2350register "<global>", __PACKAGE__;
2351
2352register_command "reload" => sub { 2455register_command "reload" => sub {
2353 my ($who, $arg) = @_; 2456 my ($who, $arg) = @_;
2354 2457
2355 if ($who->flag (FLAG_WIZ)) { 2458 if ($who->flag (FLAG_WIZ)) {
2356 $who->message ("start of reload."); 2459 $who->message ("start of reload.");
… …
2365 reentrant => 0, 2468 reentrant => 0,
2366 prio => 0, 2469 prio => 0,
2367 at => $NEXT_TICK || $TICK, 2470 at => $NEXT_TICK || $TICK,
2368 data => WF_AUTOCANCEL, 2471 data => WF_AUTOCANCEL,
2369 cb => sub { 2472 cb => sub {
2473 $NOW = Event::time;
2474
2370 cf::server_tick; # one server iteration 2475 cf::server_tick; # one server iteration
2371 $RUNTIME += $TICK; 2476 $RUNTIME += $TICK;
2372 $NEXT_TICK += $TICK; 2477 $NEXT_TICK += $TICK;
2478
2479 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2373 2481
2374 # if we are delayed by four ticks or more, skip them all 2482 # if we are delayed by four ticks or more, skip them all
2375 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2376 2484
2377 $TICK_WATCHER->at ($NEXT_TICK); 2485 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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