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.161 by root, Thu Jan 11 00:16:58 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;
… …
452 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
453 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} 492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
454 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
455} 494}
456 495
457# the unique path, might be eq to save_path 496# the unique path, undef == no special unique path
458sub uniq_path { 497sub uniq_path {
459 my ($self) = @_; 498 my ($self) = @_;
460 499
461 $self->{user_rel} || $self->{random}
462 ? undef
463 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 500 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} 501}
472 502
473# this is somewhat ugly, but style maps do need special treatment 503# this is somewhat ugly, but style maps do need special treatment
474sub is_style_map { 504sub is_style_map {
475 $_[0]{path} =~ m{^/styles/} 505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
476} 518}
477 519
478package cf; 520package cf;
479 521
480############################################################################# 522#############################################################################
… …
930=cut 972=cut
931 973
932sub register_extcmd { 974sub register_extcmd {
933 my ($name, $cb) = @_; 975 my ($name, $cb) = @_;
934 976
935 my $caller = caller;
936 #warn "registering extcmd '$name' to '$caller'";
937
938 $EXTCMD{$name} = [$cb, $caller]; 977 $EXTCMD{$name} = $cb;
939} 978}
940 979
941cf::player->attach ( 980cf::player->attach (
942 on_command => sub { 981 on_command => sub {
943 my ($pl, $name, $params) = @_; 982 my ($pl, $name, $params) = @_;
… …
956 995
957 my $msg = eval { from_json $buf }; 996 my $msg = eval { from_json $buf };
958 997
959 if (ref $msg) { 998 if (ref $msg) {
960 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 999 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
961 if (my %reply = $cb->[0]->($pl, $msg)) { 1000 if (my %reply = $cb->($pl, $msg)) {
962 $pl->ext_reply ($msg->{msgid}, %reply); 1001 $pl->ext_reply ($msg->{msgid}, %reply);
963 } 1002 }
964 } 1003 }
965 } else { 1004 } else {
966 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1005 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
968 1007
969 cf::override; 1008 cf::override;
970 }, 1009 },
971); 1010);
972 1011
973sub register {
974 my ($base, $pkg) = @_;
975
976 #TODO
977}
978
979sub load_extension { 1012sub load_extension {
980 my ($path) = @_; 1013 my ($path) = @_;
981 1014
982 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1015 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
983 my $base = $1; 1016 my $base = $1;
984 my $pkg = $1; 1017 my $pkg = $1;
985 $pkg =~ s/[^[:word:]]/_/g; 1018 $pkg =~ s/[^[:word:]]/_/g;
986 $pkg = "ext::$pkg"; 1019 $pkg = "ext::$pkg";
987 1020
988 warn "loading '$path' into '$pkg'\n"; 1021 warn "... loading '$path' into '$pkg'\n";
989 1022
990 open my $fh, "<:utf8", $path 1023 open my $fh, "<:utf8", $path
991 or die "$path: $!"; 1024 or die "$path: $!";
992 1025
993 my $source = 1026 my $source =
… …
998 1031
999 eval $source 1032 eval $source
1000 or die $@ ? "$path: $@\n" 1033 or die $@ ? "$path: $@\n"
1001 : "extension disabled.\n"; 1034 : "extension disabled.\n";
1002 1035
1003 push @exts, $pkg; 1036 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} 1037}
1048 1038
1049sub load_extensions { 1039sub load_extensions {
1050 for my $ext (<$LIBDIR/*.ext>) { 1040 for my $ext (<$LIBDIR/*.ext>) {
1051 next unless -r $ext; 1041 next unless -r $ext;
… …
1069}; 1059};
1070 1060
1071cf::map->attach (prio => -10000, package => cf::mapsupport::); 1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1072 1062
1073############################################################################# 1063#############################################################################
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 1064
1097=head2 CORE EXTENSIONS 1065=head2 CORE EXTENSIONS
1098 1066
1099Functions and methods that extend core crossfire objects. 1067Functions and methods that extend core crossfire objects.
1100 1068
… …
1225 my @logins; 1193 my @logins;
1226 1194
1227 for my $login (@$dirs) { 1195 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1196 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next; 1197 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag 1198 $buf !~ /^password -------------$/m or next; # official not-valid tag
1231 1199
1232 utf8::decode $login; 1200 utf8::decode $login;
1233 push @logins, $login; 1201 push @logins, $login;
1234 } 1202 }
1235 1203
… …
1252 my @paths; 1220 my @paths;
1253 1221
1254 for (@$files) { 1222 for (@$files) {
1255 utf8::decode $_; 1223 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/; 1224 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/; 1225 next unless /^$PATH_SEP/o;
1258 1226
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 } 1228 }
1262 1229
1263 \@paths 1230 \@paths
1264} 1231}
… …
1322 1289
1323 $_->change_map_light ($change) 1290 $_->change_map_light ($change)
1324 for grep $_->outdoor, values %cf::MAP; 1291 for grep $_->outdoor, values %cf::MAP;
1325} 1292}
1326 1293
1327sub try_load_header($) { 1294sub load_map_header($) {
1328 my ($path) = @_; 1295 my ($path) = @_;
1329 1296
1330 utf8::encode $path; 1297 utf8::encode $path;
1331 aio_open $path, O_RDONLY, 0 1298 aio_open $path, O_RDONLY, 0
1332 or return; 1299 or return;
1333 1300
1334 my $map = cf::map::new 1301 my $map = cf::map::new
1335 or return; 1302 or return;
1336 1303
1337 # for better error messages only, will be overwritten 1304 # for better error messages only, will be overwritten later
1338 $map->path ($path); 1305 $map->path ($path);
1339 1306
1340 $map->load_header ($path) 1307 $map->load_header ($path)
1341 or return; 1308 or return;
1342 1309
… …
1358 1325
1359 $cf::MAP{$key} || do { 1326 $cf::MAP{$key} || do {
1360 my $guard = cf::lock_acquire "map_find:$key"; 1327 my $guard = cf::lock_acquire "map_find:$key";
1361 1328
1362 # do it the slow way 1329 # do it the slow way
1363 my $map = try_load_header $path->save_path; 1330 my $map = $path->load_temp;
1364 1331
1365 Coro::cede; 1332 Coro::cede;
1366 1333
1367 if ($map) { 1334 if ($map) {
1368 $map->last_access ((delete $map->{last_access}) 1335 $map->last_access ((delete $map->{last_access})
1369 || $cf::RUNTIME); #d# 1336 || $cf::RUNTIME); #d#
1370 # safety 1337 # safety
1371 $map->{instantiate_time} = $cf::RUNTIME 1338 $map->{instantiate_time} = $cf::RUNTIME
1372 if $map->{instantiate_time} > $cf::RUNTIME; 1339 if $map->{instantiate_time} > $cf::RUNTIME;
1373 } else { 1340 } else {
1374 if (my $rmp = $path->random_map_params) { 1341 $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; 1342 or return;
1381 1343
1382 $map->{load_original} = 1; 1344 $map->{load_original} = 1;
1383 $map->{instantiate_time} = $cf::RUNTIME; 1345 $map->{instantiate_time} = $cf::RUNTIME;
1384 $map->last_access ($cf::RUNTIME); 1346 $map->last_access ($cf::RUNTIME);
1385 $map->instantiate; 1347 $map->instantiate;
… …
1451 Coro::cede; 1413 Coro::cede;
1452 1414
1453 $self->in_memory (cf::MAP_IN_MEMORY); 1415 $self->in_memory (cf::MAP_IN_MEMORY);
1454} 1416}
1455 1417
1418# find and load all maps in the 3x3 area around a map
1419sub load_diag {
1420 my ($map) = @_;
1421
1422 my @diag; # diagonal neighbours
1423
1424 for (0 .. 3) {
1425 my $neigh = $map->tile_path ($_)
1426 or next;
1427 $neigh = find $neigh, $map
1428 or next;
1429 $neigh->load;
1430
1431 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1432 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1433 }
1434
1435 for (@diag) {
1436 my $neigh = find @$_
1437 or next;
1438 $neigh->load;
1439 }
1440}
1441
1456sub find_sync { 1442sub find_sync {
1457 my ($path, $origin) = @_; 1443 my ($path, $origin) = @_;
1458 1444
1459 cf::sync_job { cf::map::find $path, $origin } 1445 cf::sync_job { find $path, $origin }
1460} 1446}
1461 1447
1462sub do_load_sync { 1448sub do_load_sync {
1463 my ($map) = @_; 1449 my ($map) = @_;
1464 1450
1465 cf::sync_job { $map->load }; 1451 cf::sync_job { $map->load };
1452}
1453
1454our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async {
1456 while () {
1457 while (%MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465 }
1466 Coro::schedule;
1467 }
1468};
1469
1470sub find_async {
1471 my ($path, $origin) = @_;
1472
1473 $path = new cf::path $path, $origin && $origin->path;
1474 my $key = $path->as_string;
1475
1476 if (my $map = $cf::MAP{$key}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 }
1479
1480 $MAP_PREFETCH{$key} = $path;
1481 $MAP_PREFETCHER->ready;
1482
1483 ()
1466} 1484}
1467 1485
1468sub save { 1486sub save {
1469 my ($self) = @_; 1487 my ($self) = @_;
1470 1488
… …
1588 } 1606 }
1589 1607
1590 $map 1608 $map
1591} 1609}
1592 1610
1593sub emergency_save { 1611=item cf::map::unique_maps
1594 my $freeze_guard = cf::freeze_mainloop;
1595 1612
1596 warn "enter emergency perl save\n"; 1613Returns an arrayref of cf::path's of all shared maps that have
1614instantiated unique items. May block.
1597 1615
1598 cf::sync_job { 1616=cut
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602 1617
1603 warn "begin emergency map save\n"; 1618sub unique_maps() {
1604 $_->save for values %cf::MAP; 1619 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1605 warn "end emergency map save\n"; 1620 or return;
1621
1622 my @paths;
1623
1624 for (@$files) {
1625 utf8::decode $_;
1626 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o;
1628
1629 push @paths, new cf::path $_;
1606 }; 1630 }
1607 1631
1608 warn "leave emergency perl save\n"; 1632 \@paths
1609} 1633}
1610 1634
1611package cf; 1635package cf;
1612 1636
1613=back 1637=back
1614 1638
1639=head3 cf::object
1640
1641=cut
1642
1643package cf::object;
1644
1645=over 4
1646
1647=item $ob->inv_recursive
1648
1649Returns the inventory of the object _and_ their inventories, recursively.
1650
1651=cut
1652
1653sub inv_recursive_;
1654sub inv_recursive_ {
1655 map { $_, inv_recursive_ $_->inv } @_
1656}
1657
1658sub inv_recursive {
1659 inv_recursive_ inv $_[0]
1660}
1661
1662package cf;
1663
1664=back
1615 1665
1616=head3 cf::object::player 1666=head3 cf::object::player
1617 1667
1618=over 4 1668=over 4
1619 1669
… …
1711 # use -1 or undef as default coordinates, not 0, 0 1761 # use -1 or undef as default coordinates, not 0, 0
1712 ($x, $y) = ($map->enter_x, $map->enter_y) 1762 ($x, $y) = ($map->enter_x, $map->enter_y)
1713 if $x <=0 && $y <= 0; 1763 if $x <=0 && $y <= 0;
1714 1764
1715 $map->load; 1765 $map->load;
1766 $map->load_diag;
1716 1767
1717 return unless $self->contr->active; 1768 return unless $self->contr->active;
1718 $self->activate_recursive; 1769 $self->activate_recursive;
1719 $self->enter_map ($map, $x, $y); 1770 $self->enter_map ($map, $x, $y);
1720} 1771}
… …
1757 1808
1758sub cf::object::player::goto { 1809sub cf::object::player::goto {
1759 my ($self, $path, $x, $y) = @_; 1810 my ($self, $path, $x, $y) = @_;
1760 1811
1761 $path = new cf::path $path; 1812 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763 1813
1764 $self->enter_link; 1814 $self->enter_link;
1765 1815
1766 (async { 1816 (async {
1767 my $map = cf::map::find $path->as_string; 1817 my $map = cf::map::find $path->as_string;
… …
1844 1894
1845 1; 1895 1;
1846 }) { 1896 }) {
1847 $self->message ("Something went wrong deep within the crossfire server. " 1897 $self->message ("Something went wrong deep within the crossfire server. "
1848 . "I'll try to bring you back to the map you were before. " 1898 . "I'll try to bring you back to the map you were before. "
1849 . "Please report this to the dungeon master", 1899 . "Please report this to the dungeon master!",
1850 cf::NDI_UNIQUE | cf::NDI_RED); 1900 cf::NDI_UNIQUE | cf::NDI_RED);
1851 1901
1852 warn "ERROR in enter_exit: $@"; 1902 warn "ERROR in enter_exit: $@";
1853 $self->leave_link; 1903 $self->leave_link;
1854 } 1904 }
… …
2207 load_extensions; 2257 load_extensions;
2208 Event::loop; 2258 Event::loop;
2209} 2259}
2210 2260
2211############################################################################# 2261#############################################################################
2212# initialisation 2262# initialisation and cleanup
2263
2264# install some emergency cleanup handlers
2265BEGIN {
2266 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal (
2268 data => WF_AUTOCANCEL,
2269 signal => $signal,
2270 cb => sub {
2271 cf::cleanup "SIG$signal";
2272 },
2273 );
2274 }
2275}
2276
2277sub emergency_save() {
2278 my $freeze_guard = cf::freeze_mainloop;
2279
2280 warn "enter emergency perl save\n";
2281
2282 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously.
2286 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next;
2290 $pl->save;
2291 }
2292 warn "end emergency player save\n";
2293
2294 warn "begin emergency map save\n";
2295 for my $path (keys %cf::MAP) {
2296 my $map = $cf::MAP{$path} or next;
2297 $map->valid or next;
2298 $map->save;
2299 }
2300 warn "end emergency map save\n";
2301 };
2302
2303 warn "leave emergency perl save\n";
2304}
2213 2305
2214sub reload() { 2306sub reload() {
2215 # can/must only be called in main 2307 # can/must only be called in main
2216 if ($Coro::current != $Coro::main) { 2308 if ($Coro::current != $Coro::main) {
2217 warn "can only reload from main coroutine\n"; 2309 warn "can only reload from main coroutine\n";
2218 return; 2310 return;
2219 } 2311 }
2220 2312
2221 warn "reloading..."; 2313 warn "reloading...";
2222 2314
2315 warn "freezing server";
2223 my $guard = freeze_mainloop; 2316 my $guard = freeze_mainloop;
2224 cf::emergency_save; 2317 cf::emergency_save;
2225 2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322
2226 eval { 2323 eval {
2227 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2228 2325
2229 # cancel all watchers 2326 warn "cancel all watchers";
2230 for (Event::all_watchers) { 2327 for (Event::all_watchers) {
2231 $_->cancel if $_->data & WF_AUTOCANCEL; 2328 $_->cancel if $_->data & WF_AUTOCANCEL;
2232 } 2329 }
2233 2330
2234 # cancel all extension coros 2331 warn "cancel all extension coros";
2235 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2236 %EXT_CORO = (); 2333 %EXT_CORO = ();
2237 2334
2335 warn "remove commands";
2336 %COMMAND = ();
2337
2338 warn "remove ext commands";
2339 %EXTCMD = ();
2340
2238 # unload all extensions 2341 warn "unload/nuke all extensions";
2239 for (@exts) { 2342 for my $pkg (@EXTS) {
2240 warn "unloading <$_>"; 2343 warn "... unloading $pkg";
2241 unload_extension $_; 2344
2345 if (my $cb = $pkg->can ("unload")) {
2346 eval {
2347 $cb->($pkg);
2348 1
2349 } or warn "$pkg unloaded, but with errors: $@";
2242 } 2350 }
2243 2351
2352 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg;
2354 }
2355
2244 # unload all modules loaded from $LIBDIR 2356 warn "unload all perl modules loaded from $LIBDIR";
2245 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2247 2359
2248 warn "removing <$k>"; 2360 warn "removing <$k>";
2249 delete $INC{$k}; 2361 delete $INC{$k};
… …
2256 } 2368 }
2257 2369
2258 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2259 } 2371 }
2260 2372
2261 # sync database to disk
2262 cf::db_sync;
2263 IO::AIO::flush;
2264
2265 # get rid of safe::, as good as possible 2373 warn "get rid of safe::, as good as possible";
2266 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2267 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2268 2376
2269 # remove register_script_function callbacks
2270 # TODO
2271
2272 # unload cf.pm "a bit" 2377 warn "unload cf.pm \"a bit\"";
2273 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2274 2379
2275 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2276 # and global variables created in xs 2381 # and global variables created in xs
2277 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2278 2383
2279 # reload cf.pm
2280 warn "reloading cf.pm"; 2384 warn "reloading cf.pm";
2281 require cf; 2385 require cf;
2282 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2283 2387
2284 # load config and database again 2388 warn "load config and database again";
2285 cf::cfg_load; 2389 cf::cfg_load;
2286 cf::db_load; 2390 cf::db_load;
2287 2391
2288 # load extensions
2289 warn "load extensions"; 2392 warn "load extensions";
2290 cf::load_extensions; 2393 cf::load_extensions;
2291 2394
2292 # reattach attachments to objects 2395 warn "reattach attachments to objects/players";
2293 warn "reattach";
2294 _global_reattach; 2396 _global_reattach;
2397 warn "reattach attachments to maps";
2295 reattach $_ for values %MAP; 2398 reattach $_ for values %MAP;
2296 }; 2399 };
2297 2400
2298 if ($@) { 2401 if ($@) {
2299 warn $@; 2402 warn $@;
2300 warn "error while reloading, exiting."; 2403 warn "error while reloading, exiting.";
2301 exit 1; 2404 exit 1;
2302 } 2405 }
2303 2406
2304 warn "reloaded successfully"; 2407 warn "reloaded";
2305}; 2408};
2306 2409
2307############################################################################# 2410#############################################################################
2308 2411
2309unless ($LINK_MAP) { 2412unless ($LINK_MAP) {
… …
2344 $LINK_MAP->{deny_save} = 1; 2447 $LINK_MAP->{deny_save} = 1;
2345 $LINK_MAP->{deny_reset} = 1; 2448 $LINK_MAP->{deny_reset} = 1;
2346 2449
2347 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2348} 2451}
2349
2350register "<global>", __PACKAGE__;
2351 2452
2352register_command "reload" => sub { 2453register_command "reload" => sub {
2353 my ($who, $arg) = @_; 2454 my ($who, $arg) = @_;
2354 2455
2355 if ($who->flag (FLAG_WIZ)) { 2456 if ($who->flag (FLAG_WIZ)) {
… …
2368 data => WF_AUTOCANCEL, 2469 data => WF_AUTOCANCEL,
2369 cb => sub { 2470 cb => sub {
2370 cf::server_tick; # one server iteration 2471 cf::server_tick; # one server iteration
2371 $RUNTIME += $TICK; 2472 $RUNTIME += $TICK;
2372 $NEXT_TICK += $TICK; 2473 $NEXT_TICK += $TICK;
2474
2475 $WAIT_FOR_TICK->broadcast;
2476 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2373 2477
2374 # if we are delayed by four ticks or more, skip them all 2478 # if we are delayed by four ticks or more, skip them all
2375 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2376 2480
2377 $TICK_WATCHER->at ($NEXT_TICK); 2481 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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