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.491 by root, Sat Oct 24 09:18:44 2009 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 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
… …
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;
… …
2163 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2164 2213
2165 () 2214 ()
2166} 2215}
2167 2216
2217# common code, used by both ->save and ->swapout
2168sub save { 2218sub _save {
2169 my ($self) = @_; 2219 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2220
2173 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2174 2222
2175 return unless $self->dirty; 2223 return unless $self->dirty;
2176 2224
… …
2196 } else { 2244 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2246 }
2199} 2247}
2200 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2201sub swap_out { 2257sub swap_out {
2202 my ($self) = @_; 2258 my ($self) = @_;
2203 2259
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2261
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2212 2265
2213 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2214
2215 $self->deactivate; 2267 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2217 $self->clear; 2275 $self->clear;
2218} 2276}
2219 2277
2220sub reset_at { 2278sub reset_at {
2221 my ($self) = @_; 2279 my ($self) = @_;
… …
2577 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2578 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2579 2637
2580 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2583 2641
2584 $map->load; 2642 $map->load;
2585 $map->load_neighbours; 2643 $map->load_neighbours;
2586 2644
2587 return unless $self->contr->active; 2645 return unless $self->contr->active;
… …
2784sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2785 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2786 2844
2787 utf8::encode $text; 2845 utf8::encode $text;
2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2789} 2872}
2790 2873
2791=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2792 2875
2793Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2945 my $pkt = "msg " 3028 my $pkt = "msg "
2946 . $self->{json_coder}->encode ( 3029 . $self->{json_coder}->encode (
2947 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2948 ); 3031 );
2949 3032
2950 # try lzf for large packets
2951 $pkt = "lzf " . Compress::LZF::compress $pkt
2952 if 1024 <= length $pkt and $self->{can_lzf};
2953
2954 # split very large packets
2955 if (8192 < length $pkt and $self->{can_lzf}) {
2956 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2957 $pkt = "frag";
2958 }
2959
2960 $self->send_packet ($pkt); 3033 $self->send_big_packet ($pkt);
2961} 3034}
2962 3035
2963=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2964 3037
2965Sends an ext event to the client. 3038Sends an ext event to the client.
… …
2968 3041
2969sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2970 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2971 3044
2972 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2973 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2974 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2975 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2976 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2977 } 3050 }
2978} 3051}
2979 3052
2980=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2981 3054
… …
2985 3058
2986sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2987 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2988 3061
2989 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2990 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2991 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2992 #TODO: version 1, remove 3065 #TODO: version 1, remove
2993 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2994 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2995 } 3068 }
2996} 3069}
2997 3070
2998=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2999 3072
… …
3100 3173
3101 $coro 3174 $coro
3102} 3175}
3103 3176
3104cf::client->attach ( 3177cf::client->attach (
3105 on_destroy => sub { 3178 on_client_destroy => sub {
3106 my ($ns) = @_; 3179 my ($ns) = @_;
3107 3180
3108 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3109 }, 3182 },
3110); 3183);
… …
3126our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3127 3200
3128$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3129 3202
3130$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3131 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3132 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3133 sort time 3206 sort time
3134)); 3207));
3135 3208
3136# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
… …
3188 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3189 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3190 3263
3191 %vars = (_dummy => 0) unless %vars; 3264 %vars = (_dummy => 0) unless %vars;
3192 3265
3266 my @res;
3193 local $_; 3267 local $_;
3194 local @safe::cf::_safe_eval_args = values %vars;
3195 3268
3196 my $eval = 3269 my $eval =
3197 "do {\n" 3270 "do {\n"
3198 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3199 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3200 . $code 3273 . $code
3201 . "\n}" 3274 . "\n}"
3202 ; 3275 ;
3203 3276
3277 if ($CFG{safe_eval}) {
3204 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3205 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3206 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3207 3286
3208 if ($@) { 3287 if ($@) {
3209 warn "$@"; 3288 warn "$@";
3210 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3211 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
… …
3230=cut 3309=cut
3231 3310
3232sub register_script_function { 3311sub register_script_function {
3233 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3234 3313
3235 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3236 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3237} 3316}
3238 3317
3239=back 3318=back
3240 3319
3241=cut 3320=cut
… …
3262 3341
3263 $facedata->{version} == 2 3342 $facedata->{version} == 2
3264 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3265 3344
3266 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3267 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3268 type => FT_RSRC, 3348 type => FT_RSRC,
3269 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3270 }; 3351 };
3271 cf::cede_to_tick; 3352 cf::cede_to_tick;
3272 3353
3273 { 3354 {
3274 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
… …
3276 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3277 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3278 3359
3279 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3280 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3281 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3282 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3283 3364
3284 cf::cede_to_tick; 3365 cf::cede_to_tick;
3285 } 3366 }
3286 3367
3287 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
… …
3311 3392
3312 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3313 } 3394 }
3314 3395
3315 { 3396 {
3316 # TODO: for gcfclient pleasure, we should give resources
3317 # that gcfclient doesn't grok a >10000 face index.
3318 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3319 3398
3320 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3321 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3322 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3323 my $data;
3324 3402
3325 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3326 # prepend meta info
3327
3328 my $meta = $enc->encode ({
3329 name => $name,
3330 %{ $info->{meta} || {} },
3331 });
3332
3333 $data = pack "(w/a*)*", $meta, $info->{data};
3334 } else {
3335 $data = $info->{data};
3336 }
3337
3338 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3339 cf::face::set_type $idx, $info->{type}; 3404 cf::face::set_type $idx, $info->{type};
3340 } else { 3405 } else {
3341 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3342 } 3407 }
3343 3408
… …
3486 3551
3487 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3488 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3489 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3490 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3491
3492 cf::init_experience;
3493 cf::init_anim;
3494 cf::init_attackmess;
3495 cf::init_dynamic;
3496 3556
3497 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3498 3558
3499 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3500 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
… …
3506 }; 3566 };
3507 3567
3508 evthread_start IO::AIO::poll_fileno; 3568 evthread_start IO::AIO::poll_fileno;
3509 3569
3510 cf::sync_job { 3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3511 reload_resources; 3579 reload_resources;
3512 reload_config; 3580 reload_config;
3513 db_init; 3581 db_init;
3514 3582
3515 cf::load_settings;
3516 cf::load_materials;
3517 cf::init_uuid; 3583 cf::init_uuid;
3518 cf::init_signals; 3584 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3585 cf::init_skills;
3521 3586
3522 cf::init_beforeplay; 3587 cf::init_beforeplay;
3523 3588
3524 atomic; 3589 atomic;
… …
3531 use POSIX (); 3596 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533 3598
3534 (pop @POST_INIT)->(0) while @POST_INIT; 3599 (pop @POST_INIT)->(0) while @POST_INIT;
3535 }; 3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3536 3604
3537 main_loop; 3605 main_loop;
3538} 3606}
3539 3607
3540############################################################################# 3608#############################################################################
… …
3542 3610
3543# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3544BEGIN { 3612BEGIN {
3545 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3549 }; 3617 };
3550 } 3618 }
3551} 3619}
3552 3620
3553sub write_runtime_sync { 3621sub write_runtime_sync {
3622 my $t0 = AE::time;
3623
3554 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3556 3626
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3628
3559 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3560 3630
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3632 or return;
3563 3633
3564 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
… …
3579 or return; 3649 or return;
3580 3650
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3652 and return;
3583 3653
3584 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3655
3586 1 3656 1
3587} 3657}
3588 3658
3589our $uuid_lock; 3659our $uuid_lock;
… …
3727 return; 3797 return;
3728 } 3798 }
3729 3799
3730 return if $RELOAD++; 3800 return if $RELOAD++;
3731 3801
3732 my $t1 = EV::time; 3802 my $t1 = AE::time;
3733 3803
3734 while ($RELOAD) { 3804 while ($RELOAD) {
3735 warn "reloading..."; 3805 warn "reloading...";
3736 3806
3737 warn "entering sync_job"; 3807 warn "entering sync_job";
… …
3840 3910
3841 warn "reloaded"; 3911 warn "reloaded";
3842 --$RELOAD; 3912 --$RELOAD;
3843 } 3913 }
3844 3914
3845 $t1 = EV::time - $t1; 3915 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 3916 warn "reload completed in ${t1}s\n";
3847}; 3917};
3848 3918
3849our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3850 3920
… …
3853 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3854 3924
3855 $RELOAD_WATCHER ||= cf::async { 3925 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 3926 Coro::AIO::aio_wait cache_extensions;
3857 3927
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 3929 do_reload_perl;
3860 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3861 }; 3931 };
3862 }; 3932 };
3863} 3933}
… …
3880 3950
3881our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3882our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3883 3953
3884sub wait_for_tick { 3954sub wait_for_tick {
3885 return if tick_inhibit || $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3886 3956
3887 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3888 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3889 $signal->wait; 3959 $signal->wait;
3890} 3960}
3891 3961
3892sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3893 return if tick_inhibit || $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 3964
3895 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3897 $signal->wait; 3967 $signal->wait;
3898} 3968}
… …
3903 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3904 return; 3974 return;
3905 } 3975 }
3906 3976
3907 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3978
3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3908 3980
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911 Coro::async_pool { 3983 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";
… …
3935} 4007}
3936 4008
3937{ 4009{
3938 # configure BDB 4010 # configure BDB
3939 4011
3940 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 4014 $AnyEvent::BDB::WATCHER->priority (1);
3943 4015
3944 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;

Diff Legend

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