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.309 by elmex, Mon Jul 16 15:27:06 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 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 ();
… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These 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
169returns 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
170per 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.
171 178
172=back 179=back
173 180
174=cut 181=cut
175 182
… …
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
268returned. 275returned.
269 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
270Lock 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
271uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
272 282
273=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
274 284
… …
314 my $guard = Coro::guard { 324 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
316 }; 326 };
317 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
318 $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;
319} 385}
320 386
321=item cf::async { BLOCK } 387=item cf::async { BLOCK }
322 388
323Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
412 478
413=cut 479=cut
414 480
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
424sub fork_call(&@) { 481sub fork_call(&@) {
425 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
426 483
427# 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,
428# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
430 or die "pipe: $!";
431 487
432 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 489 reset_signals;
446 local $SIG{__WARN__}; 490 &$cb
447 local $SIG{__DIE__}; 491 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 492
454 eval { 493 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 494}
467 495
468=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
469 497
470Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
550 if (1) { 578 if (1) {
551 $md5 = 579 $md5 =
552 join "\x00", 580 join "\x00",
553 $processversion, 581 $processversion,
554 map { 582 map {
555 Coro::cede; 583 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 585 } 0.. $#$src;
558 586
559 587
560 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
866 "; 894 ";
867 die if $@; 895 die if $@;
868} 896}
869 897
870our $override; 898our $override;
871our @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?
872 900
873sub override { 901sub override {
874 $override = 1; 902 $override = 1;
875 @invoke_results = (@_); 903 @INVOKE_RESULTS = (@_);
876} 904}
877 905
878sub do_invoke { 906sub do_invoke {
879 my $event = shift; 907 my $event = shift;
880 my $callbacks = shift; 908 my $callbacks = shift;
881 909
882 @invoke_results = (); 910 @INVOKE_RESULTS = ();
883 911
884 local $override; 912 local $override;
885 913
886 for (@$callbacks) { 914 for (@$callbacks) {
887 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
904 932
905Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
906 934
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 938
911=back 939=back
912 940
913=cut 941=cut
914 942
915############################################################################# 943#############################################################################
916# 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}
917 956
918sub reattach { 957sub reattach {
919 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 959 my ($obj) = @_;
921 960
… …
1108 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1109 1148
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1150
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1118 } else { 1166 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1168 }
1121 1169
1122 cf::override; 1170 cf::override;
… …
1277 1325
1278 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1280 1328
1281 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1282 Coro::cede; 1330 cf::cede_to_tick;
1283} 1331}
1284 1332
1285sub new($) { 1333sub new($) {
1286 my ($login) = @_; 1334 my ($login) = @_;
1287 1335
… …
1291 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1292 1340
1293 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1294 1342
1295 $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 (@_);
1296} 1354}
1297 1355
1298=item $pl->quit_character 1356=item $pl->quit_character
1299 1357
1300Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
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
… …
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 if (my $map = find $path) { 1979 if (my $map = find $k) {
1913 $map->load; 1980 $map->load if $v;
1914 } 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
… …
2019my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2020 2087
2021sub nuke { 2088sub nuke {
2022 my ($self) = @_; 2089 my ($self) = @_;
2023 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2024 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2025 2095
2026 $self->unlink_save;
2027
2028 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2101
2102 $self->unlink_save;
2103
2034 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2035 2106
2036 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2037} 2108}
2038 2109
2039=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2146 2217
2147 } else { 2218 } else {
2148 my $pl = $self->contr; 2219 my $pl = $self->contr;
2149 2220
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2223 $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 2224
2159 } else { 2225 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2162 } 2228 }
2163 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
2164} 2240}
2165 2241
2166=item $player_object->may ("access") 2242=item $player_object->may ("access")
2167 2243
2168Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2250 2326
2251 $map->load; 2327 $map->load;
2252 $map->load_diag; 2328 $map->load_neighbours;
2253 2329
2254 return unless $self->contr->active; 2330 return unless $self->contr->active;
2255 $self->activate_recursive; 2331 $self->activate_recursive;
2256 2332
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2419 2495
2420 utf8::encode $text; 2496 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2498}
2423 2499
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2500=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2501
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2502Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2503client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2430 2506
2431=cut 2507=cut
2432 2508
2433sub cf::client::send_msg { 2509sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2510 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2511
2436 $msg = $self->pl->expand_cfpod ($msg); 2512 $msg = $self->pl->expand_cfpod ($msg);
2437 2513
2514 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515
2516 if (ref $channel) {
2517 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel);
2521 }
2522
2523 $channel = $channel->{id};
2524 }
2525
2438 return unless @extra || length $msg; 2526 return unless @extra || length $msg;
2439 2527
2440 if ($self->can_msg) { 2528 if ($self->can_msg) {
2529 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF;
2532
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2533 $self->send_packet ("msg " . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2535 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 if ($color >= 0) { 2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546
2547 $color &= cf::NDI_COLOR_MASK;
2548
2549 utf8::encode $msg;
2550
2454 if (0 && $msg =~ /\[/) { 2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2554 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2556 $self->send_packet ("drawinfo $color $msg")
2459 } 2557 }
2460 } 2558 }
2461 } 2559 }
2462} 2560}
2463 2561
2464=item $client->ext_event ($type, %msg) 2562=item $client->ext_msg ($type, @msg)
2465 2563
2466Sends an ext event to the client. 2564Sends an ext event to the client.
2467 2565
2468=cut 2566=cut
2469 2567
2470sub cf::client::ext_event($$%) { 2568sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2569 my ($self, $type, @msg) = @_;
2472 2570
2473 return unless $self->extcmd; 2571 if ($self->extcmd == 2) {
2474 2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2574 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2594 }
2477} 2595}
2478 2596
2479=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
2480 2598
2481Queues a query to the client, calling the given callback with 2599Queues a query to the client, calling the given callback with
… …
2536 my ($ns, $buf) = @_; 2654 my ($ns, $buf) = @_;
2537 2655
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2656 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2657
2540 if (ref $msg) { 2658 if (ref $msg) {
2659 my ($type, $reply, @payload) =
2660 "ARRAY" eq ref $msg
2661 ? @$msg
2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2663
2664 my @reply;
2665
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2666 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2667 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2547 } else { 2673 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 2675 }
2550 2676
2551 cf::override; 2677 cf::override;
… …
2598our $safe = new Safe "safe"; 2724our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 2725our $safe_hole = new Safe::Hole;
2600 2726
2601$SIG{FPE} = 'IGNORE'; 2727$SIG{FPE} = 'IGNORE';
2602 2728
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2729$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math
2731 grepstart grepwhile mapstart mapwhile
2732 sort time
2733));
2604 2734
2605# here we export the classes and methods available to script code 2735# here we export the classes and methods available to script code
2606 2736
2607=pod 2737=pod
2608 2738
2609The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2610 2740
2611 cf::object 2741 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 2742 contr pay_amount pay_player map x y force_find force_add
2613 insert remove 2743 insert remove name archname title slaying race decrease_ob_nr
2614 2744
2615 cf::object::player 2745 cf::object::player
2616 player 2746 player
2617 2747
2618 cf::player 2748 cf::player
… …
2623 2753
2624=cut 2754=cut
2625 2755
2626for ( 2756for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race
2628 insert remove)], 2759 decrease_ob_nr)],
2629 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2632) { 2763) {
2633 no strict 'refs'; 2764 no strict 'refs';
… …
2709# the server's init and main functions 2840# the server's init and main functions
2710 2841
2711sub load_facedata($) { 2842sub load_facedata($) {
2712 my ($path) = @_; 2843 my ($path) = @_;
2713 2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2850
2714 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2715 2852
2716 my $facedata; 2853 my $facedata;
2717 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 2855 or die "$path: $!";
2719 2856
2720 $facedata = Coro::Storable::thaw $facedata; 2857 $facedata = Coro::Storable::thaw $facedata;
2721 2858
2722 $facedata->{version} == 2 2859 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861
2862 # patch in the exptable
2863 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2866 };
2867 cf::cede_to_tick;
2724 2868
2725 { 2869 {
2726 my $faces = $facedata->{faceinfo}; 2870 my $faces = $facedata->{faceinfo};
2727 2871
2728 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2730 cf::face::set_visibility $idx, $info->{visibility}; 2874 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 2875 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 2878
2735 cf::cede_to_tick; 2879 cf::cede_to_tick;
2736 } 2880 }
2737 2881
2738 while (my ($face, $info) = each %$faces) { 2882 while (my ($face, $info) = each %$faces) {
… …
2763 2907
2764 { 2908 {
2765 # TODO: for gcfclient pleasure, we should give resources 2909 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 2910 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 2911 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical; 2912
2913 my $soundconf = delete $res->{"res/sound.conf"};
2769 2914
2770 while (my ($name, $info) = each %$res) { 2915 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2778 2918
2779 if ($name =~ /\.jpg$/) { 2919 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2920 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2782 } else { 2928 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 2929 $data = $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 2930 }
2789 2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2790 cf::cede_to_tick; 2935 cf::cede_to_tick;
2791 } 2936 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2792 } 2955 }
2793 2956
2794 1 2957 1
2795} 2958}
2796 2959
2960register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_;
2962
2963 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v);
2965 }
2966};
2967
2797sub reload_regions { 2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2798 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2800 2975
2801 for (cf::region::list) { 2976 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/
… …
2838 3013
2839sub init { 3014sub init {
2840 reload_resources; 3015 reload_resources;
2841} 3016}
2842 3017
2843sub cfg_load { 3018sub reload_config {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3020 or return;
2846 3021
2847 local $/; 3022 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
2868 (async { 3043 (async {
2869 Event::one_event; 3044 Event::one_event;
2870 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
2871 }; 3046 };
2872 3047
2873 cfg_load; 3048 reload_config;
2874 db_init; 3049 db_init;
2875 load_extensions; 3050 load_extensions;
2876 3051
2877 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
2878 Event::loop; 3053 Event::loop;
… …
3071 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3072 require cf; 3247 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3249
3075 warn "loading config and database again"; 3250 warn "loading config and database again";
3076 cf::cfg_load; 3251 cf::reload_config;
3077 3252
3078 warn "loading extensions"; 3253 warn "loading extensions";
3079 cf::load_extensions; 3254 cf::load_extensions;
3080 3255
3081 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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