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.584 by root, Tue Oct 30 17:07:50 2012 UTC vs.
Revision 1.595 by root, Fri Nov 9 16:27:55 2012 UTC

… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
… …
220=item $cf::RUNTIME 226=item $cf::RUNTIME
221 227
222The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
223every server tick. 229every server tick.
224 230
225=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
226$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
227$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
228 234
229Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
230directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
231unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
232database environment. 238database environment.
… …
336)) { 342)) {
337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
338} 344}
339 345
340$EV::DIED = sub { 346$EV::DIED = sub {
341 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
342}; 348};
343 349
344############################################################################# 350#############################################################################
345 351
346sub fork_call(&@); 352sub fork_call(&@);
… …
1427=cut 1433=cut
1428 1434
1429############################################################################# 1435#############################################################################
1430# command handling &c 1436# command handling &c
1431 1437
1432=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1433 1439
1434Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1435$name. 1441$name.
1436 1442
1437=cut 1443=cut
… …
1443 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1444 1450
1445 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1446} 1452}
1447 1453
1448=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1449 1455
1450Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1451extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1452received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1453the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1454has logged in successfully. 1460has logged in successfully.
1455 1461
1456If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1457called.
1458 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1459=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1460 1470
1461Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1462exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1463are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1464is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1465log-in. 1475log-in.
1466 1476
1467If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1468called.
1469 1478
1470=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1471 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1472sub register_extcmd { 1486sub register_extcmd($$) {
1473 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1474 1488
1475 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1476} 1490}
1477 1491
1478sub register_exticmd { 1492sub register_async_extcmd($$) {
1479 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1480 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1481 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1482} 1508}
1483 1509
1484use File::Glob (); 1510use File::Glob ();
1485 1511
1486cf::player->attach ( 1512cf::player->attach (
… …
1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1503 1529
1504 if (ref $msg) { 1530 if (ref $msg) {
1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1506 1532
1507 my @reply;
1508
1509 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1510 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1511 } 1551 }
1512
1513 $pl->ext_reply ($reply, @reply)
1514 if $reply;
1515 1552
1516 } else { 1553 } else {
1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1518 } 1555 }
1519 1556
… …
1905} 1942}
1906 1943
1907=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1908 1945
1909Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1910
1911=item $player->ext_reply ($msgid, @msg)
1912
1913Sends an ext reply to the player.
1914
1915=cut
1916
1917sub ext_reply($$@) {
1918 my ($self, $id, @msg) = @_;
1919
1920 $self->ns->ext_reply ($id, @msg)
1921}
1922 1947
1923=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1924 1949
1925Sends an ext event to the client. 1950Sends an ext event to the client.
1926 1951
… …
3231=cut 3256=cut
3232 3257
3233sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
3234 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3235 3260
3236 if ($self->extcmd == 2) {
3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3238 } elsif ($self->extcmd == 1) { # TODO: remove
3239 push @msg, msgtype => "event_$type";
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3241 }
3242}
3243
3244=item $client->ext_reply ($msgid, @msg)
3245
3246Sends an ext reply to the client.
3247
3248=cut
3249
3250sub cf::client::ext_reply($$@) {
3251 my ($self, $id, @msg) = @_;
3252
3253 return unless $self->extcmd == 2;
3254
3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3256} 3262}
3257 3263
3258=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3259 3265
3260Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
… …
3317 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3318 3324
3319 if (ref $msg) { 3325 if (ref $msg) {
3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3321 3327
3322 my @reply;
3323
3324 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3325 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3326 } 3346 }
3327
3328 $ns->ext_reply ($reply, @reply)
3329 if $reply;
3330
3331 } else { 3347 } else {
3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3333 } 3349 }
3334 3350
3335 cf::override; 3351 cf::override;
… …
3505############################################################################# 3521#############################################################################
3506# the server's init and main functions 3522# the server's init and main functions
3507 3523
3508our %FACEHASH; # hash => idx, #d# HACK for http server 3524our %FACEHASH; # hash => idx, #d# HACK for http server
3509 3525
3526# internal api, not fianlised
3527sub add_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3547
3510sub load_facedata($) { 3548sub load_facedata($) {
3511 my ($path) = @_; 3549 my ($path) = @_;
3512 3550
3513 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3514 # for this (global event?) 3552 # for this (global event?)
… …
3521 my $facedata = decode_storable load_file $path; 3559 my $facedata = decode_storable load_file $path;
3522 3560
3523 $facedata->{version} == 2 3561 $facedata->{version} == 2
3524 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3525 3563
3526 # patch in the exptable
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3528 $facedata->{resource}{"res/exp_table"} = {
3529 type => FT_RSRC,
3530 data => $exp_table,
3531 hash => (Digest::MD5::md5 $exp_table),
3532 };
3533 cf::cede_to_tick; 3564 cf::cede_to_tick;
3534 3565
3535 { 3566 {
3536 my $faces = $facedata->{faceinfo}; 3567 my $faces = $facedata->{faceinfo};
3537 3568
3538 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3539 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3540 3572
3541 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3542 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
… …
3582 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3583 if (defined (my $type = $info->{type})) { 3615 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue 3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3585 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3586 3618
3619 cf::face::set_type $idx, $type;
3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3588 cf::face::set_type $idx, $type;
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d# 3622 $FACEHASH{$info->{hash}} = $idx;#d#
3591 } else { 3623 } else {
3592# $RESOURCE{$name} = $info; # unused 3624# $RESOURCE{$name} = $info; # unused
3593 } 3625 }
… …
3617 cf::arch::commit_load; 3649 cf::arch::commit_load;
3618 3650
3619 $status 3651 $status
3620} 3652}
3621 3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 add_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3665}
3666
3622sub reload_regions { 3667sub reload_regions {
3623 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3624 # for this (global event?) 3669 # for this (global event?)
3625 %ext::player_env::MUSIC_FACE_CACHE = (); 3670 %ext::player_env::MUSIC_FACE_CACHE = ();
3626 3671
… …
3639} 3684}
3640 3685
3641sub reload_archetypes { 3686sub reload_archetypes {
3642 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3643 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 add_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 add_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3644} 3698}
3645 3699
3646sub reload_treasures { 3700sub reload_treasures {
3647 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3648 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
… …
3669} 3723}
3670 3724
3671sub reload_resources { 3725sub reload_resources {
3672 trace "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3673 3727
3674 reload_exp_table;
3675 reload_materials; 3728 reload_materials;
3676 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3677 reload_sound; 3731 reload_sound;
3678 reload_archetypes; 3732 reload_archetypes;
3679 reload_regions; 3733 reload_regions;
3680 reload_treasures; 3734 reload_treasures;
3681 3735
… …
3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3741 3795
3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3743 3797
3744 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3745 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3746 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3747 (async { 3801 (async {
3748 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3749 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3750 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
… …
3753 evthread_start IO::AIO::poll_fileno; 3807 evthread_start IO::AIO::poll_fileno;
3754 3808
3755 cf::sync_job { 3809 cf::sync_job {
3756 cf::incloader::init (); 3810 cf::incloader::init ();
3757 3811
3812 db_init;
3813
3758 cf::init_anim; 3814 cf::init_anim;
3759 cf::init_attackmess; 3815 cf::init_attackmess;
3760 cf::init_dynamic; 3816 cf::init_dynamic;
3761 3817
3762 cf::load_settings; 3818 cf::load_settings;
3763 3819
3764 reload_resources; 3820 reload_resources;
3765 reload_config; 3821 reload_config;
3766 db_init;
3767 3822
3768 cf::init_uuid; 3823 cf::init_uuid;
3769 cf::init_signals; 3824 cf::init_signals;
3770 cf::init_skills; 3825 cf::init_skills;
3771 3826
… …
4196 } 4251 }
4197} 4252}
4198 4253
4199{ 4254{
4200 # configure BDB 4255 # configure BDB
4256 info "initialising database";
4201 4257
4202 BDB::min_parallel 16; 4258 BDB::min_parallel 16;
4203 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
4204 #$AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
4205 4261
… …
4234 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4235 }; 4291 };
4236 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4237 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4238 }; 4294 };
4295
4296 info "database initialised";
4239} 4297}
4240 4298
4241{ 4299{
4242 # configure IO::AIO 4300 # configure IO::AIO
4243 4301
4302 info "initialising aio";
4244 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
4245 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
4246 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
4247} 4307}
4248 4308
4249our $_log_backtrace; 4309our $_log_backtrace;
4250our $_log_backtrace_last; 4310our $_log_backtrace_last;
4251 4311

Diff Legend

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