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.238 by root, Sat Apr 14 07:23:00 2007 UTC vs.
Revision 1.250 by root, Wed Apr 18 14:24:10 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
… …
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext"; 59our $LIBDIR = datadir . "/ext";
58 60
59our $TICK = MAX_TIME * 1e-6; 61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 62our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 63our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 65our $NEXT_TICK;
64our $NOW; 66our $NOW;
… …
76our %MAP; # all maps 78our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 79our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random"; 80our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db"; 81our $BDB_ENV_DIR = cf::localdir . "/db";
80 82
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83
84# used to convert map paths into valid unix filenames by replacing / by ∕ 83# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 85
87binmode STDOUT; 86binmode STDOUT;
88binmode STDERR; 87binmode STDERR;
… …
136=item %cf::CFG 135=item %cf::CFG
137 136
138Configuration for the server, loaded from C</etc/crossfire/config>, or 137Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 138from wherever your confdir points to.
140 139
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 140=item cf::wait_for_tick, cf::wait_for_tick_begin
142 141
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 142These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 143returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 144per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick.
147 145
148=back 146=back
149 147
150=cut 148=cut
151 149
152BEGIN { 150BEGIN {
153 *CORE::GLOBAL::warn = sub { 151 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 152 my $msg = join "", @_;
155 utf8::encode $msg;
156 153
157 $msg .= "\n" 154 $msg .= "\n"
158 unless $msg =~ /\n$/; 155 unless $msg =~ /\n$/;
159 156
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158
159 utf8::encode $msg;
160 LOG llevError, $msg; 160 LOG llevError, $msg;
161 }; 161 };
162} 162}
163 163
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
1483 $self->in_memory (cf::MAP_LOADING); 1483 $self->in_memory (cf::MAP_LOADING);
1484 1484
1485 $self->alloc; 1485 $self->alloc;
1486 1486
1487 $self->pre_load; 1487 $self->pre_load;
1488 Coro::cede;
1488 1489
1489 $self->_load_objects ($self->{load_path}, 1) 1490 $self->_load_objects ($self->{load_path}, 1)
1490 or return; 1491 or return;
1491 1492
1492 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1499 $self->_load_objects ($uniq, 0); 1500 $self->_load_objects ($uniq, 0);
1500 } 1501 }
1501 } 1502 }
1502 1503
1503 Coro::cede; 1504 Coro::cede;
1504
1505 # now do the right thing for maps 1505 # now do the right thing for maps
1506 $self->link_multipart_objects; 1506 $self->link_multipart_objects;
1507 Coro::cede;
1507 1508
1508 unless ($self->{deny_activate}) { 1509 unless ($self->{deny_activate}) {
1509 $self->decay_objects; 1510 $self->decay_objects;
1510 $self->fix_auto_apply; 1511 $self->fix_auto_apply;
1511 $self->update_buttons; 1512 $self->update_buttons;
… …
1513 $self->set_darkness_map; 1514 $self->set_darkness_map;
1514 $self->difficulty ($self->estimate_difficulty) 1515 $self->difficulty ($self->estimate_difficulty)
1515 unless $self->difficulty; 1516 unless $self->difficulty;
1516 Coro::cede; 1517 Coro::cede;
1517 $self->activate; 1518 $self->activate;
1519 Coro::cede;
1518 } 1520 }
1519 1521
1520 $self->post_load; 1522 $self->post_load;
1523 Coro::cede;
1521 1524
1522 $self->in_memory (cf::MAP_IN_MEMORY); 1525 $self->in_memory (cf::MAP_IN_MEMORY);
1523} 1526}
1524 1527
1525sub customise_for { 1528sub customise_for {
… …
2263############################################################################# 2266#############################################################################
2264 2267
2265=head2 EXTENSION DATABASE SUPPORT 2268=head2 EXTENSION DATABASE SUPPORT
2266 2269
2267Crossfire maintains a very simple database for extension use. It can 2270Crossfire maintains a very simple database for extension use. It can
2268currently store anything that can be serialised using Storable, which 2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2269excludes objects. 2272convert to/from binary).
2270 2273
2271The parameter C<$family> should best start with the name of the extension 2274The parameter C<$family> should best start with the name of the extension
2272using it, it should be unique. 2275using it, it should be unique.
2273 2276
2274=over 4 2277=over 4
… …
2297 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2298 cf::cleanup "db_open(db): $!" if $!; 2301 cf::cleanup "db_open(db): $!" if $!;
2299 }; 2302 };
2300 cf::cleanup "db_open(db): $@" if $@; 2303 cf::cleanup "db_open(db): $@" if $@;
2301 }; 2304 };
2302
2303 my $path = cf::localdir . "/database.pst";
2304 if (stat $path) {
2305 cf::sync_job {
2306 my $pst = Storable::retrieve $path;
2307
2308 cf::db_put (board => data => $pst->{board});
2309 cf::db_put (guildrules => data => $pst->{guildrules});
2310 cf::db_put (rent => balance => $pst->{rent}{balance});
2311 BDB::db_env_txn_checkpoint $DB_ENV;
2312
2313 unlink $path;
2314 };
2315 }
2316 } 2305 }
2317} 2306}
2318 2307
2319sub db_get($$) { 2308sub db_get($$) {
2320 my $key = "$_[0]/$_[1]"; 2309 my $key = "$_[0]/$_[1]";
2321 2310
2322 cf::sync_job { 2311 cf::sync_job {
2323 BDB::db_get $DB, undef, $key, my $data; 2312 BDB::db_get $DB, undef, $key, my $data;
2324 2313
2325 $! ? () 2314 $! ? ()
2326 : Compress::LZF::sthaw $data 2315 : $data
2327 } 2316 }
2328} 2317}
2329 2318
2330sub db_put($$$) { 2319sub db_put($$$) {
2331 BDB::dbreq_pri 4; 2320 BDB::dbreq_pri 4;
2332 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2321 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2333} 2322}
2323
2324=item cf::cache $id => [$paths...], $processversion => $process
2325
2326Generic caching function that returns the value of the resource $id,
2327caching and regenerating as required.
2328
2329This function can block.
2330
2331=cut
2332
2333sub cache {
2334 my ($id, $src, $processversion, $process) = @_;
2335
2336 my $meta =
2337 join "\x00",
2338 $processversion,
2339 map {
2340 aio_stat $_
2341 and Carp::croak "$_: $!";
2342
2343 ($_, (stat _)[7,9])
2344 } @$src;
2345
2346 my $dbmeta = db_get cache => "$id/meta";
2347 if ($dbmeta ne $meta) {
2348 # changed, we may need to process
2349
2350 my @data;
2351 my $md5;
2352
2353 for (0 .. $#$src) {
2354 0 <= aio_load $src->[$_], $data[$_]
2355 or Carp::croak "$src->[$_]: $!";
2356 }
2357
2358 # if processing is expensive, check
2359 # checksum first
2360 if (1) {
2361 $md5 =
2362 join "\x00",
2363 $processversion,
2364 map {
2365 Coro::cede;
2366 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2367 } 0.. $#$src;
2368
2369
2370 my $dbmd5 = db_get cache => "$id/md5";
2371 if ($dbmd5 eq $md5) {
2372 db_put cache => "$id/meta", $meta;
2373
2374 return db_get cache => "$id/data";
2375 }
2376 }
2377
2378 my $data = $process->(\@data);
2379
2380 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta;
2383
2384 return $data;
2385 }
2386
2387 db_get cache => "$id/data"
2388}
2389
2390=item fork_call { }, $args
2391
2392Executes the given code block with the given arguments in a seperate
2393process, returning the results. Everything must be serialisable with
2394Coro::Storable. May, of course, block. Note that the executed sub may
2395never block itself or use any form of Event handling.
2396
2397=cut
2398
2399sub fork_call(&@) {
2400 my ($cb, @args) = @_;
2401
2402# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403# or die "socketpair: $!";
2404 pipe my $fh1, my $fh2
2405 or die "pipe: $!";
2406
2407 if (my $pid = fork) {
2408 close $fh2;
2409
2410 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411 $res = Coro::Storable::thaw $res;
2412
2413 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415 die $$res unless "ARRAY" eq ref $res;
2416
2417 return wantarray ? @$res : $res->[-1];
2418 } else {
2419 eval {
2420 local $SIG{__DIE__};
2421 local $SIG{__WARN__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 _exit 0;
2429 }
2430}
2431
2432
2334 2433
2335############################################################################# 2434#############################################################################
2336# the server's init and main functions 2435# the server's init and main functions
2337 2436
2338sub load_facedata { 2437sub load_facedata($) {
2339 my $path = sprintf "%s/facedata", cf::datadir; 2438 my ($path) = @_;
2340 2439
2341 warn "loading facedata from $path\n"; 2440 warn "loading facedata from $path\n";
2342 2441
2343 my $facedata; 2442 my $facedata;
2344 0 < aio_load $path, $facedata 2443 0 < aio_load $path, $facedata
… …
2385 } 2484 }
2386 2485
2387 1 2486 1
2388} 2487}
2389 2488
2489sub reload_facedata {
2490 load_facedata sprintf "%s/facedata", cf::datadir
2491 or die "unable to load facedata\n";
2492}
2493
2494sub reload_regions {
2495 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2496 or die "unable to load regions file\n";
2497}
2498
2499sub reload_archetypes {
2500 load_resource_file sprintf "%s/archetypes", cf::datadir
2501 or die "unable to load archetypes\n";
2502}
2503
2504sub reload_treasures {
2505 load_resource_file sprintf "%s/treasures", cf::datadir
2506 or die "unable to load treasurelists\n";
2507}
2508
2390sub reload_resources { 2509sub reload_resources {
2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2510 warn "reloading resource files...\n";
2392 or die "unable to load regions file\n";#d# 2511
2512 reload_regions;
2393 load_facedata 2513 reload_facedata;
2394 or die "unable to load facedata\n";#d# 2514 reload_archetypes;
2515 reload_treasures;
2516
2517 warn "finished reloading resource files\n";
2395} 2518}
2396 2519
2397sub init { 2520sub init {
2398 reload_resources; 2521 reload_resources;
2399} 2522}
… …
2492 2615
2493 warn Carp::longmess "post_cleanup backtrace" 2616 warn Carp::longmess "post_cleanup backtrace"
2494 if $make_core; 2617 if $make_core;
2495} 2618}
2496 2619
2497sub reload() { 2620sub do_reload_perl() {
2498 # can/must only be called in main 2621 # can/must only be called in main
2499 if ($Coro::current != $Coro::main) { 2622 if ($Coro::current != $Coro::main) {
2500 warn "can only reload from main coroutine"; 2623 warn "can only reload from main coroutine";
2501 return; 2624 return;
2502 } 2625 }
… …
2601 warn "reattaching attachments to maps"; 2724 warn "reattaching attachments to maps";
2602 reattach $_ for values %MAP; 2725 reattach $_ for values %MAP;
2603 warn "reattaching attachments to players"; 2726 warn "reattaching attachments to players";
2604 reattach $_ for values %PLAYER; 2727 reattach $_ for values %PLAYER;
2605 2728
2606 warn "loading reloadable resources";
2607 reload_resources;
2608
2609 warn "leaving sync_job"; 2729 warn "leaving sync_job";
2610 2730
2611 1 2731 1
2612 } or do { 2732 } or do {
2613 warn $@; 2733 warn $@;
… …
2618 warn "reloaded"; 2738 warn "reloaded";
2619}; 2739};
2620 2740
2621our $RELOAD_WATCHER; # used only during reload 2741our $RELOAD_WATCHER; # used only during reload
2622 2742
2743sub reload_perl() {
2744 # doing reload synchronously and two reloads happen back-to-back,
2745 # coro crashes during coro_state_free->destroy here.
2746
2747 $RELOAD_WATCHER ||= Event->timer (
2748 reentrant => 0,
2749 after => 0,
2750 data => WF_AUTOCANCEL,
2751 cb => sub {
2752 do_reload_perl;
2753 undef $RELOAD_WATCHER;
2754 },
2755 );
2756}
2757
2623register_command "reload" => sub { 2758register_command "reload" => sub {
2624 my ($who, $arg) = @_; 2759 my ($who, $arg) = @_;
2625 2760
2626 if ($who->flag (FLAG_WIZ)) { 2761 if ($who->flag (FLAG_WIZ)) {
2627 $who->message ("reloading server."); 2762 $who->message ("reloading server.");
2628 2763 async { reload_perl };
2629 # doing reload synchronously and two reloads happen back-to-back,
2630 # coro crashes during coro_state_free->destroy here.
2631
2632 $RELOAD_WATCHER ||= Event->timer (
2633 reentrant => 0,
2634 after => 0,
2635 data => WF_AUTOCANCEL,
2636 cb => sub {
2637 reload;
2638 undef $RELOAD_WATCHER;
2639 },
2640 );
2641 } 2764 }
2642}; 2765};
2643 2766
2644unshift @INC, $LIBDIR; 2767unshift @INC, $LIBDIR;
2645 2768
2646my $bug_warning = 0; 2769my $bug_warning = 0;
2770
2771our @WAIT_FOR_TICK;
2772our @WAIT_FOR_TICK_BEGIN;
2773
2774sub wait_for_tick {
2775 return unless $TICK_WATCHER->is_active;
2776 return if $Coro::current == $Coro::main;
2777
2778 my $signal = new Coro::Signal;
2779 push @WAIT_FOR_TICK, $signal;
2780 $signal->wait;
2781}
2782
2783sub wait_for_tick_begin {
2784 return unless $TICK_WATCHER->is_active;
2785 return if $Coro::current == $Coro::main;
2786
2787 my $signal = new Coro::Signal;
2788 push @WAIT_FOR_TICK_BEGIN, $signal;
2789 $signal->wait;
2790}
2647 2791
2648$TICK_WATCHER = Event->timer ( 2792$TICK_WATCHER = Event->timer (
2649 reentrant => 0, 2793 reentrant => 0,
2650 parked => 1, 2794 parked => 1,
2651 prio => 0, 2795 prio => 0,
… …
2659 } 2803 }
2660 2804
2661 $NOW = Event::time; 2805 $NOW = Event::time;
2662 2806
2663 cf::server_tick; # one server iteration 2807 cf::server_tick; # one server iteration
2808
2664 $RUNTIME += $TICK; 2809 $RUNTIME += $TICK;
2665 $NEXT_TICK += $TICK; 2810 $NEXT_TICK += $TICK;
2666 2811
2667 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2812 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2668 $NEXT_RUNTIME_WRITE = $NOW + 10; 2813 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2670 write_runtime 2815 write_runtime
2671 or warn "ERROR: unable to write runtime file: $!"; 2816 or warn "ERROR: unable to write runtime file: $!";
2672 }; 2817 };
2673 } 2818 }
2674 2819
2675 $WAIT_FOR_TICK->broadcast;
2676 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2677
2678# my $AFTER = Event::time; 2820# my $AFTER = Event::time;
2679# warn $AFTER - $NOW;#d# 2821# warn $AFTER - $NOW;#d#
2680 2822
2681 # if we are delayed by four ticks or more, skip them all 2823 # if we are delayed by four ticks or more, skip them all
2682 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2824 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2683 2825
2684 $TICK_WATCHER->at ($NEXT_TICK); 2826 $TICK_WATCHER->at ($NEXT_TICK);
2685 $TICK_WATCHER->start; 2827 $TICK_WATCHER->start;
2828
2829 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2830 $sig->send;
2831 }
2832 while (my $sig = shift @WAIT_FOR_TICK) {
2833 $sig->send;
2834 }
2835
2836 _post_tick;
2686 }, 2837 },
2687); 2838);
2688 2839
2689{ 2840{
2690 BDB::max_poll_time $TICK * 0.1; 2841 BDB::max_poll_time $TICK * 0.1;
… …
2749 prio => 6, 2900 prio => 6,
2750 cb => \&IO::AIO::poll_cb, 2901 cb => \&IO::AIO::poll_cb,
2751 ); 2902 );
2752} 2903}
2753 2904
2905# load additional modules
2906use cf::pod;
2907
2754END { cf::emergency_save } 2908END { cf::emergency_save }
2755 2909
27561 29101
2757 2911

Diff Legend

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