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.242 by root, Mon Apr 16 12:37:08 2007 UTC

… …
76our %MAP; # all maps 76our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db"; 79our $BDB_ENV_DIR = cf::localdir . "/db";
80 80
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 ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 83
87binmode STDOUT; 84binmode STDOUT;
88binmode STDERR; 85binmode STDERR;
… …
136=item %cf::CFG 133=item %cf::CFG
137 134
138Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 136from wherever your confdir points to.
140 137
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
142 139
143These 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
144or 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
145processing 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.
146window of cpu time available, or simply to synchronise to the server tick.
147 143
148=back 144=back
149 145
150=cut 146=cut
151 147
… …
1159 my ($self, $type, %msg) = @_; 1155 my ($self, $type, %msg) = @_;
1160 1156
1161 $self->ns->ext_event ($type, %msg); 1157 $self->ns->ext_event ($type, %msg);
1162} 1158}
1163 1159
1164package 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}
1165 1188
1166=back 1189=back
1167
1168 1190
1169=head3 cf::map 1191=head3 cf::map
1170 1192
1171=over 4 1193=over 4
1172 1194
… …
1403 $self->load_header_orig 1425 $self->load_header_orig
1404 or return; 1426 or return;
1405 $self->prepare_orig; 1427 $self->prepare_orig;
1406 } 1428 }
1407 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1408 1 1433 1
1409} 1434}
1410 1435
1411sub find; 1436sub find;
1412sub find { 1437sub find {
… …
1454 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1455 1480
1456 $self->alloc; 1481 $self->alloc;
1457 1482
1458 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1459 1485
1460 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1461 or return; 1487 or return;
1462 1488
1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1470 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1471 } 1497 }
1472 } 1498 }
1473 1499
1474 Coro::cede; 1500 Coro::cede;
1475
1476 # now do the right thing for maps 1501 # now do the right thing for maps
1477 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1478 1504
1479 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1480 $self->decay_objects; 1506 $self->decay_objects;
1481 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1482 $self->update_buttons; 1508 $self->update_buttons;
… …
1484 $self->set_darkness_map; 1510 $self->set_darkness_map;
1485 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1486 unless $self->difficulty; 1512 unless $self->difficulty;
1487 Coro::cede; 1513 Coro::cede;
1488 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1489 } 1516 }
1490 1517
1491 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1492 1520
1493 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1494} 1522}
1495 1523
1496sub customise_for { 1524sub customise_for {
… …
2356 } 2384 }
2357 2385
2358 1 2386 1
2359} 2387}
2360 2388
2389our $archetypes_loaded;
2390
2391sub load_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once
2393# load_archetype_file sprintf "%s/archetypes", cf::datadir;
2394 load_archetype_file sprintf "%s/archetypes", cf::datadir
2395}
2396
2397sub load_treasures {
2398 load_treasure_file sprintf "%s/treasures", cf::datadir
2399}
2400
2361sub reload_resources { 2401sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2402 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2363 or die "unable to load regions file\n";#d# 2403 or die "unable to load regions file\n";
2364 load_facedata 2404 load_facedata
2365 or die "unable to load facedata\n";#d# 2405 or die "unable to load facedata\n";
2406 load_archetypes
2407 or die "unable to load archetypes\n";
2408 load_treasures
2409 or die "unable to load treasurelists\n";
2366} 2410}
2367 2411
2368sub init { 2412sub init {
2369 reload_resources; 2413 reload_resources;
2370} 2414}
… …
2614 2658
2615unshift @INC, $LIBDIR; 2659unshift @INC, $LIBDIR;
2616 2660
2617my $bug_warning = 0; 2661my $bug_warning = 0;
2618 2662
2663our @WAIT_FOR_TICK;
2664our @WAIT_FOR_TICK_BEGIN;
2665
2666sub wait_for_tick {
2667 return unless $TICK_WATCHER->is_active;
2668 return if $Coro::current == $Coro::main;
2669
2670 my $signal = new Coro::Signal;
2671 push @WAIT_FOR_TICK, $signal;
2672 $signal->wait;
2673}
2674
2675sub wait_for_tick_begin {
2676 return unless $TICK_WATCHER->is_active;
2677 return if $Coro::current == $Coro::main;
2678
2679 my $signal = new Coro::Signal;
2680 push @WAIT_FOR_TICK_BEGIN, $signal;
2681 $signal->wait;
2682}
2683
2619$TICK_WATCHER = Event->timer ( 2684$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2685 reentrant => 0,
2621 parked => 1, 2686 parked => 1,
2622 prio => 0, 2687 prio => 0,
2623 at => $NEXT_TICK || $TICK, 2688 at => $NEXT_TICK || $TICK,
… …
2641 write_runtime 2706 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2707 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2708 };
2644 } 2709 }
2645 2710
2646 $WAIT_FOR_TICK->broadcast; 2711 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2712 $sig->send;
2713 }
2714 while (my $sig = shift @WAIT_FOR_TICK) {
2715 $sig->send;
2716 }
2648 2717
2649# my $AFTER = Event::time; 2718# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2719# warn $AFTER - $NOW;#d#
2651 2720
2652 # if we are delayed by four ticks or more, skip them all 2721 # if we are delayed by four ticks or more, skip them all

Diff Legend

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