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.228 by root, Mon Mar 26 16:53:33 2007 UTC vs.
Revision 1.245 by root, Tue Apr 17 10:06:33 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
… …
373 and return; 371 and return;
374 372
375 1 373 1
376} 374}
377 375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
385}
386
378=back 387=back
379 388
380=cut 389=cut
381 390
382############################################################################# 391#############################################################################
… …
952} 961}
953 962
954sub path($) { 963sub path($) {
955 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
956 965
957 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
958} 967}
959 968
960sub find_active($) { 969sub find_active($) {
961 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
962 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
… …
975 my $login = $_[0]; 984 my $login = $_[0];
976 985
977 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
978 987
979 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
980 my $pl = load_pl path $login 996 my $pl = load_pl path $login
981 or return; 997 or return;
982 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
983 } 999 }
984 } 1000 }
… …
1113 } 1129 }
1114 1130
1115 \@paths 1131 \@paths
1116} 1132}
1117 1133
1118=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1119 1135
1120Sends an ext reply to the player. 1136Sends an ext reply to the player.
1121 1137
1122=cut 1138=cut
1123 1139
1124sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1125 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1126 1142
1127 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1128 1144
1129 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1130} 1146}
1131 1147
1132package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
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}
1133 1188
1134=back 1189=back
1135
1136 1190
1137=head3 cf::map 1191=head3 cf::map
1138 1192
1139=over 4 1193=over 4
1140 1194
… …
1371 $self->load_header_orig 1425 $self->load_header_orig
1372 or return; 1426 or return;
1373 $self->prepare_orig; 1427 $self->prepare_orig;
1374 } 1428 }
1375 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1376 1 1433 1
1377} 1434}
1378 1435
1379sub find; 1436sub find;
1380sub find { 1437sub find {
… …
1422 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1423 1480
1424 $self->alloc; 1481 $self->alloc;
1425 1482
1426 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1427 1485
1428 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1429 or return; 1487 or return;
1430 1488
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1438 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1439 } 1497 }
1440 } 1498 }
1441 1499
1442 Coro::cede; 1500 Coro::cede;
1443
1444 # now do the right thing for maps 1501 # now do the right thing for maps
1445 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1446 1504
1447 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1448 $self->decay_objects; 1506 $self->decay_objects;
1449 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1450 $self->update_buttons; 1508 $self->update_buttons;
… …
1452 $self->set_darkness_map; 1510 $self->set_darkness_map;
1453 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1512 unless $self->difficulty;
1455 Coro::cede; 1513 Coro::cede;
1456 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1457 } 1516 }
1458 1517
1459 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1460 1520
1461 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1522}
1463 1523
1464sub customise_for { 1524sub customise_for {
… …
1942 2002
1943 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
1944 2004
1945 if ($exit->slaying eq "/!") { 2005 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job 2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
1947 cf::sync_job { prepare_random_map $exit }; 2009 cf::sync_job { prepare_random_map $exit };
1948 } 2010 }
1949 2011
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp; 2013 my $hp = $exit->stats->hp;
… …
1959 $self->goto ($slaying, $hp, $sp); 2021 $self->goto ($slaying, $hp, $sp);
1960 2022
1961 1; 2023 1;
1962 }) { 2024 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1965 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1967 2029
1968 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2031 $self->leave_link;
1970 } 2032 }
1971 })->prio (1); 2033 })->prio (1);
… …
1987 2049
1988 utf8::encode $text; 2050 utf8::encode $text;
1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1990} 2052}
1991 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
1992 2066
1993=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1994 2068
1995Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1996the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2258} 2332}
2259 2333
2260############################################################################# 2334#############################################################################
2261# the server's init and main functions 2335# the server's init and main functions
2262 2336
2263sub load_faces { 2337sub load_facedata {
2264 my $path = sprintf "%s/faces", cf::datadir; 2338 my $path = sprintf "%s/facedata", cf::datadir;
2265 2339
2266 warn "loading faces from $path\n"; 2340 warn "loading facedata from $path\n";
2267 2341
2268 my $faces; 2342 my $facedata;
2269 0 < aio_load $path, $faces 2343 0 < aio_load $path, $facedata
2270 or die "$path: $!"; 2344 or die "$path: $!";
2271 2345
2272 Coro::cede;
2273 $faces = Storable::thaw $faces; 2346 $facedata = Coro::Storable::thaw $facedata;
2274 Coro::cede;
2275 2347
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1 2348 $facedata->{version} == 2
2278 or cf::cleanup "$path: version mismatch, cannot proceed."; 2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279 2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2280 while (my ($face, $info) = each %$faces) { 2354 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2284 Coro::cede; 2359 Coro::cede;
2285 } 2360 }
2286 2361
2287 while (my ($face, $info) = each %$faces) { 2362 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth}; 2363 next unless $info->{smooth};
2289 my $idx = cf::face::find $face 2364 my $idx = cf::face::find $face
2290 or next; 2365 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) { 2366 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth; 2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2293 } else { 2368 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 } 2370 }
2296 Coro::cede; 2371 Coro::cede;
2372 }
2373 }
2374
2375 {
2376 my $anims = $facedata->{animinfo};
2377
2378 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede;
2381 }
2382
2383 cf::anim::invalidate_all; # d'oh
2297 } 2384 }
2298 2385
2299 1 2386 1
2300} 2387}
2301 2388
2389sub load_archetypes {
2390 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable
2391 load_archetype_file sprintf "%s/archetypes", cf::datadir
2392}
2393
2394sub load_treasures {
2395 load_treasure_file sprintf "%s/treasures", cf::datadir
2396}
2397
2302sub reload_resources { 2398sub reload_resources {
2399 warn "reloading resource files...\n";
2400
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2401 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2304 or die "unable to load regions file\n";#d# 2402 or die "unable to load regions file\n";
2305 load_faces 2403 load_facedata
2306 or die "unable to load faces\n";#d# 2404 or die "unable to load facedata\n";
2405 load_archetypes
2406 or die "unable to load archetypes\n";
2407 load_treasures
2408 or die "unable to load treasurelists\n";
2409
2410 warn "finished reloading resource files\n";
2307} 2411}
2308 2412
2309sub init { 2413sub init {
2310 reload_resources; 2414 reload_resources;
2311} 2415}
… …
2555 2659
2556unshift @INC, $LIBDIR; 2660unshift @INC, $LIBDIR;
2557 2661
2558my $bug_warning = 0; 2662my $bug_warning = 0;
2559 2663
2664our @WAIT_FOR_TICK;
2665our @WAIT_FOR_TICK_BEGIN;
2666
2667sub wait_for_tick {
2668 return unless $TICK_WATCHER->is_active;
2669 return if $Coro::current == $Coro::main;
2670
2671 my $signal = new Coro::Signal;
2672 push @WAIT_FOR_TICK, $signal;
2673 $signal->wait;
2674}
2675
2676sub wait_for_tick_begin {
2677 return unless $TICK_WATCHER->is_active;
2678 return if $Coro::current == $Coro::main;
2679
2680 my $signal = new Coro::Signal;
2681 push @WAIT_FOR_TICK_BEGIN, $signal;
2682 $signal->wait;
2683}
2684
2560$TICK_WATCHER = Event->timer ( 2685$TICK_WATCHER = Event->timer (
2561 reentrant => 0, 2686 reentrant => 0,
2562 parked => 1, 2687 parked => 1,
2563 prio => 0, 2688 prio => 0,
2564 at => $NEXT_TICK || $TICK, 2689 at => $NEXT_TICK || $TICK,
… …
2571 } 2696 }
2572 2697
2573 $NOW = Event::time; 2698 $NOW = Event::time;
2574 2699
2575 cf::server_tick; # one server iteration 2700 cf::server_tick; # one server iteration
2701
2576 $RUNTIME += $TICK; 2702 $RUNTIME += $TICK;
2577 $NEXT_TICK += $TICK; 2703 $NEXT_TICK += $TICK;
2578 2704
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2705 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10; 2706 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2582 write_runtime 2708 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!"; 2709 or warn "ERROR: unable to write runtime file: $!";
2584 }; 2710 };
2585 } 2711 }
2586 2712
2587 $WAIT_FOR_TICK->broadcast;
2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time; 2713# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d# 2714# warn $AFTER - $NOW;#d#
2592 2715
2593 # if we are delayed by four ticks or more, skip them all 2716 # if we are delayed by four ticks or more, skip them all
2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2717 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2595 2718
2596 $TICK_WATCHER->at ($NEXT_TICK); 2719 $TICK_WATCHER->at ($NEXT_TICK);
2597 $TICK_WATCHER->start; 2720 $TICK_WATCHER->start;
2721
2722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2723 $sig->send;
2724 }
2725 while (my $sig = shift @WAIT_FOR_TICK) {
2726 $sig->send;
2727 }
2728
2729 _post_tick;
2598 }, 2730 },
2599); 2731);
2600 2732
2601{ 2733{
2602 BDB::max_poll_time $TICK * 0.1; 2734 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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