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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.455 by root, Sat Sep 27 08:17:40 2008 UTC

… …
63 63
64# configure various modules to our taste 64# configure various modules to our taste
65# 65#
66$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 74
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 76
74our %COMMAND = (); 77our %COMMAND = ();
75our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 81our %EXTCMD = ();
79our %EXTICMD = (); 82our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
82 85
83our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 87our @EVENT;
85 88
86our $CONFDIR = confdir; 89our $CONFDIR = confdir;
87our $DATADIR = datadir; 90our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
… …
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 130our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
129 132
133our @POST_INIT;
134
130binmode STDOUT; 135binmode STDOUT;
131binmode STDERR; 136binmode STDERR;
132 137
133# read virtual server time, if available 138# read virtual server time, if available
134unless ($RUNTIME || !-e $RUNTIMEFILE) { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
… …
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 308
304sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
306 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
307=item cf::lock_wait $string 326=item cf::lock_wait $string
308 327
309Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
310 329
311=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
338 return;#d# 357 return;#d#
339 }#d# 358 }#d#
340 359
341 # wait for lock, if any 360 # wait for lock, if any
342 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
343 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule; 364 Coro::schedule;
345 } 365 }
346} 366}
347 367
… …
730 750
731############################################################################# 751#############################################################################
732 752
733=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
734 754
735Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
738 758
739In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
790=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
791 811
792Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
794 814
795Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
797 817
798These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
799 819
800=over 4 820=over 4
… …
1388 1408
1389=back 1409=back
1390 1410
1391=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1392 1412
1393Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1394 1414
1395=cut 1415=cut
1396 1416
1397package cf::player; 1417package cf::player;
1398 1418
… …
1441 1461
1442sub exists($) { 1462sub exists($) {
1443 my ($login) = @_; 1463 my ($login) = @_;
1444 1464
1445 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1447} 1467}
1448 1468
1449sub find($) { 1469sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1471 my $login = $_[0];
… …
1622 } 1642 }
1623 1643
1624 \@paths 1644 \@paths
1625} 1645}
1626 1646
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1648
1629Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1630 1650
1631=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1632 1652
1633Sends an ext reply to the player. 1653Sends an ext reply to the player.
1634 1654
… …
2448 2468
2449=item $player_object->enter_link 2469=item $player_object->enter_link
2450 2470
2451Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2452 2472
2453The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2455 2477
2456Will never block. 2478Will never block.
2457 2479
2458=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2459 2481
… …
2517 2539
2518 $map->load; 2540 $map->load;
2519 $map->load_neighbours; 2541 $map->load_neighbours;
2520 2542
2521 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2522 $self->activate_recursive; 2545 $self->activate_recursive;
2523 2546
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2526} 2549}
… …
2689 $self->contr->savebed ($map, $x, $y) 2712 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2713 if $exit->flag (cf::FLAG_DAMNED);
2691 2714
2692 1 2715 1
2693 }) { 2716 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2721
2699 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2765 id => "infobox", 2788 id => "infobox",
2766 title => "Body Parts", 2789 title => "Body Parts",
2767 reply => undef, 2790 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2769 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2770 "c/uptime" => { 2799 "c/uptime" => {
2771 id => "infobox", 2800 id => "infobox",
2772 title => "Uptime", 2801 title => "Uptime",
2773 reply => undef, 2802 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
… …
2788); 2817);
2789 2818
2790sub cf::client::send_msg { 2819sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2792 2821
2793 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2794 2824
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 2826
2797 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
… …
3327 reload_treasures; 3357 reload_treasures;
3328 3358
3329 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3330} 3360}
3331 3361
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3362sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3364 or return;
3343 3365
3344 local $/; 3366 local $/;
… …
3376 seek $fh, 0, 0; 3398 seek $fh, 0, 0;
3377 print $fh $$; 3399 print $fh $$;
3378} 3400}
3379 3401
3380sub main { 3402sub main {
3381 atomic; 3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3417
3383 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3421 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3390 }; 3425 };
3391 3426
3392 { 3427 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3428
3429 cf::sync_job {
3430 reload_resources;
3394 reload_config; 3431 reload_config;
3395 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3396 load_extensions; 3445 load_extensions;
3397 3446
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3447 utime time, time, $RUNTIMEFILE;
3402 3448
3403 # no (long-running) fork's whatsoever before this point(!) 3449 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3405 3454
3406 EV::loop; 3455 EV::loop;
3407} 3456}
3408 3457
3409############################################################################# 3458#############################################################################
… …
3467 my $uuid = "$LOCALDIR/uuid"; 3516 my $uuid = "$LOCALDIR/uuid";
3468 3517
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3519 or return;
3471 3520
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3521 my $value = uuid_seq uuid_cur;
3522
3523 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3529 $uuid_skip = 0;
3474 3530
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3532 and return;
3477 3533
… …
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3624 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3625 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3627 }
3572 warn "cleared package #$pkg\n";#d# 3628 warn "cleared package $pkg\n";#d#
3573} 3629}
3574
3575our $RELOAD; # how many times to reload
3576 3630
3577sub do_reload_perl() { 3631sub do_reload_perl() {
3578 # can/must only be called in main 3632 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3580 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
… …
3675 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3679 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3680 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3681 3738
3682 1 3739 1
3683 } or do { 3740 } or do {
3684 warn $@; 3741 warn $@;
… …
3694 3751
3695sub reload_perl() { 3752sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3698 3755
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3757 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3702 }; 3759 };
3703} 3760}
3704 3761
… …
3832 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3833 3890
3834 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3837 async { 3895 async {
3838 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3839 3897
3840 my @bt = fork_call { 3898 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
… …
3852 } 3910 }
3853 3911
3854 @funcs 3912 @funcs
3855 }; 3913 };
3856 3914
3857 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 3918 --$_log_backtrace;
3860 }; 3919 };
3861 } else { 3920 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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