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.236 by root, Thu Apr 12 14:18:05 2007 UTC vs.
Revision 1.247 by root, Tue Apr 17 18:24:30 2007 UTC

… …
9use Event; 9use Event;
10use Opcode; 10use Opcode;
11use Safe; 11use Safe;
12use Safe::Hole; 12use Safe::Hole;
13 13
14use Coro 3.52 (); 14use Coro 3.61 ();
15use Coro::State; 15use Coro::State;
16use Coro::Event; 16use Coro::Event;
17use Coro::Timer; 17use Coro::Timer;
18use Coro::Signal; 18use Coro::Signal;
19use Coro::Semaphore; 19use Coro::Semaphore;
20use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
21 22
22use BDB (); 23use BDB ();
23use Data::Dumper; 24use Data::Dumper;
24use Digest::MD5; 25use Digest::MD5;
25use Fcntl; 26use Fcntl;
… …
28use Time::HiRes; 29use Time::HiRes;
29use Compress::LZF; 30use Compress::LZF;
30 31
31# configure various modules to our taste 32# configure various modules to our taste
32# 33#
34$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 37
36$Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
37 39
… …
52 54
53our $RELOAD; # number of reloads so far 55our $RELOAD; # number of reloads so far
54our @EVENT; 56our @EVENT;
55our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
56 58
57our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 60our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 63our $NEXT_TICK;
62our $NOW; 64our $NOW;
… …
74our %MAP; # all maps 76our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db"; 79our $BDB_ENV_DIR = cf::localdir . "/db";
78 80
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81
82# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 83
85binmode STDOUT; 84binmode STDOUT;
86binmode STDERR; 85binmode STDERR;
… …
134=item %cf::CFG 133=item %cf::CFG
135 134
136Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 136from wherever your confdir points to.
138 137
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
140 139
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick.
145 143
146=back 144=back
147 145
148=cut 146=cut
149 147
… …
1157 my ($self, $type, %msg) = @_; 1155 my ($self, $type, %msg) = @_;
1158 1156
1159 $self->ns->ext_event ($type, %msg); 1157 $self->ns->ext_event ($type, %msg);
1160} 1158}
1161 1159
1162package cf; 1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1163 1188
1164=back 1189=back
1165
1166 1190
1167=head3 cf::map 1191=head3 cf::map
1168 1192
1169=over 4 1193=over 4
1170 1194
… …
1401 $self->load_header_orig 1425 $self->load_header_orig
1402 or return; 1426 or return;
1403 $self->prepare_orig; 1427 $self->prepare_orig;
1404 } 1428 }
1405 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1406 1 1433 1
1407} 1434}
1408 1435
1409sub find; 1436sub find;
1410sub find { 1437sub find {
… …
1452 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1453 1480
1454 $self->alloc; 1481 $self->alloc;
1455 1482
1456 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1457 1485
1458 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1459 or return; 1487 or return;
1460 1488
1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1468 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1469 } 1497 }
1470 } 1498 }
1471 1499
1472 Coro::cede; 1500 Coro::cede;
1473
1474 # now do the right thing for maps 1501 # now do the right thing for maps
1475 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1476 1504
1477 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1478 $self->decay_objects; 1506 $self->decay_objects;
1479 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1480 $self->update_buttons; 1508 $self->update_buttons;
… …
1482 $self->set_darkness_map; 1510 $self->set_darkness_map;
1483 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 1512 unless $self->difficulty;
1485 Coro::cede; 1513 Coro::cede;
1486 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1487 } 1516 }
1488 1517
1489 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1490 1520
1491 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 1522}
1493 1523
1494sub customise_for { 1524sub customise_for {
… …
2302} 2332}
2303 2333
2304############################################################################# 2334#############################################################################
2305# the server's init and main functions 2335# the server's init and main functions
2306 2336
2307sub load_facedata { 2337sub load_facedata($) {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2338 my ($path) = @_;
2309 2339
2310 warn "loading facedata from $path\n"; 2340 warn "loading facedata from $path\n";
2311 2341
2312 my $facedata; 2342 my $facedata;
2313 0 < aio_load $path, $facedata 2343 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2344 or die "$path: $!";
2315 2345
2316 Coro::cede;
2317 $facedata = Storable::thaw $facedata; 2346 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2347
2320 $facedata->{version} == 2 2348 $facedata->{version} == 2
2321 or cf::cleanup "$path: version mismatch, cannot proceed."; 2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2322 2350
2323 { 2351 {
… …
2356 } 2384 }
2357 2385
2358 1 2386 1
2359} 2387}
2360 2388
2389sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir
2391 or die "unable to load facedata\n";
2392}
2393
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes {
2400 load_archetype_file sprintf "%s/archetypes", cf::datadir
2401 or die "unable to load archetypes\n";
2402}
2403
2404sub reload_treasures {
2405 load_resource_file sprintf "%s/treasures", cf::datadir
2406 or die "unable to load treasurelists\n";
2407}
2408
2361sub reload_resources { 2409sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2410 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2411
2412 reload_regions;
2364 load_facedata 2413 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2414 reload_archetypes;
2415 reload_treasures;
2416
2417 warn "finished reloading resource files\n";
2366} 2418}
2367 2419
2368sub init { 2420sub init {
2369 reload_resources; 2421 reload_resources;
2370} 2422}
… …
2463 2515
2464 warn Carp::longmess "post_cleanup backtrace" 2516 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 2517 if $make_core;
2466} 2518}
2467 2519
2468sub reload() { 2520sub do_reload_perl() {
2469 # can/must only be called in main 2521 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 2522 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 2523 warn "can only reload from main coroutine";
2472 return; 2524 return;
2473 } 2525 }
… …
2572 warn "reattaching attachments to maps"; 2624 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 2625 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 2626 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 2627 reattach $_ for values %PLAYER;
2576 2628
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 2629 warn "leaving sync_job";
2581 2630
2582 1 2631 1
2583 } or do { 2632 } or do {
2584 warn $@; 2633 warn $@;
… …
2589 warn "reloaded"; 2638 warn "reloaded";
2590}; 2639};
2591 2640
2592our $RELOAD_WATCHER; # used only during reload 2641our $RELOAD_WATCHER; # used only during reload
2593 2642
2643sub reload_perl() {
2644 # doing reload synchronously and two reloads happen back-to-back,
2645 # coro crashes during coro_state_free->destroy here.
2646
2647 $RELOAD_WATCHER ||= Event->timer (
2648 reentrant => 0,
2649 after => 0,
2650 data => WF_AUTOCANCEL,
2651 cb => sub {
2652 do_reload_perl;
2653 undef $RELOAD_WATCHER;
2654 },
2655 );
2656}
2657
2594register_command "reload" => sub { 2658register_command "reload" => sub {
2595 my ($who, $arg) = @_; 2659 my ($who, $arg) = @_;
2596 2660
2597 if ($who->flag (FLAG_WIZ)) { 2661 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 2662 $who->message ("reloading server.");
2599 2663 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 } 2664 }
2613}; 2665};
2614 2666
2615unshift @INC, $LIBDIR; 2667unshift @INC, $LIBDIR;
2616 2668
2617my $bug_warning = 0; 2669my $bug_warning = 0;
2670
2671our @WAIT_FOR_TICK;
2672our @WAIT_FOR_TICK_BEGIN;
2673
2674sub wait_for_tick {
2675 return unless $TICK_WATCHER->is_active;
2676 return if $Coro::current == $Coro::main;
2677
2678 my $signal = new Coro::Signal;
2679 push @WAIT_FOR_TICK, $signal;
2680 $signal->wait;
2681}
2682
2683sub wait_for_tick_begin {
2684 return unless $TICK_WATCHER->is_active;
2685 return if $Coro::current == $Coro::main;
2686
2687 my $signal = new Coro::Signal;
2688 push @WAIT_FOR_TICK_BEGIN, $signal;
2689 $signal->wait;
2690}
2618 2691
2619$TICK_WATCHER = Event->timer ( 2692$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2693 reentrant => 0,
2621 parked => 1, 2694 parked => 1,
2622 prio => 0, 2695 prio => 0,
… …
2630 } 2703 }
2631 2704
2632 $NOW = Event::time; 2705 $NOW = Event::time;
2633 2706
2634 cf::server_tick; # one server iteration 2707 cf::server_tick; # one server iteration
2708
2635 $RUNTIME += $TICK; 2709 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 2710 $NEXT_TICK += $TICK;
2637 2711
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2712 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 2713 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2641 write_runtime 2715 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2716 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2717 };
2644 } 2718 }
2645 2719
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 2720# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2721# warn $AFTER - $NOW;#d#
2651 2722
2652 # if we are delayed by four ticks or more, skip them all 2723 # if we are delayed by four ticks or more, skip them all
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2654 2725
2655 $TICK_WATCHER->at ($NEXT_TICK); 2726 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 2727 $TICK_WATCHER->start;
2728
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2730 $sig->send;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735
2736 _post_tick;
2657 }, 2737 },
2658); 2738);
2659 2739
2660{ 2740{
2661 BDB::max_poll_time $TICK * 0.1; 2741 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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