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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.348 by root, Thu Aug 30 08:34:40 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
264Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
269Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
273 284
… …
313 my $guard = Coro::guard { 324 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
315 }; 326 };
316 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
317 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
318} 385}
319 386
320=item cf::async { BLOCK } 387=item cf::async { BLOCK }
321 388
322Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
411 478
412=cut 479=cut
413 480
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 481sub fork_call(&@) {
424 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
425 483
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
429 or die "pipe: $!";
430 487
431 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 489 reset_signals;
445 local $SIG{__WARN__}; 490 &$cb
446 local $SIG{__DIE__}; 491 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 492
453 eval { 493 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 494}
466 495
467=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
468 497
469Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
549 if (1) { 578 if (1) {
550 $md5 = 579 $md5 =
551 join "\x00", 580 join "\x00",
552 $processversion, 581 $processversion,
553 map { 582 map {
554 Coro::cede; 583 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 585 } 0.. $#$src;
557 586
558 587
559 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
865 "; 894 ";
866 die if $@; 895 die if $@;
867} 896}
868 897
869our $override; 898our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 900
872sub override { 901sub override {
873 $override = 1; 902 $override = 1;
874 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
875} 904}
876 905
877sub do_invoke { 906sub do_invoke {
878 my $event = shift; 907 my $event = shift;
879 my $callbacks = shift; 908 my $callbacks = shift;
880 909
881 @invoke_results = (); 910 @INVOKE_RESULTS = ();
882 911
883 local $override; 912 local $override;
884 913
885 for (@$callbacks) { 914 for (@$callbacks) {
886 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
903 932
904Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
905 934
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 938
910=back 939=back
911 940
912=cut 941=cut
913 942
914############################################################################# 943#############################################################################
915# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
916 956
917sub reattach { 957sub reattach {
918 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 959 my ($obj) = @_;
920 960
… …
1107 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1108 1148
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1150
1111 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1117 } else { 1166 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1168 }
1120 1169
1121 cf::override; 1170 cf::override;
… …
1276 1325
1277 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1279 1328
1280 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1281 Coro::cede; 1330 cf::cede_to_tick;
1282} 1331}
1283 1332
1284sub new($) { 1333sub new($) {
1285 my ($login) = @_; 1334 my ($login) = @_;
1286 1335
… …
1290 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1291 1340
1292 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1293 1342
1294 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1295} 1354}
1296 1355
1297=item $pl->quit_character 1356=item $pl->quit_character
1298 1357
1299Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1435 s/\s+\n/\n/g; # ws line-ends 1494 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1495 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1496 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1497 s/\n+$//; # ending lines
1439 1498
1440 warn $_;#d#
1441 $_ 1499 $_
1442} 1500}
1443 1501
1444sub hintmode { 1502sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1504 $_[0]{hintmode}
1447} 1505}
1448 1506
1449=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1450 1508
1451Sends an ext reply to the player. 1509Sends an ext reply to the player.
1452 1510
1453=cut 1511=cut
1454 1512
1455sub ext_reply($$%) { 1513sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1457 1515
1458 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1517}
1461 1518
1462=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1463 1520
1464Sends an ext event to the client. 1521Sends an ext event to the client.
1465 1522
1466=cut 1523=cut
1467 1524
1468sub ext_event($$%) { 1525sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1470 1527
1471 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1472} 1529}
1473 1530
1474=head3 cf::region 1531=head3 cf::region
1475 1532
1476=over 4 1533=over 4
… …
1489 my ($path) = @_; 1546 my ($path) = @_;
1490 1547
1491 my ($match, $specificity); 1548 my ($match, $specificity);
1492 1549
1493 for my $region (list) { 1550 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1497 } 1554 }
1498 } 1555 }
1499 1556
… …
1619 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1620 return $self; 1677 return $self;
1621 } 1678 }
1622 } 1679 }
1623 1680
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1682 ()
1626} 1683}
1627 1684
1628sub init { 1685sub init {
1629 my ($self) = @_; 1686 my ($self) = @_;
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1796 1853
1797 my $path = $self->{path}; 1854 my $path = $self->{path};
1798 1855
1799 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1800 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1801 1859
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1803 1861
1804 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1805 1863
1806 $self->alloc; 1864 $self->alloc;
1807 1865
1808 $self->pre_load; 1866 $self->pre_load;
1809 Coro::cede; 1867 cf::cede_to_tick;
1810 1868
1811 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1812 or return; 1870 or return;
1813 1871
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1820 $self->clear_unique_items; 1878 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1822 } 1880 }
1823 } 1881 }
1824 1882
1825 Coro::cede; 1883 cf::cede_to_tick;
1826 # now do the right thing for maps 1884 # now do the right thing for maps
1827 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 1887 unless $self->difficulty;
1830 Coro::cede; 1888 cf::cede_to_tick;
1831 1889
1832 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 1891 $self->decay_objects;
1834 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1835 $self->update_buttons; 1893 $self->update_buttons;
1836 Coro::cede; 1894 cf::cede_to_tick;
1837 $self->set_darkness_map; 1895 $self->set_darkness_map;
1838 Coro::cede; 1896 cf::cede_to_tick;
1839 $self->activate; 1897 $self->activate;
1840 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1841 1902
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1904 }
1844 1905
1845 $self->post_load; 1906 $self->post_load;
… …
1856 1917
1857 $self 1918 $self
1858} 1919}
1859 1920
1860# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1861sub load_diag { 1922sub load_neighbours {
1862 my ($map) = @_; 1923 my ($map) = @_;
1863 1924
1864 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1865 1926
1866 for (0 .. 3) { 1927 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1868 or next; 1929 or next;
1869 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1870 or next; 1931 or next;
1871 $neigh->load; 1932 $neigh->load;
1872 1933
1934 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 1937 }
1876 1938
1877 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1879 or next; 1942 or next;
1880 $neigh->load; 1943 $neigh->load;
1881 } 1944 }
1882} 1945}
1883 1946
… …
1888} 1951}
1889 1952
1890sub do_load_sync { 1953sub do_load_sync {
1891 my ($map) = @_; 1954 my ($map) = @_;
1892 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1893 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1894} 1960}
1895 1961
1896our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1898 1964
1899sub find_async { 1965sub find_async {
1900 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1901 1967
1902 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1903 1969
1904 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 1972 }
1907 1973
1908 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1909 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 1979 if (my $map = find $k) {
1913 or next;
1914 $map->load; 1980 $map->load if $v;
1981 }
1915 1982
1916 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1917 } 1984 }
1918 } 1985 }
1919 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1920 }; 1987 };
1921 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1924} 1991}
1925 1992
1926sub save { 1993sub save {
1927 my ($self) = @_; 1994 my ($self) = @_;
1928 1995
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 1997
1931 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1932 1999
1933 return unless $self->dirty; 2000 return unless $self->dirty;
1934 2001
… …
1957 my ($self) = @_; 2024 my ($self) = @_;
1958 2025
1959 # save first because save cedes 2026 # save first because save cedes
1960 $self->save; 2027 $self->save;
1961 2028
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2030
1964 return if $self->players; 2031 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1967 2034
… …
2146 2213
2147 } else { 2214 } else {
2148 my $pl = $self->contr; 2215 my $pl = $self->contr;
2149 2216
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2218 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2220
2159 } else { 2221 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2162 } 2224 }
2163 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
2164} 2236}
2165 2237
2166=item $player_object->may ("access") 2238=item $player_object->may ("access")
2167 2239
2168Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
2250 2322
2251 $map->load; 2323 $map->load;
2252 $map->load_diag; 2324 $map->load_neighbours;
2253 2325
2254 return unless $self->contr->active; 2326 return unless $self->contr->active;
2255 $self->activate_recursive; 2327 $self->activate_recursive;
2256 2328
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
2259} 2331}
2260 2332
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2334
2263Moves the player to the given map-path and coordinates by first freezing 2335Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2336her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2337that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2338the new (success) or old (failed) map position. In either case, $done will
2339be called at the end of this process.
2267 2340
2268=cut 2341=cut
2269 2342
2270our $GOTOGEN; 2343our $GOTOGEN;
2271 2344
2272sub cf::object::player::goto { 2345sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2347
2275 # do generation counting so two concurrent goto's will be executed in-order 2348 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2350
2278 $self->enter_link; 2351 $self->enter_link;
… …
2298 2371
2299 if ($gen == $self->{_goto_generation}) { 2372 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2373 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2302 } 2375 }
2376
2377 $done->() if $done;
2303 })->prio (1); 2378 })->prio (1);
2304} 2379}
2305 2380
2306=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
2307 2382
… …
2416 2491
2417 utf8::encode $text; 2492 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2494}
2420 2495
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2497
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2498Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2499client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2500the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2501the message unless the client supports the msg packet.
2427 2502
2428=cut 2503=cut
2429 2504
2430sub cf::client::send_msg { 2505sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2506 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2507
2433 $msg = $self->pl->expand_cfpod ($msg); 2508 $msg = $self->pl->expand_cfpod ($msg);
2434 2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2435 return unless @extra || length $msg; 2522 return unless @extra || length $msg;
2436 2523
2437 if ($self->can_msg) { 2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2531 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2451 if (0 && $msg =~ /\[/) { 2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2550 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2552 $self->send_packet ("drawinfo $color $msg")
2456 } 2553 }
2457 } 2554 }
2458 } 2555 }
2459} 2556}
2460 2557
2461=item $client->ext_event ($type, %msg) 2558=item $client->ext_msg ($type, @msg)
2462 2559
2463Sends an ext event to the client. 2560Sends an ext event to the client.
2464 2561
2465=cut 2562=cut
2466 2563
2467sub cf::client::ext_event($$%) { 2564sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2565 my ($self, $type, @msg) = @_;
2469 2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2570 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2472} 2591}
2473 2592
2474=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
2475 2594
2476Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
… …
2531 my ($ns, $buf) = @_; 2650 my ($ns, $buf) = @_;
2532 2651
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2653
2535 if (ref $msg) { 2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2662 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2663 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2542 } else { 2669 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2671 }
2545 2672
2546 cf::override; 2673 cf::override;
… …
2593our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2595 2722
2596$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2597 2724
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2599 2730
2600# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2601 2732
2602=pod 2733=pod
2603 2734
2604The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2605 2736
2606 cf::object 2737 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 2738 contr pay_amount pay_player map x y force_find force_add
2608 insert remove 2739 insert remove name archname title slaying race decrease_ob_nr
2609 2740
2610 cf::object::player 2741 cf::object::player
2611 player 2742 player
2612 2743
2613 cf::player 2744 cf::player
… …
2618 2749
2619=cut 2750=cut
2620 2751
2621for ( 2752for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2623 insert remove)], 2755 decrease_ob_nr)],
2624 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2627) { 2759) {
2628 no strict 'refs'; 2760 no strict 'refs';
… …
2704# the server's init and main functions 2836# the server's init and main functions
2705 2837
2706sub load_facedata($) { 2838sub load_facedata($) {
2707 my ($path) = @_; 2839 my ($path) = @_;
2708 2840
2841 # HACK to clear player env face cache, we need some signal framework
2842 # for this (global event?)
2843 %ext::player_env::MUSIC_FACE_CACHE = ();
2844
2845 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2846
2709 warn "loading facedata from $path\n"; 2847 warn "loading facedata from $path\n";
2710 2848
2711 my $facedata; 2849 my $facedata;
2712 0 < aio_load $path, $facedata 2850 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 2851 or die "$path: $!";
… …
2715 $facedata = Coro::Storable::thaw $facedata; 2853 $facedata = Coro::Storable::thaw $facedata;
2716 2854
2717 $facedata->{version} == 2 2855 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 2856 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 2857
2858 # patch in the exptable
2859 $facedata->{resource}{"res/exp_table"} = {
2860 type => FT_RSRC,
2861 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2862 };
2863 cf::cede_to_tick;
2864
2720 { 2865 {
2721 my $faces = $facedata->{faceinfo}; 2866 my $faces = $facedata->{faceinfo};
2722 2867
2723 while (my ($face, $info) = each %$faces) { 2868 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2870 cf::face::set_visibility $idx, $info->{visibility};
2871 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 2874
2875 cf::cede_to_tick;
2729 } 2876 }
2730 2877
2731 while (my ($face, $info) = each %$faces) { 2878 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 2879 next unless $info->{smooth};
2733 my $idx = cf::face::find $face 2880 my $idx = cf::face::find $face
2734 or next; 2881 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) { 2882 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 2885 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2886 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 2887 }
2740 Coro::cede; 2888
2889 cf::cede_to_tick;
2741 } 2890 }
2742 } 2891 }
2743 2892
2744 { 2893 {
2745 my $anims = $facedata->{animinfo}; 2894 my $anims = $facedata->{animinfo};
2746 2895
2747 while (my ($anim, $info) = each %$anims) { 2896 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2897 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 2898 cf::cede_to_tick;
2750 } 2899 }
2751 2900
2752 cf::anim::invalidate_all; # d'oh 2901 cf::anim::invalidate_all; # d'oh
2753 } 2902 }
2754 2903
2904 {
2905 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource};
2908
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2914
2915 if ($info->{type} & 1) {
2916 # prepend meta info
2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2923 $data = pack "(w/a*)*", $meta, $info->{data};
2924 } else {
2925 $data = $info->{data};
2926 }
2927
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick;
2932 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 }
2952
2755 1 2953 1
2756} 2954}
2757 2955
2956register_exticmd fx_want => sub {
2957 my ($ns, $want) = @_;
2958
2959 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v);
2961 }
2962};
2963
2758sub reload_regions { 2964sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = ();
2968
2759 load_resource_file "$MAPDIR/regions" 2969 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 2970 or die "unable to load regions file\n";
2971
2972 for (cf::region::list) {
2973 $_->{match} = qr/$_->{match}/
2974 if exists $_->{match};
2975 }
2761} 2976}
2762 2977
2763sub reload_facedata { 2978sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 2979 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 2980 or die "unable to load facedata\n";
… …
2794 3009
2795sub init { 3010sub init {
2796 reload_resources; 3011 reload_resources;
2797} 3012}
2798 3013
2799sub cfg_load { 3014sub reload_config {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3016 or return;
2802 3017
2803 local $/; 3018 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
… …
2824 (async { 3039 (async {
2825 Event::one_event; 3040 Event::one_event;
2826 })->prio (Coro::PRIO_MAX); 3041 })->prio (Coro::PRIO_MAX);
2827 }; 3042 };
2828 3043
2829 cfg_load; 3044 reload_config;
2830 db_init; 3045 db_init;
2831 load_extensions; 3046 load_extensions;
2832 3047
2833 $TICK_WATCHER->start; 3048 $TICK_WATCHER->start;
2834 Event::loop; 3049 Event::loop;
… …
3027 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
3028 require cf; 3243 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030 3245
3031 warn "loading config and database again"; 3246 warn "loading config and database again";
3032 cf::cfg_load; 3247 cf::reload_config;
3033 3248
3034 warn "loading extensions"; 3249 warn "loading extensions";
3035 cf::load_extensions; 3250 cf::load_extensions;
3036 3251
3037 warn "reattaching attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";

Diff Legend

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