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.488 by root, Wed Oct 21 00:44:39 2009 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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
… …
162 165
163our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
164 167
165sub cf::map::normalise; 168sub cf::map::normalise;
166 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
167############################################################################# 174#############################################################################
168 175
169%REFLECT = (); 176%REFLECT = ();
170for (@REFLECT) { 177for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
260 267
261 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
262 269
263 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 272 return;#d#
266 }#d# 273 }#d#
267 274
268 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
289)) { 296)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 298}
292 299
293$EV::DIED = sub { 300$EV::DIED = sub {
294 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
295}; 302};
296 303
297############################################################################# 304#############################################################################
298 305
299=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
396} 403}
397 404
398=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
399 406
400Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 408get spread over time.
402 409
403=cut 410=cut
404 411
405sub periodic($$) { 412sub periodic($$) {
406 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
423 430
424=cut 431=cut
425 432
426our @SLOT_QUEUE; 433our @SLOT_QUEUE;
427our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
428 436
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
432 440
433 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
434 443
435 while () { 444 while () {
436 next_job: 445 next_job:
446
437 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 448
439 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 453 $job->[2]->send;
443 Coro::cede; 454 Coro::cede;
444 goto next_job; 455 goto next_job;
445 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 458 }
447 } 459 }
448 460
449 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 464 $signal->wait;
453 } else { 465 } else {
466 $busy = 0;
454 Coro::schedule; 467 Coro::schedule;
455 } 468 }
456 } 469 }
457}; 470};
458 471
459sub get_slot($;$$) { 472sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
461 474
462 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
463 476
464 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
465 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
466 480
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
496 510
497sub sync_job(&) { 511sub sync_job(&) {
498 my ($job) = @_; 512 my ($job) = @_;
499 513
500 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 515 my $time = AE::time;
502 516
503 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
505 519
506 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 537 } else {
524 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
525 } 539 }
526 } 540 }
527 541
528 my $time = EV::time - $time; 542 my $time = AE::time - $time;
529 543
530 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
531 545
532 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
533 } else { 547 } else {
… …
577 reset_signals; 591 reset_signals;
578 &$cb 592 &$cb
579 }, @args; 593 }, @args;
580 594
581 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
582} 607}
583 608
584=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
585 610
586=cut 611=cut
… …
1303} 1328}
1304 1329
1305use File::Glob (); 1330use File::Glob ();
1306 1331
1307cf::player->attach ( 1332cf::player->attach (
1308 on_command => sub { 1333 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1310 1335
1311 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1312 or return; 1337 or return;
1313 1338
… …
1392 . "\n};\n1"; 1417 . "\n};\n1";
1393 1418
1394 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1395 } 1420 }
1396 1421
1422 my $pass = 0;
1397 my %done; 1423 my %done;
1398 while (%todo) { 1424 while (%todo) {
1399 my $progress; 1425 my $progress;
1400 1426
1427 ++$pass;
1428
1429 ext:
1401 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1432 next ext
1404 unless exists $done{$_}; 1433 unless exists $done{$_};
1405 } 1434 }
1406 1435
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1437
1409 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1442
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1444 if exists $v->{meta}{mandatory};
1417 1445
1418 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1419 } 1455 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1456 }
1425 1457
1426 skip: 1458 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1429 } 1466 }
1430 }; 1467 };
1431} 1468}
1432 1469
1433############################################################################# 1470#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1518 } 1555 }
1519 } 1556 }
1520} 1557}
1521 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1522sub save($) { 1572sub save($) {
1523 my ($pl) = @_; 1573 my ($pl) = @_;
1524 1574
1525 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1526 1576
… …
1531 1581
1532 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1534 1584
1535 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1589
1537 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1591 cf::cede_to_tick;
1539} 1592}
1540 1593
… …
1642 \@logins 1695 \@logins
1643} 1696}
1644 1697
1645=item $player->maps 1698=item $player->maps
1646 1699
1700=item cf::player::maps $login
1701
1647Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1648player. May block. 1703player. May block.
1649 1704
1650=cut 1705=cut
1651 1706
… …
1713=cut 1768=cut
1714 1769
1715sub find_by_path($) { 1770sub find_by_path($) {
1716 my ($path) = @_; 1771 my ($path) = @_;
1717 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1718 my ($match, $specificity); 1775 my ($match, $specificity);
1719 1776
1720 for my $region (list) { 1777 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1811
1755 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1813 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2009 2066
2010 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2011 } 2068 }
2012} 2069}
2013 2070
2014sub pre_load { } 2071sub pre_load { }
2015sub post_load { } 2072#sub post_load { } # XS
2016 2073
2017sub load { 2074sub load {
2018 my ($self) = @_; 2075 my ($self) = @_;
2019 2076
2020 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2134 }
2078 2135
2079 $self->post_load; 2136 $self->post_load;
2080} 2137}
2081 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2082sub customise_for { 2142sub customise_for {
2083 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2084 2144
2085 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2146 if $self->per_player;
… …
2163 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2164 2224
2165 () 2225 ()
2166} 2226}
2167 2227
2228# common code, used by both ->save and ->swapout
2168sub save { 2229sub _save {
2169 my ($self) = @_; 2230 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2231
2173 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2174 2233
2175 return unless $self->dirty; 2234 return unless $self->dirty;
2176 2235
… …
2196 } else { 2255 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2257 }
2199} 2258}
2200 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2201sub swap_out { 2268sub swap_out {
2202 my ($self) = @_; 2269 my ($self) = @_;
2203 2270
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2272
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2212 2276
2213 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2214
2215 $self->deactivate; 2278 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2217 $self->clear; 2286 $self->clear;
2218} 2287}
2219 2288
2220sub reset_at { 2289sub reset_at {
2221 my ($self) = @_; 2290 my ($self) = @_;
… …
2341 : normalise $_ 2410 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2412 ]
2344} 2413}
2345 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2346=back 2447=back
2347 2448
2348=head3 cf::object 2449=head3 cf::object
2349 2450
2350=cut 2451=cut
… …
2518 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2519 2620
2520 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2522 2623
2523 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2524} 2625}
2525 2626
2526sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2527 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2528 2629
… …
2545 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2547 2648
2548 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2551 2652
2552 $map->load; 2653 $map->load;
2553 $map->load_neighbours; 2654 $map->load_neighbours;
2554 2655
2555 return unless $self->contr->active; 2656 return unless $self->contr->active;
… …
2752sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2754 2855
2755 utf8::encode $text; 2856 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2757} 2883}
2758 2884
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2886
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2913 my $pkt = "msg " 3039 my $pkt = "msg "
2914 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2916 ); 3042 );
2917 3043
2918 # try lzf for large packets
2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2920 if 1024 <= length $pkt and $self->{can_lzf};
2921
2922 # split very large packets
2923 if (8192 < length $pkt and $self->{can_lzf}) {
2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2925 $pkt = "frag";
2926 }
2927
2928 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2929} 3045}
2930 3046
2931=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2932 3048
2933Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2936 3052
2937sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2938 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2939 3055
2940 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2942 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2943 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2944 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2945 } 3061 }
2946} 3062}
2947 3063
2948=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2949 3065
… …
2953 3069
2954sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2955 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2956 3072
2957 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2958 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2959 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2960 #TODO: version 1, remove 3076 #TODO: version 1, remove
2961 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2962 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2963 } 3079 }
2964} 3080}
2965 3081
2966=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2967 3083
… …
3068 3184
3069 $coro 3185 $coro
3070} 3186}
3071 3187
3072cf::client->attach ( 3188cf::client->attach (
3073 on_destroy => sub { 3189 on_client_destroy => sub {
3074 my ($ns) = @_; 3190 my ($ns) = @_;
3075 3191
3076 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3077 }, 3193 },
3078); 3194);
… …
3094our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3095 3211
3096$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3097 3213
3098$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3099 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3100 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3101 sort time 3217 sort time
3102)); 3218));
3103 3219
3104# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3157 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3158 3274
3159 %vars = (_dummy => 0) unless %vars; 3275 %vars = (_dummy => 0) unless %vars;
3160 3276
3277 my @res;
3161 local $_; 3278 local $_;
3162 local @safe::cf::_safe_eval_args = values %vars;
3163 3279
3164 my $eval = 3280 my $eval =
3165 "do {\n" 3281 "do {\n"
3166 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3167 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3168 . $code 3284 . $code
3169 . "\n}" 3285 . "\n}"
3170 ; 3286 ;
3171 3287
3288 if ($CFG{safe_eval}) {
3172 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3173 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3174 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3175 3297
3176 if ($@) { 3298 if ($@) {
3177 warn "$@"; 3299 warn "$@";
3178 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3179 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3198=cut 3320=cut
3199 3321
3200sub register_script_function { 3322sub register_script_function {
3201 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3202 3324
3203 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3204 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3205} 3327}
3206 3328
3207=back 3329=back
3208 3330
3209=cut 3331=cut
… …
3230 3352
3231 $facedata->{version} == 2 3353 $facedata->{version} == 2
3232 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3233 3355
3234 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3235 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3236 type => FT_RSRC, 3359 type => FT_RSRC,
3237 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3238 }; 3362 };
3239 cf::cede_to_tick; 3363 cf::cede_to_tick;
3240 3364
3241 { 3365 {
3242 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3244 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3245 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246 3370
3247 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3248 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3249 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3250 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3251 3375
3252 cf::cede_to_tick; 3376 cf::cede_to_tick;
3253 } 3377 }
3254 3378
3255 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3279 3403
3280 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3281 } 3405 }
3282 3406
3283 { 3407 {
3284 # TODO: for gcfclient pleasure, we should give resources
3285 # that gcfclient doesn't grok a >10000 face index.
3286 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3287 3409
3288 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3289 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3290 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3291 my $data;
3292 3413
3293 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3294 # prepend meta info
3295
3296 my $meta = $enc->encode ({
3297 name => $name,
3298 %{ $info->{meta} || {} },
3299 });
3300
3301 $data = pack "(w/a*)*", $meta, $info->{data};
3302 } else {
3303 $data = $info->{data};
3304 }
3305
3306 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3307 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3308 } else { 3416 } else {
3309 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3310 } 3418 }
3311 3419
… …
3454 3562
3455 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3456 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3457 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3458 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3459
3460 cf::init_experience;
3461 cf::init_anim;
3462 cf::init_attackmess;
3463 cf::init_dynamic;
3464 3567
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 3569
3467 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3468 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3474 }; 3577 };
3475 3578
3476 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3477 3580
3478 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3479 reload_resources; 3590 reload_resources;
3480 reload_config; 3591 reload_config;
3481 db_init; 3592 db_init;
3482 3593
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid; 3594 cf::init_uuid;
3486 cf::init_signals; 3595 cf::init_signals;
3487 cf::init_commands;
3488 cf::init_skills; 3596 cf::init_skills;
3489 3597
3490 cf::init_beforeplay; 3598 cf::init_beforeplay;
3491 3599
3492 atomic; 3600 atomic;
… …
3499 use POSIX (); 3607 use POSIX ();
3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3501 3609
3502 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3503 }; 3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3504 3615
3505 main_loop; 3616 main_loop;
3506} 3617}
3507 3618
3508############################################################################# 3619#############################################################################
… …
3510 3621
3511# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3512BEGIN { 3623BEGIN {
3513 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3514 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3515 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3516 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3517 }; 3628 };
3518 } 3629 }
3519} 3630}
3520 3631
3521sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3522 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3523 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3524 3637
3525 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3526 3639
3527 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3528 3641
3529 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3530 or return; 3643 or return;
3531 3644
3532 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3533 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3534 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3547 or return; 3660 or return;
3548 3661
3549 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3550 and return; 3663 and return;
3551 3664
3552 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3553 3666
3554 1 3667 1
3555} 3668}
3556 3669
3557our $uuid_lock; 3670our $uuid_lock;
… …
3683 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3684 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3685 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3686# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3687 } 3800 }
3688 warn "cleared package $pkg\n";#d#
3689} 3801}
3690 3802
3691sub do_reload_perl() { 3803sub do_reload_perl() {
3692 # can/must only be called in main 3804 # can/must only be called in main
3693 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3694 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3695 return; 3807 return;
3696 } 3808 }
3697 3809
3698 return if $RELOAD++; 3810 return if $RELOAD++;
3699 3811
3700 my $t1 = EV::time; 3812 my $t1 = AE::time;
3701 3813
3702 while ($RELOAD) { 3814 while ($RELOAD) {
3703 warn "reloading..."; 3815 warn "reloading...";
3704 3816
3705 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3808 3920
3809 warn "reloaded"; 3921 warn "reloaded";
3810 --$RELOAD; 3922 --$RELOAD;
3811 } 3923 }
3812 3924
3813 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3814 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3815}; 3927};
3816 3928
3817our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3818 3930
… …
3821 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3822 3934
3823 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3824 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3825 3937
3826 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3827 do_reload_perl; 3939 do_reload_perl;
3828 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3829 }; 3941 };
3830 }; 3942 };
3831} 3943}
… …
3848 3960
3849our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3850our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3851 3963
3852sub wait_for_tick { 3964sub wait_for_tick {
3853 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3854 3966
3855 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3856 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3857 $signal->wait; 3969 $signal->wait;
3858} 3970}
3859 3971
3860sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3861 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3862 3974
3863 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3864 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3865 $signal->wait; 3977 $signal->wait;
3866} 3978}
… …
3871 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3872 return; 3984 return;
3873 } 3985 }
3874 3986
3875 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3876 3990
3877 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3878 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3879 Coro::async_pool { 3993 Coro::async_pool {
3880 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3903} 4017}
3904 4018
3905{ 4019{
3906 # configure BDB 4020 # configure BDB
3907 4021
3908 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3909 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3910 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3911 4025
3912 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3913 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;

Diff Legend

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