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.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.252 by root, Wed Apr 18 15:28:18 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';
… …
1159 my ($self, $type, %msg) = @_; 1159 my ($self, $type, %msg) = @_;
1160 1160
1161 $self->ns->ext_event ($type, %msg); 1161 $self->ns->ext_event ($type, %msg);
1162} 1162}
1163 1163
1164package cf; 1164=head3 cf::region
1165
1166=over 4
1167
1168=cut
1169
1170package cf::region;
1171
1172=item cf::region::find_by_path $path
1173
1174Tries to decuce the probable region for a map knowing only its path.
1175
1176=cut
1177
1178sub find_by_path($) {
1179 my ($path) = @_;
1180
1181 my ($match, $specificity);
1182
1183 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) {
1185 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity;
1187 }
1188 }
1189
1190 $match
1191}
1165 1192
1166=back 1193=back
1167
1168 1194
1169=head3 cf::map 1195=head3 cf::map
1170 1196
1171=over 4 1197=over 4
1172 1198
… …
1403 $self->load_header_orig 1429 $self->load_header_orig
1404 or return; 1430 or return;
1405 $self->prepare_orig; 1431 $self->prepare_orig;
1406 } 1432 }
1407 1433
1434 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region;
1436
1408 1 1437 1
1409} 1438}
1410 1439
1411sub find; 1440sub find;
1412sub find { 1441sub find {
… …
1454 $self->in_memory (cf::MAP_LOADING); 1483 $self->in_memory (cf::MAP_LOADING);
1455 1484
1456 $self->alloc; 1485 $self->alloc;
1457 1486
1458 $self->pre_load; 1487 $self->pre_load;
1488 Coro::cede;
1459 1489
1460 $self->_load_objects ($self->{load_path}, 1) 1490 $self->_load_objects ($self->{load_path}, 1)
1461 or return; 1491 or return;
1462 1492
1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1470 $self->_load_objects ($uniq, 0); 1500 $self->_load_objects ($uniq, 0);
1471 } 1501 }
1472 } 1502 }
1473 1503
1474 Coro::cede; 1504 Coro::cede;
1475
1476 # now do the right thing for maps 1505 # now do the right thing for maps
1477 $self->link_multipart_objects; 1506 $self->link_multipart_objects;
1507 Coro::cede;
1478 1508
1479 unless ($self->{deny_activate}) { 1509 unless ($self->{deny_activate}) {
1480 $self->decay_objects; 1510 $self->decay_objects;
1481 $self->fix_auto_apply; 1511 $self->fix_auto_apply;
1482 $self->update_buttons; 1512 $self->update_buttons;
… …
1484 $self->set_darkness_map; 1514 $self->set_darkness_map;
1485 $self->difficulty ($self->estimate_difficulty) 1515 $self->difficulty ($self->estimate_difficulty)
1486 unless $self->difficulty; 1516 unless $self->difficulty;
1487 Coro::cede; 1517 Coro::cede;
1488 $self->activate; 1518 $self->activate;
1519 Coro::cede;
1489 } 1520 }
1490 1521
1491 $self->post_load; 1522 $self->post_load;
1523 Coro::cede;
1492 1524
1493 $self->in_memory (cf::MAP_IN_MEMORY); 1525 $self->in_memory (cf::MAP_IN_MEMORY);
1494} 1526}
1495 1527
1496sub customise_for { 1528sub customise_for {
… …
2234############################################################################# 2266#############################################################################
2235 2267
2236=head2 EXTENSION DATABASE SUPPORT 2268=head2 EXTENSION DATABASE SUPPORT
2237 2269
2238Crossfire maintains a very simple database for extension use. It can 2270Crossfire maintains a very simple database for extension use. It can
2239currently store anything that can be serialised using Storable, which 2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2240excludes objects. 2272convert to/from binary).
2241 2273
2242The 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
2243using it, it should be unique. 2275using it, it should be unique.
2244 2276
2245=over 4 2277=over 4
… …
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!; 2301 cf::cleanup "db_open(db): $!" if $!;
2270 }; 2302 };
2271 cf::cleanup "db_open(db): $@" if $@; 2303 cf::cleanup "db_open(db): $@" if $@;
2272 }; 2304 };
2273
2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2278
2279 cf::db_put (board => data => $pst->{board});
2280 cf::db_put (guildrules => data => $pst->{guildrules});
2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2283
2284 unlink $path;
2285 };
2286 }
2287 } 2305 }
2288} 2306}
2289 2307
2290sub db_get($$) { 2308sub db_get($$) {
2291 my $key = "$_[0]/$_[1]"; 2309 my $key = "$_[0]/$_[1]";
2292 2310
2293 cf::sync_job { 2311 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data; 2312 BDB::db_get $DB, undef, $key, my $data;
2295 2313
2296 $! ? () 2314 $! ? ()
2297 : Compress::LZF::sthaw $data 2315 : $data
2298 } 2316 }
2299} 2317}
2300 2318
2301sub db_put($$$) { 2319sub db_put($$$) {
2302 BDB::dbreq_pri 4; 2320 BDB::dbreq_pri 4;
2303 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 { };
2304} 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 local $SIG{__WARN__};
2420 eval {
2421 local $SIG{__DIE__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 warn $@ if $@;
2429 _exit 0;
2430 }
2431}
2432
2433
2305 2434
2306############################################################################# 2435#############################################################################
2307# the server's init and main functions 2436# the server's init and main functions
2308 2437
2309sub load_facedata { 2438sub load_facedata($) {
2310 my $path = sprintf "%s/facedata", cf::datadir; 2439 my ($path) = @_;
2311 2440
2312 warn "loading facedata from $path\n"; 2441 warn "loading facedata from $path\n";
2313 2442
2314 my $facedata; 2443 my $facedata;
2315 0 < aio_load $path, $facedata 2444 0 < aio_load $path, $facedata
… …
2356 } 2485 }
2357 2486
2358 1 2487 1
2359} 2488}
2360 2489
2490sub reload_facedata {
2491 load_facedata sprintf "%s/facedata", cf::datadir
2492 or die "unable to load facedata\n";
2493}
2494
2495sub reload_regions {
2496 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2497 or die "unable to load regions file\n";
2498}
2499
2500sub reload_archetypes {
2501 load_resource_file sprintf "%s/archetypes", cf::datadir
2502 or die "unable to load archetypes\n";
2503}
2504
2505sub reload_treasures {
2506 load_resource_file sprintf "%s/treasures", cf::datadir
2507 or die "unable to load treasurelists\n";
2508}
2509
2361sub reload_resources { 2510sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2511 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2512
2513 reload_regions;
2364 load_facedata 2514 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2515 reload_archetypes;
2516 reload_treasures;
2517
2518 warn "finished reloading resource files\n";
2366} 2519}
2367 2520
2368sub init { 2521sub init {
2369 reload_resources; 2522 reload_resources;
2370} 2523}
… …
2463 2616
2464 warn Carp::longmess "post_cleanup backtrace" 2617 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 2618 if $make_core;
2466} 2619}
2467 2620
2468sub reload() { 2621sub do_reload_perl() {
2469 # can/must only be called in main 2622 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 2623 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 2624 warn "can only reload from main coroutine";
2472 return; 2625 return;
2473 } 2626 }
… …
2548 Symbol::delete_package "safe::$_" 2701 Symbol::delete_package "safe::$_"
2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2702 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550 2703
2551 warn "unloading cf.pm \"a bit\""; 2704 warn "unloading cf.pm \"a bit\"";
2552 delete $INC{"cf.pm"}; 2705 delete $INC{"cf.pm"};
2706 delete $INC{"cf/pod.pm"};
2553 2707
2554 # don't, removes xs symbols, too, 2708 # don't, removes xs symbols, too,
2555 # and global variables created in xs 2709 # and global variables created in xs
2556 #Symbol::delete_package __PACKAGE__; 2710 #Symbol::delete_package __PACKAGE__;
2557 2711
… …
2572 warn "reattaching attachments to maps"; 2726 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 2727 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 2728 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 2729 reattach $_ for values %PLAYER;
2576 2730
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 2731 warn "leaving sync_job";
2581 2732
2582 1 2733 1
2583 } or do { 2734 } or do {
2584 warn $@; 2735 warn $@;
… …
2589 warn "reloaded"; 2740 warn "reloaded";
2590}; 2741};
2591 2742
2592our $RELOAD_WATCHER; # used only during reload 2743our $RELOAD_WATCHER; # used only during reload
2593 2744
2745sub reload_perl() {
2746 # doing reload synchronously and two reloads happen back-to-back,
2747 # coro crashes during coro_state_free->destroy here.
2748
2749 $RELOAD_WATCHER ||= Event->timer (
2750 reentrant => 0,
2751 after => 0,
2752 data => WF_AUTOCANCEL,
2753 cb => sub {
2754 do_reload_perl;
2755 undef $RELOAD_WATCHER;
2756 },
2757 );
2758}
2759
2594register_command "reload" => sub { 2760register_command "reload" => sub {
2595 my ($who, $arg) = @_; 2761 my ($who, $arg) = @_;
2596 2762
2597 if ($who->flag (FLAG_WIZ)) { 2763 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 2764 $who->message ("reloading server.");
2599 2765 async { reload_perl };
2600 # doing reload synchronously and two reloads happen back-to-back,
2601 # coro crashes during coro_state_free->destroy here.
2602
2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2608 reload;
2609 undef $RELOAD_WATCHER;
2610 },
2611 );
2612 } 2766 }
2613}; 2767};
2614 2768
2615unshift @INC, $LIBDIR; 2769unshift @INC, $LIBDIR;
2616 2770
2617my $bug_warning = 0; 2771my $bug_warning = 0;
2772
2773our @WAIT_FOR_TICK;
2774our @WAIT_FOR_TICK_BEGIN;
2775
2776sub wait_for_tick {
2777 return unless $TICK_WATCHER->is_active;
2778 return if $Coro::current == $Coro::main;
2779
2780 my $signal = new Coro::Signal;
2781 push @WAIT_FOR_TICK, $signal;
2782 $signal->wait;
2783}
2784
2785sub wait_for_tick_begin {
2786 return unless $TICK_WATCHER->is_active;
2787 return if $Coro::current == $Coro::main;
2788
2789 my $signal = new Coro::Signal;
2790 push @WAIT_FOR_TICK_BEGIN, $signal;
2791 $signal->wait;
2792}
2618 2793
2619$TICK_WATCHER = Event->timer ( 2794$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2795 reentrant => 0,
2621 parked => 1, 2796 parked => 1,
2622 prio => 0, 2797 prio => 0,
… …
2630 } 2805 }
2631 2806
2632 $NOW = Event::time; 2807 $NOW = Event::time;
2633 2808
2634 cf::server_tick; # one server iteration 2809 cf::server_tick; # one server iteration
2810
2635 $RUNTIME += $TICK; 2811 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 2812 $NEXT_TICK += $TICK;
2637 2813
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2814 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 2815 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2641 write_runtime 2817 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2818 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2819 };
2644 } 2820 }
2645 2821
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 2822# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2823# warn $AFTER - $NOW;#d#
2651 2824
2652 # if we are delayed by four ticks or more, skip them all 2825 # if we are delayed by four ticks or more, skip them all
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2826 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2654 2827
2655 $TICK_WATCHER->at ($NEXT_TICK); 2828 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 2829 $TICK_WATCHER->start;
2830
2831 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2832 $sig->send;
2833 }
2834 while (my $sig = shift @WAIT_FOR_TICK) {
2835 $sig->send;
2836 }
2837
2838 _post_tick;
2657 }, 2839 },
2658); 2840);
2659 2841
2660{ 2842{
2661 BDB::max_poll_time $TICK * 0.1; 2843 BDB::max_poll_time $TICK * 0.1;
… …
2720 prio => 6, 2902 prio => 6,
2721 cb => \&IO::AIO::poll_cb, 2903 cb => \&IO::AIO::poll_cb,
2722 ); 2904 );
2723} 2905}
2724 2906
2907# load additional modules
2908use cf::pod;
2909
2725END { cf::emergency_save } 2910END { cf::emergency_save }
2726 2911
27271 29121
2728 2913

Diff Legend

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