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.486 by root, Thu Oct 15 21:56:50 2009 UTC vs.
Revision 1.517 by root, Thu Apr 15 06:07:51 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
32use EV; 32use EV;
33use Opcode; 33use Opcode;
34use Safe; 34use Safe;
35use Safe::Hole; 35use Safe::Hole;
36use Storable (); 36use Storable ();
37use Carp ();
37 38
38use Guard (); 39use Guard ();
39use Coro (); 40use Coro ();
40use Coro::State; 41use Coro::State;
41use Coro::Handle; 42use Coro::Handle;
… …
52use Coro::Util (); 53use Coro::Util ();
53 54
54use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
55use BDB (); 56use BDB ();
56use Data::Dumper; 57use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 58use Fcntl;
59use YAML::XS (); 59use YAML::XS ();
60use IO::AIO (); 60use IO::AIO ();
61use Time::HiRes; 61use Time::HiRes;
62use Compress::LZF; 62use Compress::LZF;
… …
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 118our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
117 120
… …
228returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
230 233
231=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
232 235
233This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235that call. 238that call.
236 239
237=item %cf::REFLECT 240=item %cf::REFLECT
238 241
… …
289)) { 292)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 294}
292 295
293$EV::DIED = sub { 296$EV::DIED = sub {
294 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
295}; 298};
296 299
297############################################################################# 300#############################################################################
298 301
299=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
396} 399}
397 400
398=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
399 402
400Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 404get spread over time.
402 405
403=cut 406=cut
404 407
405sub periodic($$) { 408sub periodic($$) {
406 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
423 426
424=cut 427=cut
425 428
426our @SLOT_QUEUE; 429our @SLOT_QUEUE;
427our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
428 432
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
432 436
433 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
434 439
435 while () { 440 while () {
436 next_job: 441 next_job:
442
437 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 444
439 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 449 $job->[2]->send;
443 Coro::cede; 450 Coro::cede;
444 goto next_job; 451 goto next_job;
445 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 454 }
447 } 455 }
448 456
449 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 460 $signal->wait;
453 } else { 461 } else {
462 $busy = 0;
454 Coro::schedule; 463 Coro::schedule;
455 } 464 }
456 } 465 }
457}; 466};
458 467
459sub get_slot($;$$) { 468sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
461 470
462 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
463 472
464 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
465 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
466 476
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
496 506
497sub sync_job(&) { 507sub sync_job(&) {
498 my ($job) = @_; 508 my ($job) = @_;
499 509
500 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 511 my $time = AE::time;
502 512
503 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
505 515
506 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 533 } else {
524 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
525 } 535 }
526 } 536 }
527 537
528 my $time = EV::time - $time; 538 my $time = AE::time - $time;
529 539
530 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
531 541
532 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
533 } else { 543 } else {
… …
577 reset_signals; 587 reset_signals;
578 &$cb 588 &$cb
579 }, @args; 589 }, @args;
580 590
581 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
582} 603}
583 604
584=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
585 606
586=cut 607=cut
… …
1303} 1324}
1304 1325
1305use File::Glob (); 1326use File::Glob ();
1306 1327
1307cf::player->attach ( 1328cf::player->attach (
1308 on_command => sub { 1329 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1310 1331
1311 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1312 or return; 1333 or return;
1313 1334
… …
1392 . "\n};\n1"; 1413 . "\n};\n1";
1393 1414
1394 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1395 } 1416 }
1396 1417
1418 my $pass = 0;
1397 my %done; 1419 my %done;
1398 while (%todo) { 1420 while (%todo) {
1399 my $progress; 1421 my $progress;
1400 1422
1423 ++$pass;
1424
1425 ext:
1401 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1428 next ext
1404 unless exists $done{$_}; 1429 unless exists $done{$_};
1405 } 1430 }
1406 1431
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1433
1409 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1438
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1440 if exists $v->{meta}{mandatory};
1417 1441 } else {
1418 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1419 } 1448 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1449 }
1425 1450
1426 skip: 1451 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1429 } 1459 }
1430 }; 1460 };
1431} 1461}
1432 1462
1433############################################################################# 1463#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1518 } 1548 }
1519 } 1549 }
1520} 1550}
1521 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1522sub save($) { 1565sub save($) {
1523 my ($pl) = @_; 1566 my ($pl) = @_;
1524 1567
1525 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1526 1569
… …
1531 1574
1532 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1534 1577
1535 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1582
1537 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1584 cf::cede_to_tick;
1539} 1585}
1540 1586
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1800
1755 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1802 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2009 2055
2010 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2011 } 2057 }
2012} 2058}
2013 2059
2014sub pre_load { } 2060sub pre_load { }
2015sub post_load { } 2061#sub post_load { } # XS
2016 2062
2017sub load { 2063sub load {
2018 my ($self) = @_; 2064 my ($self) = @_;
2019 2065
2020 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2123 }
2078 2124
2079 $self->post_load; 2125 $self->post_load;
2080} 2126}
2081 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2082sub customise_for { 2131sub customise_for {
2083 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2084 2133
2085 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2135 if $self->per_player;
… …
2341 : normalise $_ 2390 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2392 ]
2344} 2393}
2345 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2346=back 2427=back
2347 2428
2348=head3 cf::object 2429=head3 cf::object
2349 2430
2350=cut 2431=cut
… …
2545 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2547 2628
2548 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2551 2632
2552 $map->load; 2633 $map->load;
2553 $map->load_neighbours; 2634 $map->load_neighbours;
2554 2635
2555 return unless $self->contr->active; 2636 return unless $self->contr->active;
… …
2752sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2754 2835
2755 utf8::encode $text; 2836 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2757} 2863}
2758 2864
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2866
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2782 "c/examine" => { 2888 "c/examine" => {
2783 id => "infobox", 2889 id => "infobox",
2784 title => "Examine", 2890 title => "Examine",
2785 reply => undef, 2891 reply => undef,
2786 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2787 }, 2899 },
2788 "c/book" => { 2900 "c/book" => {
2789 id => "infobox", 2901 id => "infobox",
2790 title => "Book", 2902 title => "Book",
2791 reply => undef, 2903 reply => undef,
… …
2907 my $pkt = "msg " 3019 my $pkt = "msg "
2908 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 ); 3022 );
2911 3023
2912 # try lzf for large packets
2913 $pkt = "lzf " . Compress::LZF::compress $pkt
2914 if 1024 <= length $pkt and $self->{can_lzf};
2915
2916 # split very large packets
2917 if (8192 < length $pkt and $self->{can_lzf}) {
2918 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2919 $pkt = "frag";
2920 }
2921
2922 $self->send_packet ($pkt); 3024 $self->send_big_packet ($pkt);
2923} 3025}
2924 3026
2925=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2926 3028
2927Sends an ext event to the client. 3029Sends an ext event to the client.
… …
2930 3032
2931sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2932 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2933 3035
2934 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2935 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2936 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2937 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2938 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2939 } 3041 }
2940} 3042}
2941 3043
2942=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2943 3045
… …
2947 3049
2948sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2949 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2950 3052
2951 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2952 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2953 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2954 #TODO: version 1, remove 3056 #TODO: version 1, remove
2955 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2956 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2957 } 3059 }
2958} 3060}
2959 3061
2960=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2961 3063
… …
3062 3164
3063 $coro 3165 $coro
3064} 3166}
3065 3167
3066cf::client->attach ( 3168cf::client->attach (
3067 on_destroy => sub { 3169 on_client_destroy => sub {
3068 my ($ns) = @_; 3170 my ($ns) = @_;
3069 3171
3070 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3071 }, 3173 },
3072); 3174);
… …
3088our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3089 3191
3090$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3091 3193
3092$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3093 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3094 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3095 sort time 3197 sort time
3096)); 3198));
3097 3199
3098# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
… …
3150 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3151 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3152 3254
3153 %vars = (_dummy => 0) unless %vars; 3255 %vars = (_dummy => 0) unless %vars;
3154 3256
3257 my @res;
3155 local $_; 3258 local $_;
3156 local @safe::cf::_safe_eval_args = values %vars;
3157 3259
3158 my $eval = 3260 my $eval =
3159 "do {\n" 3261 "do {\n"
3160 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3161 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3162 . $code 3264 . $code
3163 . "\n}" 3265 . "\n}"
3164 ; 3266 ;
3165 3267
3268 if ($CFG{safe_eval}) {
3166 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3167 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3168 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3169 3277
3170 if ($@) { 3278 if ($@) {
3171 warn "$@"; 3279 warn "$@";
3172 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3173 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
… …
3192=cut 3300=cut
3193 3301
3194sub register_script_function { 3302sub register_script_function {
3195 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3196 3304
3197 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3198 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3199} 3307}
3200 3308
3201=back 3309=back
3202 3310
3203=cut 3311=cut
… …
3224 3332
3225 $facedata->{version} == 2 3333 $facedata->{version} == 2
3226 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3227 3335
3228 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3229 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3230 type => FT_RSRC, 3339 type => FT_RSRC,
3231 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3232 }; 3342 };
3233 cf::cede_to_tick; 3343 cf::cede_to_tick;
3234 3344
3235 { 3345 {
3236 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
… …
3238 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3239 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3240 3350
3241 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3242 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3243 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3244 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3245 3355
3246 cf::cede_to_tick; 3356 cf::cede_to_tick;
3247 } 3357 }
3248 3358
3249 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
… …
3273 3383
3274 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3275 } 3385 }
3276 3386
3277 { 3387 {
3278 # TODO: for gcfclient pleasure, we should give resources
3279 # that gcfclient doesn't grok a >10000 face index.
3280 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3281 3389
3282 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3283 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3284 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3285 my $data;
3286 3393
3287 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3288 # prepend meta info
3289
3290 my $meta = $enc->encode ({
3291 name => $name,
3292 %{ $info->{meta} || {} },
3293 });
3294
3295 $data = pack "(w/a*)*", $meta, $info->{data};
3296 } else {
3297 $data = $info->{data};
3298 }
3299
3300 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3301 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3302 } else { 3396 } else {
3303 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3304 } 3398 }
3305 3399
… …
3448 3542
3449 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3450 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3451 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3452 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3453
3454 cf::init_experience;
3455 cf::init_anim;
3456 cf::init_attackmess;
3457 cf::init_dynamic;
3458 3547
3459 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3460 3549
3461 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3462 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
… …
3468 }; 3557 };
3469 3558
3470 evthread_start IO::AIO::poll_fileno; 3559 evthread_start IO::AIO::poll_fileno;
3471 3560
3472 cf::sync_job { 3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3473 reload_resources; 3570 reload_resources;
3474 reload_config; 3571 reload_config;
3475 db_init; 3572 db_init;
3476 3573
3477 cf::load_settings;
3478 cf::load_materials;
3479 cf::init_uuid; 3574 cf::init_uuid;
3480 cf::init_signals; 3575 cf::init_signals;
3481 cf::init_commands;
3482 cf::init_skills; 3576 cf::init_skills;
3483 3577
3484 cf::init_beforeplay; 3578 cf::init_beforeplay;
3485 3579
3486 atomic; 3580 atomic;
… …
3493 use POSIX (); 3587 use POSIX ();
3494 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3495 3589
3496 (pop @POST_INIT)->(0) while @POST_INIT; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3497 }; 3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n";
3498 3595
3499 main_loop; 3596 main_loop;
3500} 3597}
3501 3598
3502############################################################################# 3599#############################################################################
… …
3504 3601
3505# install some emergency cleanup handlers 3602# install some emergency cleanup handlers
3506BEGIN { 3603BEGIN {
3507 our %SIGWATCHER = (); 3604 our %SIGWATCHER = ();
3508 for my $signal (qw(INT HUP TERM)) { 3605 for my $signal (qw(INT HUP TERM)) {
3509 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3606 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3510 cf::cleanup "SIG$signal"; 3607 cf::cleanup "SIG$signal";
3511 }; 3608 };
3512 } 3609 }
3513} 3610}
3514 3611
3515sub write_runtime_sync { 3612sub write_runtime_sync {
3613 my $t0 = AE::time;
3614
3516 # first touch the runtime file to show we are still running: 3615 # first touch the runtime file to show we are still running:
3517 # the fsync below can take a very very long time. 3616 # the fsync below can take a very very long time.
3518 3617
3519 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3618 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3520 3619
3521 my $guard = cf::lock_acquire "write_runtime"; 3620 my $guard = cf::lock_acquire "write_runtime";
3522 3621
3523 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3622 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3524 or return; 3623 or return;
3525 3624
3526 my $value = $cf::RUNTIME + 90 + 10; 3625 my $value = $cf::RUNTIME + 90 + 10;
3527 # 10 is the runtime save interval, for a monotonic clock 3626 # 10 is the runtime save interval, for a monotonic clock
3528 # 60 allows for the watchdog to kill the server. 3627 # 60 allows for the watchdog to kill the server.
… …
3541 or return; 3640 or return;
3542 3641
3543 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3544 and return; 3643 and return;
3545 3644
3546 warn "runtime file written.\n"; 3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3547 3646
3548 1 3647 1
3549} 3648}
3550 3649
3551our $uuid_lock; 3650our $uuid_lock;
… …
3689 return; 3788 return;
3690 } 3789 }
3691 3790
3692 return if $RELOAD++; 3791 return if $RELOAD++;
3693 3792
3694 my $t1 = EV::time; 3793 my $t1 = AE::time;
3695 3794
3696 while ($RELOAD) { 3795 while ($RELOAD) {
3697 warn "reloading..."; 3796 warn "reloading...";
3698 3797
3699 warn "entering sync_job"; 3798 warn "entering sync_job";
… …
3802 3901
3803 warn "reloaded"; 3902 warn "reloaded";
3804 --$RELOAD; 3903 --$RELOAD;
3805 } 3904 }
3806 3905
3807 $t1 = EV::time - $t1; 3906 $t1 = AE::time - $t1;
3808 warn "reload completed in ${t1}s\n"; 3907 warn "reload completed in ${t1}s\n";
3809}; 3908};
3810 3909
3811our $RELOAD_WATCHER; # used only during reload 3910our $RELOAD_WATCHER; # used only during reload
3812 3911
… …
3815 # coro crashes during coro_state_free->destroy here. 3914 # coro crashes during coro_state_free->destroy here.
3816 3915
3817 $RELOAD_WATCHER ||= cf::async { 3916 $RELOAD_WATCHER ||= cf::async {
3818 Coro::AIO::aio_wait cache_extensions; 3917 Coro::AIO::aio_wait cache_extensions;
3819 3918
3820 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3919 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3821 do_reload_perl; 3920 do_reload_perl;
3822 undef $RELOAD_WATCHER; 3921 undef $RELOAD_WATCHER;
3823 }; 3922 };
3824 }; 3923 };
3825} 3924}
… …
3842 3941
3843our @WAIT_FOR_TICK; 3942our @WAIT_FOR_TICK;
3844our @WAIT_FOR_TICK_BEGIN; 3943our @WAIT_FOR_TICK_BEGIN;
3845 3944
3846sub wait_for_tick { 3945sub wait_for_tick {
3847 return if tick_inhibit || $Coro::current == $Coro::main; 3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3848 3947
3849 my $signal = new Coro::Signal; 3948 my $signal = new Coro::Signal;
3850 push @WAIT_FOR_TICK, $signal; 3949 push @WAIT_FOR_TICK, $signal;
3851 $signal->wait; 3950 $signal->wait;
3852} 3951}
3853 3952
3854sub wait_for_tick_begin { 3953sub wait_for_tick_begin {
3855 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3856 3955
3857 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3858 push @WAIT_FOR_TICK_BEGIN, $signal; 3957 push @WAIT_FOR_TICK_BEGIN, $signal;
3859 $signal->wait; 3958 $signal->wait;
3860} 3959}
… …
3865 unless ++$bug_warning > 10; 3964 unless ++$bug_warning > 10;
3866 return; 3965 return;
3867 } 3966 }
3868 3967
3869 cf::server_tick; # one server iteration 3968 cf::server_tick; # one server iteration
3969
3970 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3870 3971
3871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3972 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3872 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3973 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3873 Coro::async_pool { 3974 Coro::async_pool {
3874 $Coro::current->{desc} = "runtime saver"; 3975 $Coro::current->{desc} = "runtime saver";
… …
3897} 3998}
3898 3999
3899{ 4000{
3900 # configure BDB 4001 # configure BDB
3901 4002
3902 BDB::min_parallel 8; 4003 BDB::min_parallel 16;
3903 BDB::max_poll_reqs $TICK * 0.1; 4004 BDB::max_poll_reqs $TICK * 0.1;
3904 $AnyEvent::BDB::WATCHER->priority (1); 4005 $AnyEvent::BDB::WATCHER->priority (1);
3905 4006
3906 unless ($DB_ENV) { 4007 unless ($DB_ENV) {
3907 $DB_ENV = BDB::db_env_create; 4008 $DB_ENV = BDB::db_env_create;

Diff Legend

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