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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.351 by root, Sun Sep 2 00:57:38 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 ();
… …
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock 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
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
… …
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $guard 328 $guard
325} 329}
326 330
327=item cf::get_slot $time[, $priority] 331=item cf::get_slot $time[, $priority[, $name]]
328 332
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 333Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 334This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 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.
332 339
333Useful for short background jobs. 340Useful for short background jobs.
334 341
335=cut 342=cut
336 343
… …
363 Coro::schedule; 370 Coro::schedule;
364 } 371 }
365 } 372 }
366}; 373};
367 374
368sub get_slot($;$) { 375sub get_slot($;$$) {
369 my ($time, $pri) = @_; 376 my ($time, $pri, $name) = @_;
370 377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 383 $SLOT_QUEUE->ready;
374 $sig->wait; 384 $sig->wait;
375} 385}
376 386
… …
466Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
468 478
469=cut 479=cut
470 480
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 481sub fork_call(&@) {
481 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
482 483
483# 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,
484# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
486 or die "pipe: $!";
487 487
488 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 489 reset_signals;
502 local $SIG{__WARN__}; 490 &$cb
503 local $SIG{__DIE__}; 491 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 492
510 eval { 493 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 494}
523 495
524=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
525 497
526Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
606 if (1) { 578 if (1) {
607 $md5 = 579 $md5 =
608 join "\x00", 580 join "\x00",
609 $processversion, 581 $processversion,
610 map { 582 map {
611 Coro::cede; 583 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 585 } 0.. $#$src;
614 586
615 587
616 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1175 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1176 1148
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1150
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1185 } else { 1166 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1168 }
1188 1169
1189 cf::override; 1170 cf::override;
… …
1344 1325
1345 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1347 1328
1348 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1349 Coro::cede; 1330 cf::cede_to_tick;
1350} 1331}
1351 1332
1352sub new($) { 1333sub new($) {
1353 my ($login) = @_; 1334 my ($login) = @_;
1354 1335
… …
1358 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1359 1340
1360 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1361 1342
1362 $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 (@_);
1363} 1354}
1364 1355
1365=item $pl->quit_character 1356=item $pl->quit_character
1366 1357
1367Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1511sub hintmode { 1502sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1504 $_[0]{hintmode}
1514} 1505}
1515 1506
1516=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1517 1508
1518Sends an ext reply to the player. 1509Sends an ext reply to the player.
1519 1510
1520=cut 1511=cut
1521 1512
1522sub ext_reply($$%) { 1513sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1524 1515
1525 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1517}
1528 1518
1529=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1530 1520
1531Sends an ext event to the client. 1521Sends an ext event to the client.
1532 1522
1533=cut 1523=cut
1534 1524
1535sub ext_event($$%) { 1525sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1537 1527
1538 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1539} 1529}
1540 1530
1541=head3 cf::region 1531=head3 cf::region
1542 1532
1543=over 4 1533=over 4
… …
1862 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1863 1853
1864 my $path = $self->{path}; 1854 my $path = $self->{path};
1865 1855
1866 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1867 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1868 1859
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1870 1861
1871 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1872 1863
1873 $self->alloc; 1864 $self->alloc;
1874 1865
1875 $self->pre_load; 1866 $self->pre_load;
1876 Coro::cede; 1867 cf::cede_to_tick;
1877 1868
1878 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1879 or return; 1870 or return;
1880 1871
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1887 $self->clear_unique_items; 1878 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1889 } 1880 }
1890 } 1881 }
1891 1882
1892 Coro::cede; 1883 cf::cede_to_tick;
1893 # now do the right thing for maps 1884 # now do the right thing for maps
1894 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1887 unless $self->difficulty;
1897 Coro::cede; 1888 cf::cede_to_tick;
1898 1889
1899 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1891 $self->decay_objects;
1901 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1902 $self->update_buttons; 1893 $self->update_buttons;
1903 Coro::cede; 1894 cf::cede_to_tick;
1904 $self->set_darkness_map; 1895 $self->set_darkness_map;
1905 Coro::cede; 1896 cf::cede_to_tick;
1906 $self->activate; 1897 $self->activate;
1907 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1908 1902
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1904 }
1911 1905
1912 $self->post_load; 1906 $self->post_load;
… …
1923 1917
1924 $self 1918 $self
1925} 1919}
1926 1920
1927# 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
1928sub load_diag { 1922sub load_neighbours {
1929 my ($map) = @_; 1923 my ($map) = @_;
1930 1924
1931 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1932 1926
1933 for (0 .. 3) { 1927 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1935 or next; 1929 or next;
1936 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1937 or next; 1931 or next;
1938 $neigh->load; 1932 $neigh->load;
1939 1933
1934 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 1937 }
1943 1938
1944 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1946 or next; 1942 or next;
1947 $neigh->load; 1943 $neigh->load;
1948 } 1944 }
1949} 1945}
1950 1946
… …
1955} 1951}
1956 1952
1957sub do_load_sync { 1953sub do_load_sync {
1958 my ($map) = @_; 1954 my ($map) = @_;
1959 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1960 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1961} 1960}
1962 1961
1963our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1965 1964
1966sub find_async { 1965sub find_async {
1967 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1968 1967
1969 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1970 1969
1971 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 1972 }
1974 1973
1975 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1976 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 1979 if (my $map = find $k) {
1980 $map->load; 1980 $map->load if $v;
1981 } 1981 }
1982 1982
1983 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1984 } 1984 }
1985 } 1985 }
1986 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1987 }; 1987 };
1988 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1991} 1991}
1992 1992
1993sub save { 1993sub save {
1994 my ($self) = @_; 1994 my ($self) = @_;
1995 1995
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 1997
1998 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1999 1999
2000 return unless $self->dirty; 2000 return unless $self->dirty;
2001 2001
… …
2024 my ($self) = @_; 2024 my ($self) = @_;
2025 2025
2026 # save first because save cedes 2026 # save first because save cedes
2027 $self->save; 2027 $self->save;
2028 2028
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2030
2031 return if $self->players; 2031 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2034 2034
… …
2086my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2087 2087
2088sub nuke { 2088sub nuke {
2089 my ($self) = @_; 2089 my ($self) = @_;
2090 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2091 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2092 2095
2093 $self->unlink_save; 2096 $self->unlink_save;
2094 2097
2095 bless $self, "cf::map"; 2098 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2099 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2100 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2101 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2102 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2103
2101 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2102 2106
2103 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2104} 2108}
2105 2109
2106=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2213 2217
2214 } else { 2218 } else {
2215 my $pl = $self->contr; 2219 my $pl = $self->contr;
2216 2220
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2224
2226 } else { 2225 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2229 } 2228 }
2230 } 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 (@_);
2231} 2240}
2232 2241
2233=item $player_object->may ("access") 2242=item $player_object->may ("access")
2234 2243
2235Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2314 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2317 2326
2318 $map->load; 2327 $map->load;
2319 $map->load_diag; 2328 $map->load_neighbours;
2320 2329
2321 return unless $self->contr->active; 2330 return unless $self->contr->active;
2322 $self->activate_recursive; 2331 $self->activate_recursive;
2323 2332
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2495the 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
2496the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2497 2506
2498=cut 2507=cut
2499 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2500sub cf::client::send_msg { 2518sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2520
2503 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2504 2522
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2506 2527
2507 if (ref $channel) { 2528 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2529 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2530 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2531 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2532 $self->ext_msg (channel_info => $channel);
2512 } 2533 }
2513 2534
2514 $channel = $channel->{id}; 2535 $channel = $channel->{id};
2515 } 2536 }
2516 2537
2517 return unless @extra || length $msg; 2538 return unless @extra || length $msg;
2518 2539
2519 if ($self->can_msg) { 2540 if ($self->can_msg) {
2541 # default colour, mask it out
2542 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2543 if $color & cf::NDI_DEF;
2544
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2545 $self->send_packet ("msg " . $self->{json_coder}->encode (
2546 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2547 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2548 if ($color >= 0) {
2549 # replace some tags by gcfclient-compatible ones
2550 for ($msg) {
2551 1 while
2552 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2553 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2554 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2555 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2556 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2557 }
2558
2559 $color &= cf::NDI_COLOR_MASK;
2560
2561 utf8::encode $msg;
2562
2533 if (0 && $msg =~ /\[/) { 2563 if (0 && $msg =~ /\[/) {
2564 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2565 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2566 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2567 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2568 $self->send_packet ("drawinfo $color $msg")
2538 } 2569 }
2539 } 2570 }
2540 } 2571 }
2541} 2572}
2542 2573
2543=item $client->ext_event ($type, %msg) 2574=item $client->ext_msg ($type, @msg)
2544 2575
2545Sends an ext event to the client. 2576Sends an ext event to the client.
2546 2577
2547=cut 2578=cut
2548 2579
2549sub cf::client::ext_event($$%) { 2580sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2581 my ($self, $type, @msg) = @_;
2551 2582
2552 return unless $self->extcmd; 2583 if ($self->extcmd == 2) {
2553 2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2585 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2586 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2591=item $client->ext_reply ($msgid, @msg)
2592
2593Sends an ext reply to the client.
2594
2595=cut
2596
2597sub cf::client::ext_reply($$@) {
2598 my ($self, $id, @msg) = @_;
2599
2600 if ($self->extcmd == 2) {
2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2602 } elsif ($self->extcmd == 1) {
2603 #TODO: version 1, remove
2604 unshift @msg, msgtype => "reply", msgid => $id;
2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2606 }
2556} 2607}
2557 2608
2558=item $success = $client->query ($flags, "text", \&cb) 2609=item $success = $client->query ($flags, "text", \&cb)
2559 2610
2560Queues a query to the client, calling the given callback with 2611Queues a query to the client, calling the given callback with
… …
2615 my ($ns, $buf) = @_; 2666 my ($ns, $buf) = @_;
2616 2667
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2668 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2669
2619 if (ref $msg) { 2670 if (ref $msg) {
2671 my ($type, $reply, @payload) =
2672 "ARRAY" eq ref $msg
2673 ? @$msg
2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2675
2676 my @reply;
2677
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2678 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2679 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2626 } else { 2685 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2687 }
2629 2688
2630 cf::override; 2689 cf::override;
… …
2677our $safe = new Safe "safe"; 2736our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2737our $safe_hole = new Safe::Hole;
2679 2738
2680$SIG{FPE} = 'IGNORE'; 2739$SIG{FPE} = 'IGNORE';
2681 2740
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2741$safe->permit_only (Opcode::opset qw(
2742 :base_core :base_mem :base_orig :base_math
2743 grepstart grepwhile mapstart mapwhile
2744 sort time
2745));
2683 2746
2684# here we export the classes and methods available to script code 2747# here we export the classes and methods available to script code
2685 2748
2686=pod 2749=pod
2687 2750
2688The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2689 2752
2690 cf::object 2753 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2754 contr pay_amount pay_player map x y force_find force_add
2692 insert remove 2755 insert remove name archname title slaying race decrease_ob_nr
2693 2756
2694 cf::object::player 2757 cf::object::player
2695 player 2758 player
2696 2759
2697 cf::player 2760 cf::player
… …
2702 2765
2703=cut 2766=cut
2704 2767
2705for ( 2768for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race
2707 insert remove)], 2771 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2711) { 2775) {
2712 no strict 'refs'; 2776 no strict 'refs';
… …
2788# the server's init and main functions 2852# the server's init and main functions
2789 2853
2790sub load_facedata($) { 2854sub load_facedata($) {
2791 my ($path) = @_; 2855 my ($path) = @_;
2792 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2862
2793 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2794 2864
2795 my $facedata; 2865 my $facedata;
2796 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2867 or die "$path: $!";
2798 2868
2799 $facedata = Coro::Storable::thaw $facedata; 2869 $facedata = Coro::Storable::thaw $facedata;
2800 2870
2801 $facedata->{version} == 2 2871 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2873
2874 # patch in the exptable
2875 $facedata->{resource}{"res/exp_table"} = {
2876 type => FT_RSRC,
2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2878 };
2879 cf::cede_to_tick;
2803 2880
2804 { 2881 {
2805 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
2806 2883
2807 while (my ($face, $info) = each %$faces) { 2884 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2885 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 2886 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 2887 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 2890
2814 cf::cede_to_tick; 2891 cf::cede_to_tick;
2815 } 2892 }
2816 2893
2817 while (my ($face, $info) = each %$faces) { 2894 while (my ($face, $info) = each %$faces) {
… …
2842 2919
2843 { 2920 {
2844 # TODO: for gcfclient pleasure, we should give resources 2921 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 2922 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 2923 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 2924
2925 my $soundconf = delete $res->{"res/sound.conf"};
2848 2926
2849 while (my ($name, $info) = each %$res) { 2927 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2928 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data;
2857 2930
2858 if ($name =~ /\.jpg$/) { 2931 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2932 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2933
2934 my $meta = $enc->encode ({
2935 name => $name,
2936 %{ $info->{meta} || {} },
2937 });
2938
2939 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 2940 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 2941 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 2942 }
2868 2943
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2945 cf::face::set_type $idx, $info->{type};
2946
2869 cf::cede_to_tick; 2947 cf::cede_to_tick;
2870 } 2948 }
2949
2950 if ($soundconf) {
2951 $soundconf = $enc->decode (delete $soundconf->{data});
2952
2953 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2954 my $sound = $soundconf->{compat}[$_]
2955 or next;
2956
2957 my $face = cf::face::find "sound/$sound->[1]";
2958 cf::sound::set $sound->[0] => $face;
2959 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2960 }
2961
2962 while (my ($k, $v) = each %{$soundconf->{event}}) {
2963 my $face = cf::face::find "sound/$v";
2964 cf::sound::set $k => $face;
2965 }
2966 }
2871 } 2967 }
2872 2968
2873 1 2969 1
2874} 2970}
2875 2971
2972register_exticmd fx_want => sub {
2973 my ($ns, $want) = @_;
2974
2975 while (my ($k, $v) = each %$want) {
2976 $ns->fx_want ($k, $v);
2977 }
2978};
2979
2876sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2877 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2879 2987
2880 for (cf::region::list) { 2988 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 2989 $_->{match} = qr/$_->{match}/
… …
2917 3025
2918sub init { 3026sub init {
2919 reload_resources; 3027 reload_resources;
2920} 3028}
2921 3029
2922sub cfg_load { 3030sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3032 or return;
2925 3033
2926 local $/; 3034 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
2947 (async { 3055 (async {
2948 Event::one_event; 3056 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
2950 }; 3058 };
2951 3059
2952 cfg_load; 3060 reload_config;
2953 db_init; 3061 db_init;
2954 load_extensions; 3062 load_extensions;
2955 3063
2956 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
2957 Event::loop; 3065 Event::loop;
… …
3150 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3151 require cf; 3259 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3261
3154 warn "loading config and database again"; 3262 warn "loading config and database again";
3155 cf::cfg_load; 3263 cf::reload_config;
3156 3264
3157 warn "loading extensions"; 3265 warn "loading extensions";
3158 cf::load_extensions; 3266 cf::load_extensions;
3159 3267
3160 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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