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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.459 by root, Sat Dec 13 21:46:12 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
34 65
35# configure various modules to our taste 66# configure various modules to our taste
36# 67#
37$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 76
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 78
50our %COMMAND = (); 79our %COMMAND = ();
51our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
54our %EXTCMD = (); 83our %EXTCMD = ();
55our %EXTICMD = (); 84our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
58 87
59our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 89our @EVENT;
61 90
62our $CONFDIR = confdir; 91our $CONFDIR = confdir;
63our $DATADIR = datadir; 92our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
73 106
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 109our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
81 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 115our $DB_ENV;
84 116
85our %CFG; 117our %CFG;
86 118
87our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 120our $RUNTIME;
121our $NOW;
89 122
90our %PLAYER; # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 124our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
93 126
94# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 129
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
100 138
101binmode STDOUT; 139binmode STDOUT;
102binmode STDERR; 140binmode STDERR;
103 141
104# read virtual server time, if available 142# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
109} 147}
110 148
111mkdir $_ 149mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
157 195
158The raw value load value from the last tick. 196The raw value load value from the last tick.
159 197
160=item %cf::CFG 198=item %cf::CFG
161 199
162Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 201from wherever your confdir points to.
164 202
165=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
166 204
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These 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 206returns 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. 207per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 208
209=item @cf::INVOKE_RESULTS
210
211This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call.
214
171=back 215=back
172 216
173=cut 217=cut
174 218
175BEGIN { 219BEGIN {
… …
179 $msg .= "\n" 223 $msg .= "\n"
180 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
181 225
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 227
184 utf8::encode $msg;
185 LOG llevError, $msg; 228 LOG llevError, $msg;
186 }; 229 };
187} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
188 246
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
199for my $pkg (qw( 257for my $pkg (qw(
200 cf::global cf::attachable 258 cf::global cf::attachable
201 cf::object cf::object::player 259 cf::object cf::object::player
202 cf::client cf::player 260 cf::client cf::player
203 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
204 cf::map cf::party cf::region 263 cf::party cf::region
205)) { 264)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 266}
209 267
210$Event::DIED = sub { 268$EV::DIED = sub {
211 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
212}; 270};
213 271
214############################################################################# 272#############################################################################
215 273
… …
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 297 $d
240 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
241} 299}
242 300
243=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
244 302
245Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
246 304
247=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
248 306
249Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
250 308
251=cut 309=cut
252 310
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 312
255sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
257 329
258=item cf::lock_wait $string 330=item cf::lock_wait $string
259 331
260Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
261 333
262=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
263 335
264Wait until the given lock is available and then acquires it and returns 336Wait 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, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
267returned. 339returned.
268 340
341Locks are *not* recursive, locking from the same coro twice results in a
342deadlocked coro.
343
269Lock names should begin with a unique identifier (for example, cf::map::find 344Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 345uses map_find and cf::map::load uses map_load).
271 346
272=item $locked = cf::lock_active $string 347=item $locked = cf::lock_active $string
273 348
274Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
275 350
276=cut 351=cut
277 352
278our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
279 354
280sub lock_wait($) { 355sub lock_wait($) {
281 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 357}
289 358
290sub lock_acquire($) { 359sub lock_acquire($) {
291 my ($key) = @_; 360 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 361}
303 362
304sub lock_active($) { 363sub lock_active($) {
305 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 365}
309 366
310sub freeze_mainloop { 367sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
312 369
313 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
314 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
315 }; 431 }
316 $TICK_WATCHER->stop; 432};
317 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
318} 446}
319 447
320=item cf::async { BLOCK } 448=item cf::async { BLOCK }
321 449
322Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
… …
327 455
328BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
329 457
330=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
331 459
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 463acceptable.
336 464
337If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
… …
343 471
344sub sync_job(&) { 472sub sync_job(&) {
345 my ($job) = @_; 473 my ($job) = @_;
346 474
347 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 476 my $time = EV::time;
349 477
350 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
352 480
353 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 482
355 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
356 484
357 my $busy = 1; 485 my $busy = 1;
358 my @res; 486 my @res;
359 487
360 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 490 @res = eval { $job->() };
362 warn $@ if $@; 491 warn $@ if $@;
363 undef $busy; 492 undef $busy;
364 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
365 494
366 while ($busy) { 495 while ($busy) {
367 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
368 } 500 }
501 }
369 502
370 $time = Event::time - $time; 503 my $time = EV::time - $time;
371 504
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
376 506
377 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
378 } else { 508 } else {
379 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
380 510
… …
405=item fork_call { }, $args 535=item fork_call { }, $args
406 536
407Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
411 541
412=cut 542=cut
413 543
414sub fork_call(&@) { 544sub fork_call(&@) {
415 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
416 546
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 550
422 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 552 reset_signals;
435 local $SIG{__WARN__}; 553 &$cb
436 local $SIG{__DIE__}; 554 }, @args;
437 eval {
438 close $fh1;
439 555
440 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
442 };
443 558
444 warn $@ if $@; 559=item $coin = coin_from_name $name
445 _exit 0; 560
446 } 561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
447} 584}
448 585
449=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
450 587
451Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
453=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
454 591
455Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
458=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
459 618
460our $DB; 619our $DB;
461 620
462sub db_init { 621sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 622 cf::sync_job {
467 eval { 623 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 624 };
477} 625}
478 626
479sub db_get($$) { 627sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
481 629
… …
531 if (1) { 679 if (1) {
532 $md5 = 680 $md5 =
533 join "\x00", 681 join "\x00",
534 $processversion, 682 $processversion,
535 map { 683 map {
536 Coro::cede; 684 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 686 } 0.. $#$src;
539 687
540 688
541 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
… …
579 727
580############################################################################# 728#############################################################################
581 729
582=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
583 731
584Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
585attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
587 735
588In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 738Deliantra).
591 739
592=over 4 740=over 4
593 741
594=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
595 743
… …
639=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
640 788
641Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
643 791
644Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
645that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
646 794
647These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
648 796
649=over 4 797=over 4
… …
847 "; 995 ";
848 die if $@; 996 die if $@;
849} 997}
850 998
851our $override; 999our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 1001
854sub override { 1002sub override {
855 $override = 1; 1003 $override = 1;
856 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
857} 1005}
858 1006
859sub do_invoke { 1007sub do_invoke {
860 my $event = shift; 1008 my $event = shift;
861 my $callbacks = shift; 1009 my $callbacks = shift;
862 1010
863 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
864 1012
865 local $override; 1013 local $override;
866 1014
867 for (@$callbacks) { 1015 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
… …
877 } 1025 }
878 1026
879 0 1027 0
880} 1028}
881 1029
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1031
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1033
886Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
887 1035
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1039
892=back 1040=back
893 1041
894=cut 1042=cut
895 1043
896############################################################################# 1044#############################################################################
897# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
898 1088
899sub reattach { 1089sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1091 my ($obj) = @_;
902 1092
1093 # no longer needed after getting rid of delete_package?
903 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
904 1095
905 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
906 1097
907 @$registry = (); 1098 @$registry = ();
908 1099
… …
923cf::attachable->attach ( 1114cf::attachable->attach (
924 prio => -1000000, 1115 prio => -1000000,
925 on_instantiate => sub { 1116 on_instantiate => sub {
926 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
927 1118
928 $data = from_json $data; 1119 $data = decode_json $data;
929 1120
930 for (@$data) { 1121 for (@$data) {
931 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
932 1123
933 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
949sub object_freezer_save { 1140sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
951 1142
952 sync_job { 1143 sync_job {
953 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
956 1148
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1153 aio_close $fh;
962 1154
963 if (@$objs) { 1155 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1161 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
971 } 1163 }
972 } else { 1164 } else {
973 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
974 } 1166 }
975 1167
976 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
977 } else { 1172 } else {
978 warn "FATAL: $filename~: $!\n"; 1173 warn "FATAL: $filename~: $!\n";
979 } 1174 }
980 } else { 1175 } else {
981 aio_unlink $filename; 1176 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
983 } 1178 }
984 } 1179 };
985} 1180}
986 1181
987sub object_freezer_as_string { 1182sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
989 1184
… …
1001 or return; 1196 or return;
1002 1197
1003 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1200 or return;
1201
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1007 } 1204 }
1008 1205
1206 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1011 return ($data, $av); 1210 ($data, $av)
1012} 1211}
1013 1212
1014=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1015 1214
1016=over 4 1215=over 4
… …
1070 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1071 1270
1072 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1073} 1272}
1074 1273
1274use File::Glob ();
1275
1075cf::player->attach ( 1276cf::player->attach (
1076 on_command => sub { 1277 on_command => sub {
1077 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1078 1279
1079 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1089 my ($pl, $buf) = @_; 1290 my ($pl, $buf) = @_;
1090 1291
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1293
1093 if (ref $msg) { 1294 if (ref $msg) {
1295 my ($type, $reply, @payload) =
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299
1300 my @reply;
1301
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1302 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1303 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1099 } else { 1309 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1311 }
1102 1312
1103 cf::override; 1313 cf::override;
1104 }, 1314 },
1105); 1315);
1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1106 1329
1107sub load_extensions { 1330sub load_extensions {
1108 cf::sync_job { 1331 cf::sync_job {
1109 my %todo; 1332 my %todo;
1110 1333
… …
1130 1353
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1356
1134 $ext{source} = 1357 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1137 . $source 1360 . $source
1138 . "\n};\n1"; 1361 . "\n};\n1";
1139 1362
1140 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1156 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1158 1381
1159 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1383 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1385 }
1164 1386
1165 warn $msg; 1387 warn $msg;
1166 } 1388 }
1167 1389
… …
1181 1403
1182=back 1404=back
1183 1405
1184=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1185 1407
1186Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1187 1409
1188=cut 1410=cut
1189 1411
1190package cf::player; 1412package cf::player;
1191 1413
1192use Coro::AIO; 1414use Coro::AIO;
1193 1415
1194=head3 cf::player 1416=head3 cf::player
1195 1417
1196=over 4 1418=over 4
1419
1420=item cf::player::num_playing
1421
1422Returns the official number of playing players, as per the Crossfire metaserver rules.
1423
1424=cut
1425
1426sub num_playing {
1427 scalar grep
1428 $_->ob->map
1429 && !$_->hidden
1430 && !$_->ob->flag (cf::FLAG_WIZ),
1431 cf::player::list
1432}
1197 1433
1198=item cf::player::find $login 1434=item cf::player::find $login
1199 1435
1200Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1201 1437
… …
1220 1456
1221sub exists($) { 1457sub exists($) {
1222 my ($login) = @_; 1458 my ($login) = @_;
1223 1459
1224 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1226} 1462}
1227 1463
1228sub find($) { 1464sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1466 my $login = $_[0];
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1477
1242 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1479 or return;
1480
1481 my $pl = cf::player::load_pl $f
1482 or return;
1483
1484 local $cf::PLAYER_LOADING{$login} = $pl;
1485 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1245 } 1487 }
1246 } 1488 }
1247} 1489}
1248 1490
… …
1257 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1258 1500
1259 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1261 1503
1504 cf::get_slot 0.01;
1505
1262 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1263 Coro::cede; 1507 cf::cede_to_tick;
1264} 1508}
1265 1509
1266sub new($) { 1510sub new($) {
1267 my ($login) = @_; 1511 my ($login) = @_;
1268 1512
… …
1274 $cf::PLAYER{$login} = $self; 1518 $cf::PLAYER{$login} = $self;
1275 1519
1276 $self 1520 $self
1277} 1521}
1278 1522
1523=item $player->send_msg ($channel, $msg, $color, [extra...])
1524
1525=cut
1526
1527sub send_msg {
1528 my $ns = shift->ns
1529 or return;
1530 $ns->send_msg (@_);
1531}
1532
1279=item $pl->quit_character 1533=item $pl->quit_character
1280 1534
1281Nukes the player without looking back. If logged in, the connection will 1535Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1536be destroyed. May block for a long time.
1283 1537
… …
1287 my ($pl) = @_; 1541 my ($pl) = @_;
1288 1542
1289 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1290 1544
1291 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1292 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1293 1547
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1298 1554
1299 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1336 or return []; 1592 or return [];
1337 1593
1338 my @logins; 1594 my @logins;
1339 1595
1340 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1597 my $path = path $login;
1598
1599 # a .pst is a dead give-away for a valid player
1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1344 1606
1345 utf8::decode $login; 1607 utf8::decode $login;
1346 push @logins, $login; 1608 push @logins, $login;
1347 } 1609 }
1348 1610
… …
1375 } 1637 }
1376 1638
1377 \@paths 1639 \@paths
1378} 1640}
1379 1641
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1643
1382Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1383 1645
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s{H<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/;
1418
1419 $_
1420}
1421
1422sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode}
1425}
1426
1427=item $player->ext_reply ($msgid, %msg) 1646=item $player->ext_reply ($msgid, @msg)
1428 1647
1429Sends an ext reply to the player. 1648Sends an ext reply to the player.
1430 1649
1431=cut 1650=cut
1432 1651
1433sub ext_reply($$%) { 1652sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1653 my ($self, $id, @msg) = @_;
1435 1654
1436 $msg{msgid} = $id; 1655 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1656}
1439 1657
1440=item $player->ext_event ($type, %msg) 1658=item $player->ext_msg ($type, @msg)
1441 1659
1442Sends an ext event to the client. 1660Sends an ext event to the client.
1443 1661
1444=cut 1662=cut
1445 1663
1446sub ext_event($$%) { 1664sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1665 my ($self, $type, @msg) = @_;
1448 1666
1449 $self->ns->ext_event ($type, %msg); 1667 $self->ns->ext_msg ($type, @msg);
1450} 1668}
1451 1669
1452=head3 cf::region 1670=head3 cf::region
1453 1671
1454=over 4 1672=over 4
… …
1467 my ($path) = @_; 1685 my ($path) = @_;
1468 1686
1469 my ($match, $specificity); 1687 my ($match, $specificity);
1470 1688
1471 for my $region (list) { 1689 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1690 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1691 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1692 if $region->specificity > $specificity;
1475 } 1693 }
1476 } 1694 }
1477 1695
… …
1498our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1499our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1500 1718
1501sub generate_random_map { 1719sub generate_random_map {
1502 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1503 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1504 $self->_create_random_map ( 1725 $self->_create_random_map (
1505 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1506 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1507 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1597 $self->init; # pass $1 etc. 1818 $self->init; # pass $1 etc.
1598 return $self; 1819 return $self;
1599 } 1820 }
1600 } 1821 }
1601 1822
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1823 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1824 ()
1604} 1825}
1605 1826
1606sub init { 1827sub init {
1607 my ($self) = @_; 1828 my ($self) = @_;
… …
1629 1850
1630# the temporary/swap location 1851# the temporary/swap location
1631sub save_path { 1852sub save_path {
1632 my ($self) = @_; 1853 my ($self) = @_;
1633 1854
1634 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1635 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1636} 1857}
1637 1858
1638# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1639sub uniq_path { 1860sub uniq_path {
1640 my ($self) = @_; 1861 my ($self) = @_;
1641 1862
1642 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1643 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1644} 1865}
1645 1866
1646# and all this just because we cannot iterate over 1867# and all this just because we cannot iterate over
1647# all maps in C++... 1868# all maps in C++...
… …
1670 1891
1671sub load_header_from($) { 1892sub load_header_from($) {
1672 my ($self, $path) = @_; 1893 my ($self, $path) = @_;
1673 1894
1674 utf8::encode $path; 1895 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1896 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1897 or return;
1898
1899 $self->_load_header ($f)
1900 or return;
1901
1902 local $MAP_LOADING{$self->{path}} = $self;
1903 $f->resolve_delayed_derefs;
1680 1904
1681 $self->{load_path} = $path; 1905 $self->{load_path} = $path;
1682 1906
1683 1 1907 1
1684} 1908}
… …
1738sub find { 1962sub find {
1739 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1740 1964
1741 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1742 1966
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1744 1969
1745 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
1746 my $guard = cf::lock_acquire "map_find:$path";
1747 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
1748 or return; 1972 or return;
1749 1973
1750 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1751 1975
… …
1753 or return; 1977 or return;
1754 1978
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1979 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 1980 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 1981 #$cf::WAIT_FOR_TICK->wait;
1982 undef $guard2;
1983 undef $guard1;
1758 $map->reset; 1984 $map->reset;
1759 undef $guard;
1760 return find $path; 1985 return find $path;
1761 } 1986 }
1762 1987
1763 $cf::MAP{$path} = $map 1988 $cf::MAP{$path} = $map
1764 } 1989 }
… …
1773 local $self->{deny_reset} = 1; # loading can take a long time 1998 local $self->{deny_reset} = 1; # loading can take a long time
1774 1999
1775 my $path = $self->{path}; 2000 my $path = $self->{path};
1776 2001
1777 { 2002 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 2003 my $guard = cf::lock_acquire "map_data:$path";
1779 2004
2005 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 2006 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 2007
1782 $self->in_memory (cf::MAP_LOADING); 2008 $self->in_memory (cf::MAP_LOADING);
1783 2009
1784 $self->alloc; 2010 $self->alloc;
1785 2011
1786 $self->pre_load; 2012 $self->pre_load;
1787 Coro::cede; 2013 cf::cede_to_tick;
1788 2014
2015 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 2017 $self->_load_objects ($f)
1790 or return; 2018 or return;
1791 2019
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2020 $self->post_load_original
1793 if delete $self->{load_original}; 2021 if delete $self->{load_original};
1794 2022
1795 if (my $uniq = $self->uniq_path) { 2023 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 2024 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 2025 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 2027 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 2028 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs;
2030 }
1800 } 2031 }
1801 } 2032 }
1802 2033
1803 Coro::cede; 2034 $f->resolve_delayed_derefs;
2035
2036 cf::cede_to_tick;
1804 # now do the right thing for maps 2037 # now do the right thing for maps
1805 $self->link_multipart_objects; 2038 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 2039 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 2040 unless $self->difficulty;
1808 Coro::cede; 2041 cf::cede_to_tick;
1809 2042
1810 unless ($self->{deny_activate}) { 2043 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 2044 $self->decay_objects;
1812 $self->fix_auto_apply; 2045 $self->fix_auto_apply;
1813 $self->update_buttons; 2046 $self->update_buttons;
1814 Coro::cede; 2047 cf::cede_to_tick;
1815 $self->set_darkness_map; 2048 $self->set_darkness_map;
1816 Coro::cede; 2049 cf::cede_to_tick;
1817 $self->activate; 2050 $self->activate;
1818 } 2051 }
1819 2052
2053 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME);
2055
1820 $self->in_memory (cf::MAP_IN_MEMORY); 2056 $self->in_memory (cf::MAP_ACTIVE);
1821 } 2057 }
1822 2058
1823 $self->post_load; 2059 $self->post_load;
1824} 2060}
1825 2061
… …
1834 2070
1835 $self 2071 $self
1836} 2072}
1837 2073
1838# find and load all maps in the 3x3 area around a map 2074# find and load all maps in the 3x3 area around a map
1839sub load_diag { 2075sub load_neighbours {
1840 my ($map) = @_; 2076 my ($map) = @_;
1841 2077
1842 my @diag; # diagonal neighbours 2078 my @neigh; # diagonal neighbours
1843 2079
1844 for (0 .. 3) { 2080 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 2081 my $neigh = $map->tile_path ($_)
1846 or next; 2082 or next;
1847 $neigh = find $neigh, $map 2083 $neigh = find $neigh, $map
1848 or next; 2084 or next;
1849 $neigh->load; 2085 $neigh->load;
1850 2086
2087 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2090 }
1854 2091
1855 for (@diag) { 2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2094 my $neigh = find $path, $origin
1857 or next; 2095 or next;
1858 $neigh->load; 2096 $neigh->load;
1859 } 2097 }
1860} 2098}
1861 2099
… …
1866} 2104}
1867 2105
1868sub do_load_sync { 2106sub do_load_sync {
1869 my ($map) = @_; 2107 my ($map) = @_;
1870 2108
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main;
2111
1871 cf::sync_job { $map->load }; 2112 cf::sync_job { $map->load };
1872} 2113}
1873 2114
1874our %MAP_PREFETCH; 2115our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2116our $MAP_PREFETCHER = undef;
1876 2117
1877sub find_async { 2118sub find_async {
1878 my ($path, $origin) = @_; 2119 my ($path, $origin, $load) = @_;
1879 2120
1880 $path = normalise $path, $origin && $origin->{path}; 2121 $path = normalise $path, $origin && $origin->{path};
1881 2122
1882 if (my $map = $cf::MAP{$path}) { 2123 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1884 } 2125 }
1885 2126
1886 undef $MAP_PREFETCH{$path}; 2127 $MAP_PREFETCH{$path} |= $load;
2128
1887 $MAP_PREFETCHER ||= cf::async { 2129 $MAP_PREFETCHER ||= cf::async {
2130 $Coro::current->{desc} = "map prefetcher";
2131
1888 while (%MAP_PREFETCH) { 2132 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2133 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2134 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2135 $map->load if $v;
2136 }
1893 2137
1894 delete $MAP_PREFETCH{$path}; 2138 delete $MAP_PREFETCH{$k};
1895 } 2139 }
1896 } 2140 }
1897 undef $MAP_PREFETCHER; 2141 undef $MAP_PREFETCHER;
1898 }; 2142 };
1899 $MAP_PREFETCHER->prio (6); 2143 $MAP_PREFETCHER->prio (6);
… …
1902} 2146}
1903 2147
1904sub save { 2148sub save {
1905 my ($self) = @_; 2149 my ($self) = @_;
1906 2150
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2152
1909 $self->{last_save} = $cf::RUNTIME; 2153 $self->{last_save} = $cf::RUNTIME;
1910 2154
1911 return unless $self->dirty; 2155 return unless $self->dirty;
1912 2156
… …
1918 return if $self->{deny_save}; 2162 return if $self->{deny_save};
1919 2163
1920 local $self->{last_access} = $self->last_access;#d# 2164 local $self->{last_access} = $self->last_access;#d#
1921 2165
1922 cf::async { 2166 cf::async {
2167 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2168 $_->contr->save for $self->players;
1924 }; 2169 };
2170
2171 cf::get_slot 0.02;
1925 2172
1926 if ($uniq) { 2173 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2174 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1928 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2175 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1929 } else { 2176 } else {
… …
1935 my ($self) = @_; 2182 my ($self) = @_;
1936 2183
1937 # save first because save cedes 2184 # save first because save cedes
1938 $self->save; 2185 $self->save;
1939 2186
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2188
1942 return if $self->players; 2189 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2190 return if $self->in_memory != cf::MAP_ACTIVE;
1944 return if $self->{deny_save}; 2191 return if $self->{deny_save};
1945 2192
2193 $self->in_memory (cf::MAP_SWAPPED);
2194
2195 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2197 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2198}
1949 2199
1950sub reset_at { 2200sub reset_at {
1951 my ($self) = @_; 2201 my ($self) = @_;
1952 2202
… …
1984 if $uniq; 2234 if $uniq;
1985 } 2235 }
1986 2236
1987 delete $cf::MAP{$self->path}; 2237 delete $cf::MAP{$self->path};
1988 2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2241 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2242
1993 $self->unlink_save; 2243 $self->unlink_save;
1994 $self->destroy; 2244 $self->destroy;
1995} 2245}
1996 2246
1997my $nuke_counter = "aaaa"; 2247my $nuke_counter = "aaaa";
1998 2248
1999sub nuke { 2249sub nuke {
2000 my ($self) = @_; 2250 my ($self) = @_;
2001 2251
2252 {
2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254
2002 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2003 2256
2004 $self->unlink_save; 2257 $self->unlink_save;
2005 2258
2006 bless $self, "cf::map"; 2259 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2260 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2261 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2262 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2264
2012 $cf::MAP{$self->path} = $self; 2265 $cf::MAP{$self->path} = $self;
2266 }
2013 2267
2014 $self->reset; # polite request, might not happen 2268 $self->reset; # polite request, might not happen
2015} 2269}
2016 2270
2017=item $maps = cf::map::tmp_maps 2271=item $maps = cf::map::tmp_maps
… …
2059 2313
2060sub unique_maps() { 2314sub unique_maps() {
2061 [ 2315 [
2062 map { 2316 map {
2063 utf8::decode $_; 2317 utf8::decode $_;
2064 /\.map$/ 2318 s/\.map$//; # TODO future compatibility hack
2319 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2320 ? ()
2065 ? normalise $_ 2321 : normalise $_
2066 : ()
2067 } @{ aio_readdir $UNIQUEDIR or [] } 2322 } @{ aio_readdir $UNIQUEDIR or [] }
2068 ] 2323 ]
2069} 2324}
2070 2325
2071package cf;
2072
2073=back 2326=back
2074 2327
2075=head3 cf::object 2328=head3 cf::object
2076 2329
2077=cut 2330=cut
… …
2080 2333
2081=over 4 2334=over 4
2082 2335
2083=item $ob->inv_recursive 2336=item $ob->inv_recursive
2084 2337
2085Returns the inventory of the object _and_ their inventories, recursively. 2338Returns the inventory of the object I<and> their inventories, recursively,
2339but I<not> the object itself.
2086 2340
2087=cut 2341=cut
2088 2342
2089sub inv_recursive_; 2343sub inv_recursive_;
2090sub inv_recursive_ { 2344sub inv_recursive_ {
… …
2093 2347
2094sub inv_recursive { 2348sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2349 inv_recursive_ inv $_[0]
2096} 2350}
2097 2351
2352=item $ref = $ob->ref
2353
2354Creates and returns a persistent reference to an object that can be stored as a string.
2355
2356=item $ob = cf::object::deref ($refstring)
2357
2358returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2359even if the object actually exists. May block.
2360
2361=cut
2362
2363sub deref {
2364 my ($ref) = @_;
2365
2366 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2367 my ($uuid, $name) = ($1, $2);
2368 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2369 or return;
2370 $pl->ob->uuid eq $uuid
2371 or return;
2372
2373 $pl->ob
2374 } else {
2375 warn "$ref: cannot resolve object reference\n";
2376 undef
2377 }
2378}
2379
2098package cf; 2380package cf;
2099 2381
2100=back 2382=back
2101 2383
2102=head3 cf::object::player 2384=head3 cf::object::player
… …
2108Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2390Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2109can be C<undef>. Does the right thing when the player is currently in a 2391can be C<undef>. Does the right thing when the player is currently in a
2110dialogue with the given NPC character. 2392dialogue with the given NPC character.
2111 2393
2112=cut 2394=cut
2395
2396our $SAY_CHANNEL = {
2397 id => "say",
2398 title => "Map",
2399 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2401};
2402
2403our $CHAT_CHANNEL = {
2404 id => "chat",
2405 title => "Chat",
2406 reply => "chat ",
2407 tooltip => "Player chat and shouts, global to the server.",
2408};
2113 2409
2114# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2115# with dialog boxes. 2411# with dialog boxes.
2116#TODO: the first argument must go, split into a $npc->reply_to ( method 2412#TODO: the first argument must go, split into a $npc->reply_to ( method
2117sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
… …
2124 2420
2125 } else { 2421 } else {
2126 my $pl = $self->contr; 2422 my $pl = $self->contr;
2127 2423
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2424 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2426 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2427
2137 } else { 2428 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2140 } 2431 }
2141 } 2432 }
2433}
2434
2435=item $object->send_msg ($channel, $msg, $color, [extra...])
2436
2437=cut
2438
2439sub cf::object::send_msg {
2440 my $pl = shift->contr
2441 or return;
2442 $pl->send_msg (@_);
2142} 2443}
2143 2444
2144=item $player_object->may ("access") 2445=item $player_object->may ("access")
2145 2446
2146Returns wether the given player is authorized to access resource "access" 2447Returns wether the given player is authorized to access resource "access"
… …
2159 2460
2160=item $player_object->enter_link 2461=item $player_object->enter_link
2161 2462
2162Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2163 2464
2164The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2165I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2166 2469
2167Will never block. 2470Will never block.
2168 2471
2169=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2170 2473
… …
2225 # use -1 or undef as default coordinates, not 0, 0 2528 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2529 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2530 if $x <=0 && $y <= 0;
2228 2531
2229 $map->load; 2532 $map->load;
2230 $map->load_diag; 2533 $map->load_neighbours;
2231 2534
2232 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2233 $self->activate_recursive; 2537 $self->activate_recursive;
2234 2538
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2540 $self->enter_map ($map, $x, $y);
2237} 2541}
2238 2542
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2544
2241Moves the player to the given map-path and coordinates by first freezing 2545Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2546her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2547that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2548the new (success) or old (failed) map position. In either case, $done will
2549be called at the end of this process.
2550
2551Note that $check will be called with a potentially non-loaded map, so if
2552it needs a loaded map it has to call C<< ->load >>.
2245 2553
2246=cut 2554=cut
2247 2555
2248our $GOTOGEN; 2556our $GOTOGEN;
2249 2557
2250sub cf::object::player::goto { 2558sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2559 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2560
2253 # do generation counting so two concurrent goto's will be executed in-order 2561 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2563
2256 $self->enter_link; 2564 $self->enter_link;
2257 2565
2258 (async { 2566 (async {
2567 $Coro::current->{desc} = "player::goto $path $x $y";
2568
2569 # *tag paths override both path and x|y
2570 if ($path =~ /^\*(.*)$/) {
2571 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2572 my $ob = $obs[rand @obs];
2573
2574 # see if we actually can go there
2575 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2576 $ob = $obs[rand @obs];
2577 } else {
2578 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2579 }
2580 # else put us there anyways for now #d#
2581
2582 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2583 } else {
2584 ($path, $x, $y) = (undef, undef, undef);
2585 }
2586 }
2587
2259 my $map = eval { 2588 my $map = eval {
2260 my $map = cf::map::find $path; 2589 my $map = defined $path ? cf::map::find $path : undef;
2261 2590
2262 if ($map) { 2591 if ($map) {
2263 $map = $map->customise_for ($self); 2592 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2593 $map = $check->($map) if $check && $map;
2265 } else { 2594 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2596 }
2268 2597
2269 $map 2598 $map
2270 }; 2599 };
2271 2600
… …
2276 2605
2277 if ($gen == $self->{_goto_generation}) { 2606 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2607 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2608 $self->leave_link ($map, $x, $y);
2280 } 2609 }
2610
2611 $done->() if $done;
2281 })->prio (1); 2612 })->prio (1);
2282} 2613}
2283 2614
2284=item $player_object->enter_exit ($exit_object) 2615=item $player_object->enter_exit ($exit_object)
2285 2616
… …
2305} 2636}
2306 2637
2307sub prepare_random_map { 2638sub prepare_random_map {
2308 my ($exit) = @_; 2639 my ($exit) = @_;
2309 2640
2310 my $guard = cf::lock_acquire "exit_prepare:$exit";
2311
2312 # all this does is basically replace the /! path by 2641 # all this does is basically replace the /! path by
2313 # a new random map path (?random/...) with a seed 2642 # a new random map path (?random/...) with a seed
2314 # that depends on the exit object 2643 # that depends on the exit object
2315 2644
2316 my $rmp = parse_random_map_params $exit->msg; 2645 my $rmp = parse_random_map_params $exit->msg;
… …
2318 if ($exit->map) { 2647 if ($exit->map) {
2319 $rmp->{region} = $exit->region->name; 2648 $rmp->{region} = $exit->region->name;
2320 $rmp->{origin_map} = $exit->map->path; 2649 $rmp->{origin_map} = $exit->map->path;
2321 $rmp->{origin_x} = $exit->x; 2650 $rmp->{origin_x} = $exit->x;
2322 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2652
2653 $exit->map->touch;
2323 } 2654 }
2324 2655
2325 $rmp->{random_seed} ||= $exit->random_seed; 2656 $rmp->{random_seed} ||= $exit->random_seed;
2326 2657
2327 my $data = cf::to_json $rmp; 2658 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2328 my $md5 = Digest::MD5::md5_hex $data; 2659 my $md5 = Digest::MD5::md5_hex $data;
2329 my $meta = "$RANDOMDIR/$md5.meta"; 2660 my $meta = "$RANDOMDIR/$md5.meta";
2330 2661
2331 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2662 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2332 aio_write $fh, 0, (length $data), $data, 0; 2663 aio_write $fh, 0, (length $data), $data, 0;
2333 undef $fh; 2664 undef $fh;
2334 aio_rename "$meta~", $meta; 2665 aio_rename "$meta~", $meta;
2335 2666
2667 my $slaying = "?random/$md5";
2668
2669 if ($exit->valid) {
2336 $exit->slaying ("?random/$md5"); 2670 $exit->slaying ("?random/$md5");
2337 $exit->msg (undef); 2671 $exit->msg (undef);
2672 }
2338 } 2673 }
2339} 2674}
2340 2675
2341sub cf::object::player::enter_exit { 2676sub cf::object::player::enter_exit {
2342 my ($self, $exit) = @_; 2677 my ($self, $exit) = @_;
2343 2678
2344 return unless $self->type == cf::PLAYER; 2679 return unless $self->type == cf::PLAYER;
2345 2680
2346 if ($exit->slaying eq "/!") {
2347 #TODO: this should de-fi-ni-te-ly not be a sync-job
2348 # the problem is that $exit might not survive long enough
2349 # so it needs to be done right now, right here
2350 cf::sync_job { prepare_random_map $exit };
2351 }
2352
2353 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2354 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp;
2356
2357 $self->enter_link; 2681 $self->enter_link;
2358 2682
2359 (async { 2683 (async {
2360 $self->deactivate_recursive; # just to be sure 2684 $Coro::current->{desc} = "enter_exit";
2685
2361 unless (eval { 2686 unless (eval {
2687 $self->deactivate_recursive; # just to be sure
2688
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2698 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp;
2700
2362 $self->goto ($slaying, $hp, $sp); 2701 $self->goto ($map, $x, $y);
2363 2702
2703 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y)
2705 if $exit->flag (cf::FLAG_DAMNED);
2706
2364 1; 2707 1
2365 }) { 2708 }) {
2366 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2367 . "I'll try to bring you back to the map you were before. " 2710 . "I'll try to bring you back to the map you were before. "
2368 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2369 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2370 2713
2371 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
… …
2390 2733
2391 utf8::encode $text; 2734 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2736}
2394 2737
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2738=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2739
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2740Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2741client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2742the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2743the message unless the client supports the msg packet.
2401 2744
2402=cut 2745=cut
2403 2746
2747# non-persistent channels (usually the info channel)
2748our %CHANNEL = (
2749 "c/identify" => {
2750 id => "infobox",
2751 title => "Identify",
2752 reply => undef,
2753 tooltip => "Items recently identified",
2754 },
2755 "c/examine" => {
2756 id => "infobox",
2757 title => "Examine",
2758 reply => undef,
2759 tooltip => "Signs and other items you examined",
2760 },
2761 "c/book" => {
2762 id => "infobox",
2763 title => "Book",
2764 reply => undef,
2765 tooltip => "The contents of a note or book",
2766 },
2767 "c/lookat" => {
2768 id => "infobox",
2769 title => "Look",
2770 reply => undef,
2771 tooltip => "What you saw there",
2772 },
2773 "c/who" => {
2774 id => "infobox",
2775 title => "Players",
2776 reply => undef,
2777 tooltip => "Shows players who are currently online",
2778 },
2779 "c/body" => {
2780 id => "infobox",
2781 title => "Body Parts",
2782 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available",
2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2791 "c/uptime" => {
2792 id => "infobox",
2793 title => "Uptime",
2794 reply => undef,
2795 tooltip => "How long the server has been running since last restart",
2796 },
2797 "c/mapinfo" => {
2798 id => "infobox",
2799 title => "Map Info",
2800 reply => undef,
2801 tooltip => "Information related to the maps",
2802 },
2803 "c/party" => {
2804 id => "party",
2805 title => "Party",
2806 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party",
2808 },
2809);
2810
2404sub cf::client::send_msg { 2811sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2812 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2813
2407 $msg = $self->pl->expand_cfpod ($msg); 2814 $msg = $self->pl->expand_cfpod ($msg)
2815 unless $color & cf::NDI_VERBATIM;
2816
2817 $color &= cf::NDI_CLIENT_MASK; # just in case...
2818
2819 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel};
2822
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id};
2827
2828 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel)
2833 if $self->can_msg;
2834 }
2835
2836 $channel = $channel->{id};
2837 }
2838
2839 return unless @extra || length $msg;
2408 2840
2409 if ($self->can_msg) { 2841 if ($self->can_msg) {
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2842 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF;
2845
2846 my $pkt = "msg "
2847 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 );
2850
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt);
2411 } else { 2862 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) { 2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2423 if (0 && $msg =~ /\[/) { 2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2881 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2883 $self->send_packet ("drawinfo $color $msg")
2428 } 2884 }
2429 } 2885 }
2430 } 2886 }
2431} 2887}
2432 2888
2433=item $client->ext_event ($type, %msg) 2889=item $client->ext_msg ($type, @msg)
2434 2890
2435Sends an ext event to the client. 2891Sends an ext event to the client.
2436 2892
2437=cut 2893=cut
2438 2894
2439sub cf::client::ext_event($$%) { 2895sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2896 my ($self, $type, @msg) = @_;
2441 2897
2898 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2901 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904}
2905
2906=item $client->ext_reply ($msgid, @msg)
2907
2908Sends an ext reply to the client.
2909
2910=cut
2911
2912sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_;
2914
2915 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 }
2444} 2922}
2445 2923
2446=item $success = $client->query ($flags, "text", \&cb) 2924=item $success = $client->query ($flags, "text", \&cb)
2447 2925
2448Queues a query to the client, calling the given callback with 2926Queues a query to the client, calling the given callback with
… …
2503 my ($ns, $buf) = @_; 2981 my ($ns, $buf) = @_;
2504 2982
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2983 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2984
2507 if (ref $msg) { 2985 if (ref $msg) {
2986 my ($type, $reply, @payload) =
2987 "ARRAY" eq ref $msg
2988 ? @$msg
2989 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2990
2991 my @reply;
2992
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2993 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2994 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 2995 }
2996
2997 $ns->ext_reply ($reply, @reply)
2998 if $reply;
2999
2514 } else { 3000 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 3002 }
2517 3003
2518 cf::override; 3004 cf::override;
… …
2565our $safe = new Safe "safe"; 3051our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 3052our $safe_hole = new Safe::Hole;
2567 3053
2568$SIG{FPE} = 'IGNORE'; 3054$SIG{FPE} = 'IGNORE';
2569 3055
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3056$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math
3058 grepstart grepwhile mapstart mapwhile
3059 sort time
3060));
2571 3061
2572# here we export the classes and methods available to script code 3062# here we export the classes and methods available to script code
2573 3063
2574=pod 3064=pod
2575 3065
2576The following functions and methods are available within a safe environment: 3066The following functions and methods are available within a safe environment:
2577 3067
2578 cf::object contr pay_amount pay_player map 3068 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split
3071
2579 cf::object::player player 3072 cf::object::player
2580 cf::player peaceful 3073 player
2581 cf::map trigger 3074
3075 cf::player
3076 peaceful
3077
3078 cf::map
3079 trigger
2582 3080
2583=cut 3081=cut
2584 3082
2585for ( 3083for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)],
2587 ["cf::object::player" => qw(player)], 3087 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 3088 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 3089 ["cf::map" => qw(trigger)],
2590) { 3090) {
2591 no strict 'refs'; 3091 no strict 'refs';
… …
2667# the server's init and main functions 3167# the server's init and main functions
2668 3168
2669sub load_facedata($) { 3169sub load_facedata($) {
2670 my ($path) = @_; 3170 my ($path) = @_;
2671 3171
3172 # HACK to clear player env face cache, we need some signal framework
3173 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = ();
3175
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177
2672 warn "loading facedata from $path\n"; 3178 warn "loading facedata from $path\n";
2673 3179
2674 my $facedata; 3180 my $facedata;
2675 0 < aio_load $path, $facedata 3181 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3182 or die "$path: $!";
… …
2678 $facedata = Coro::Storable::thaw $facedata; 3184 $facedata = Coro::Storable::thaw $facedata;
2679 3185
2680 $facedata->{version} == 2 3186 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3187 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3188
3189 # patch in the exptable
3190 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3193 };
3194 cf::cede_to_tick;
3195
2683 { 3196 {
2684 my $faces = $facedata->{faceinfo}; 3197 my $faces = $facedata->{faceinfo};
2685 3198
2686 while (my ($face, $info) = each %$faces) { 3199 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3200 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3202 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3206
3207 cf::cede_to_tick;
2692 } 3208 }
2693 3209
2694 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3211 next unless $info->{smooth};
3212
2696 my $idx = cf::face::find $face 3213 my $idx = cf::face::find $face
2697 or next; 3214 or next;
3215
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3216 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3219 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3220 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3221 }
2703 Coro::cede; 3222
3223 cf::cede_to_tick;
2704 } 3224 }
2705 } 3225 }
2706 3226
2707 { 3227 {
2708 my $anims = $facedata->{animinfo}; 3228 my $anims = $facedata->{animinfo};
2709 3229
2710 while (my ($anim, $info) = each %$anims) { 3230 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3231 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3232 cf::cede_to_tick;
2713 } 3233 }
2714 3234
2715 cf::anim::invalidate_all; # d'oh 3235 cf::anim::invalidate_all; # d'oh
2716 } 3236 }
2717 3237
3238 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource};
3242
3243 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247
3248 if ($info->{type} & 1) {
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type};
3263 } else {
3264 $RESOURCE{$name} = $info;
3265 }
3266
3267 cf::cede_to_tick;
3268 }
3269 }
3270
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272
2718 1 3273 1
2719} 3274}
2720 3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295
3296register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_;
3298
3299 while (my ($k, $v) = each %$want) {
3300 $ns->fx_want ($k, $v);
3301 }
3302};
3303
3304sub load_resource_file($) {
3305 my $guard = lock_acquire "load_resource_file";
3306
3307 my $status = load_resource_file_ $_[0];
3308 get_slot 0.1, 100;
3309 cf::arch::commit_load;
3310
3311 $status
3312}
3313
2721sub reload_regions { 3314sub reload_regions {
3315 # HACK to clear player env face cache, we need some signal framework
3316 # for this (global event?)
3317 %ext::player_env::MUSIC_FACE_CACHE = ();
3318
2722 load_resource_file "$MAPDIR/regions" 3319 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3320 or die "unable to load regions file\n";
3321
3322 for (cf::region::list) {
3323 $_->{match} = qr/$_->{match}/
3324 if exists $_->{match};
3325 }
2724} 3326}
2725 3327
2726sub reload_facedata { 3328sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3329 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3330 or die "unable to load facedata\n";
2729} 3331}
2730 3332
2731sub reload_archetypes { 3333sub reload_archetypes {
2732 load_resource_file "$DATADIR/archetypes" 3334 load_resource_file "$DATADIR/archetypes"
2733 or die "unable to load archetypes\n"; 3335 or die "unable to load archetypes\n";
2734 #d# NEED to laod twice to resolve forward references
2735 # this really needs to be done in an extra post-pass
2736 # (which needs to be synchronous, so solve it differently)
2737 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n";
2739} 3336}
2740 3337
2741sub reload_treasures { 3338sub reload_treasures {
2742 load_resource_file "$DATADIR/treasures" 3339 load_resource_file "$DATADIR/treasures"
2743 or die "unable to load treasurelists\n"; 3340 or die "unable to load treasurelists\n";
2744} 3341}
2745 3342
2746sub reload_resources { 3343sub reload_resources {
2747 warn "reloading resource files...\n"; 3344 warn "reloading resource files...\n";
2748 3345
3346 reload_facedata;
3347 reload_archetypes;
2749 reload_regions; 3348 reload_regions;
2750 reload_facedata;
2751 #reload_archetypes;#d#
2752 reload_archetypes;
2753 reload_treasures; 3349 reload_treasures;
2754 3350
2755 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
2756} 3352}
2757 3353
2758sub init { 3354sub reload_config {
2759 reload_resources;
2760}
2761
2762sub cfg_load {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3356 or return;
2765 3357
2766 local $/; 3358 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
2768 3360
2769 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2770 3362
2771 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2772 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2778 }; 3370 };
2779 warn $@ if $@; 3371 warn $@ if $@;
2780 } 3372 }
2781} 3373}
2782 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
2783sub main { 3394sub main {
3395 cf::init_globals; # initialise logging
3396
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409
2784 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3413 (async {
2788 Event::one_event; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3415 EV::loop EV::LOOP_ONESHOT;
2789 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
2790 }; 3417 };
2791 3418
2792 cfg_load; 3419 evthread_start IO::AIO::poll_fileno;
3420
3421 cf::sync_job {
3422 reload_resources;
3423 reload_config;
2793 db_init; 3424 db_init;
3425
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid;
3429 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills;
3432
3433 cf::init_beforeplay;
3434
3435 atomic;
3436
2794 load_extensions; 3437 load_extensions;
2795 3438
2796 $TICK_WATCHER->start; 3439 utime time, time, $RUNTIMEFILE;
3440
3441 # no (long-running) fork's whatsoever before this point(!)
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443
3444 (pop @POST_INIT)->(0) while @POST_INIT;
3445 };
3446
2797 Event::loop; 3447 EV::loop;
2798} 3448}
2799 3449
2800############################################################################# 3450#############################################################################
2801# initialisation and cleanup 3451# initialisation and cleanup
2802 3452
2803# install some emergency cleanup handlers 3453# install some emergency cleanup handlers
2804BEGIN { 3454BEGIN {
3455 our %SIGWATCHER = ();
2805 for my $signal (qw(INT HUP TERM)) { 3456 for my $signal (qw(INT HUP TERM)) {
2806 Event->signal ( 3457 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2807 reentrant => 0,
2808 data => WF_AUTOCANCEL,
2809 signal => $signal,
2810 prio => 0,
2811 cb => sub {
2812 cf::cleanup "SIG$signal"; 3458 cf::cleanup "SIG$signal";
2813 },
2814 ); 3459 };
2815 } 3460 }
2816} 3461}
2817 3462
2818sub write_runtime { 3463sub write_runtime_sync {
2819 my $runtime = "$LOCALDIR/runtime";
2820
2821 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
2822 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
2823 3466
2824 IO::AIO::aio_utime $runtime, undef, undef; 3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2825 3468
2826 my $guard = cf::lock_acquire "write_runtime"; 3469 my $guard = cf::lock_acquire "write_runtime";
2827 3470
2828 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2829 or return; 3472 or return;
2830 3473
2831 my $value = $cf::RUNTIME + 90 + 10; 3474 my $value = $cf::RUNTIME + 90 + 10;
2832 # 10 is the runtime save interval, for a monotonic clock 3475 # 10 is the runtime save interval, for a monotonic clock
2833 # 60 allows for the watchdog to kill the server. 3476 # 60 allows for the watchdog to kill the server.
… …
2843 aio_utime $fh, undef, undef; 3486 aio_utime $fh, undef, undef;
2844 3487
2845 close $fh 3488 close $fh
2846 or return; 3489 or return;
2847 3490
2848 aio_rename "$runtime~", $runtime 3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2849 and return; 3492 and return;
2850 3493
2851 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
2852 3495
2853 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_seq uuid_cur;
3514
3515 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n";
3517 return;
3518 }
3519
3520 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
2854} 3547}
2855 3548
2856sub emergency_save() { 3549sub emergency_save() {
2857 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
2858 3551
2859 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
2860 3553
2861 cf::sync_job { 3554 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559
2862 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
2863 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
2864 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
2865 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
2866 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
2867 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
2868 $pl->valid or next; 3566 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869 $pl->save; 3568 $pl->save;
2870 } 3569 }
2871 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
2872 3571
2873 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
2874 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
2875 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
2876 $map->valid or next; 3575 $map->valid or next;
2877 $map->save; 3576 $map->save;
2878 } 3577 }
2879 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
2880 3579
2881 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
2882 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
2883 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3583
3584 warn "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n";
2884 }; 3587 };
2885 3588
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
2886 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
2887} 3595}
2888 3596
2889sub post_cleanup { 3597sub post_cleanup {
2890 my ($make_core) = @_; 3598 my ($make_core) = @_;
2891 3599
2892 warn Carp::longmess "post_cleanup backtrace" 3600 warn Carp::longmess "post_cleanup backtrace"
2893 if $make_core; 3601 if $make_core;
3602
3603 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$;
3605}
3606
3607# a safer delete_package, copied from Symbol
3608sub clear_package($) {
3609 my $pkg = shift;
3610
3611 # expand to full symbol table name if needed
3612 unless ($pkg =~ /^main::.*::$/) {
3613 $pkg = "main$pkg" if $pkg =~ /^::/;
3614 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3615 $pkg .= '::' unless $pkg =~ /::$/;
3616 }
3617
3618 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3619 my $stem_symtab = *{$stem}{HASH};
3620
3621 defined $stem_symtab and exists $stem_symtab->{$leaf}
3622 or return;
3623
3624 # clear all symbols
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 }
3630 warn "cleared package $pkg\n";#d#
2894} 3631}
2895 3632
2896sub do_reload_perl() { 3633sub do_reload_perl() {
2897 # can/must only be called in main 3634 # can/must only be called in main
2898 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
2899 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
2900 return; 3637 return;
2901 } 3638 }
2902 3639
3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3643
3644 while ($RELOAD) {
2903 warn "reloading..."; 3645 warn "reloading...";
2904 3646
2905 warn "entering sync_job"; 3647 warn "entering sync_job";
2906 3648
2907 cf::sync_job { 3649 cf::sync_job {
2908 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
2909 cf::emergency_save; 3651 cf::emergency_save;
2910 cf::write_runtime; # external watchdog should not bark 3652 cf::write_runtime_sync; # external watchdog should not bark
2911 3653
2912 warn "syncing database to disk"; 3654 warn "syncing database to disk";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3655 BDB::db_env_txn_checkpoint $DB_ENV;
2914 3656
2915 # if anything goes wrong in here, we should simply crash as we already saved 3657 # if anything goes wrong in here, we should simply crash as we already saved
2916 3658
2917 warn "cancelling all WF_AUTOCANCEL watchers";
2918 for (Event::all_watchers) {
2919 $_->cancel if $_->data & WF_AUTOCANCEL;
2920 }
2921
2922 warn "flushing outstanding aio requests"; 3659 warn "flushing outstanding aio requests";
2923 for (;;) {
2924 BDB::flush;
2925 IO::AIO::flush;
2926 Coro::cede;
2927 last unless IO::AIO::nreqs || BDB::nreqs; 3660 while (IO::AIO::nreqs || BDB::nreqs) {
2928 warn "iterate..."; 3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2929 }
2930
2931 ++$RELOAD;
2932
2933 warn "cancelling all extension coros";
2934 $_->cancel for values %EXT_CORO;
2935 %EXT_CORO = ();
2936
2937 warn "removing commands";
2938 %COMMAND = ();
2939
2940 warn "removing ext/exti commands";
2941 %EXTCMD = ();
2942 %EXTICMD = ();
2943
2944 warn "unloading/nuking all extensions";
2945 for my $pkg (@EXTS) {
2946 warn "... unloading $pkg";
2947
2948 if (my $cb = $pkg->can ("unload")) {
2949 eval {
2950 $cb->($pkg);
2951 1
2952 } or warn "$pkg unloaded, but with errors: $@";
2953 } 3662 }
2954 3663
2955 warn "... nuking $pkg"; 3664 warn "cancelling all extension coros";
2956 Symbol::delete_package $pkg; 3665 $_->cancel for values %EXT_CORO;
2957 } 3666 %EXT_CORO = ();
2958 3667
2959 warn "unloading all perl modules loaded from $LIBDIR"; 3668 warn "removing commands";
2960 while (my ($k, $v) = each %INC) { 3669 %COMMAND = ();
2961 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2962 3670
3671 warn "removing ext/exti commands";
3672 %EXTCMD = ();
3673 %EXTICMD = ();
3674
3675 warn "unloading/nuking all extensions";
3676 for my $pkg (@EXTS) {
2963 warn "... unloading $k"; 3677 warn "... unloading $pkg";
2964 delete $INC{$k};
2965 3678
2966 $k =~ s/\.pm$//;
2967 $k =~ s/\//::/g;
2968
2969 if (my $cb = $k->can ("unload_module")) { 3679 if (my $cb = $pkg->can ("unload")) {
3680 eval {
2970 $cb->(); 3681 $cb->($pkg);
3682 1
3683 } or warn "$pkg unloaded, but with errors: $@";
3684 }
3685
3686 warn "... clearing $pkg";
3687 clear_package $pkg;
2971 } 3688 }
2972 3689
2973 Symbol::delete_package $k; 3690 warn "unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693
3694 warn "... unloading $k";
3695 delete $INC{$k};
3696
3697 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g;
3699
3700 if (my $cb = $k->can ("unload_module")) {
3701 $cb->();
3702 }
3703
3704 clear_package $k;
2974 } 3705 }
2975 3706
2976 warn "getting rid of safe::, as good as possible"; 3707 warn "getting rid of safe::, as good as possible";
2977 Symbol::delete_package "safe::$_" 3708 clear_package "safe::$_"
2978 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2979 3710
2980 warn "unloading cf.pm \"a bit\""; 3711 warn "unloading cf.pm \"a bit\"";
2981 delete $INC{"cf.pm"}; 3712 delete $INC{"cf.pm"};
2982 delete $INC{"cf/pod.pm"}; 3713 delete $INC{"cf/pod.pm"};
2983 3714
2984 # don't, removes xs symbols, too, 3715 # don't, removes xs symbols, too,
2985 # and global variables created in xs 3716 # and global variables created in xs
2986 #Symbol::delete_package __PACKAGE__; 3717 #clear_package __PACKAGE__;
2987 3718
2988 warn "unload completed, starting to reload now"; 3719 warn "unload completed, starting to reload now";
2989 3720
2990 warn "reloading cf.pm"; 3721 warn "reloading cf.pm";
2991 require cf; 3722 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3724
2994 warn "loading config and database again"; 3725 warn "loading config and database again";
2995 cf::cfg_load; 3726 cf::reload_config;
2996 3727
2997 warn "loading extensions"; 3728 warn "loading extensions";
2998 cf::load_extensions; 3729 cf::load_extensions;
2999 3730
3731 if ($REATTACH_ON_RELOAD) {
3000 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3001 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3002 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3003 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3004 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3005 reattach $_ for values %PLAYER; 3737 reattach $_ for values %PLAYER;
3738 }
3006 3739
3740 warn "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742
3007 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3008 3744
3009 1 3745 1
3010 } or do { 3746 } or do {
3011 warn $@; 3747 warn $@;
3012 warn "error while reloading, exiting."; 3748 cf::cleanup "error while reloading, exiting.";
3013 exit 1;
3014 }; 3749 };
3015 3750
3016 warn "reloaded"; 3751 warn "reloaded";
3752 --$RELOAD;
3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3017}; 3757};
3018 3758
3019our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3020 3760
3021sub reload_perl() { 3761sub reload_perl() {
3022 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3023 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3024 3764
3025 $RELOAD_WATCHER ||= Event->timer ( 3765 $RELOAD_WATCHER ||= cf::async {
3026 reentrant => 0, 3766 Coro::AIO::aio_wait cache_extensions;
3027 after => 0, 3767
3028 data => WF_AUTOCANCEL, 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3029 cb => sub {
3030 do_reload_perl; 3769 do_reload_perl;
3031 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3032 }, 3771 };
3033 ); 3772 };
3034} 3773}
3035 3774
3036register_command "reload" => sub { 3775register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;
3038 3777
3039 if ($who->flag (FLAG_WIZ)) { 3778 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3779 $who->message ("reloading server.");
3780 async {
3781 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3782 reload_perl;
3783 };
3042 } 3784 }
3043}; 3785};
3044 3786
3045unshift @INC, $LIBDIR; 3787unshift @INC, $LIBDIR;
3046 3788
… …
3048 3790
3049our @WAIT_FOR_TICK; 3791our @WAIT_FOR_TICK;
3050our @WAIT_FOR_TICK_BEGIN; 3792our @WAIT_FOR_TICK_BEGIN;
3051 3793
3052sub wait_for_tick { 3794sub wait_for_tick {
3053 return unless $TICK_WATCHER->is_active;
3054 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
3055 3796
3056 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
3057 push @WAIT_FOR_TICK, $signal; 3798 push @WAIT_FOR_TICK, $signal;
3058 $signal->wait; 3799 $signal->wait;
3059} 3800}
3060 3801
3061sub wait_for_tick_begin { 3802sub wait_for_tick_begin {
3062 return unless $TICK_WATCHER->is_active;
3063 return if $Coro::current == $Coro::main; 3803 return if tick_inhibit || $Coro::current == $Coro::main;
3064 3804
3065 my $signal = new Coro::Signal; 3805 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3806 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3807 $signal->wait;
3068} 3808}
3069 3809
3070 my $min = 1e6;#d# 3810sub tick {
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer (
3073 reentrant => 0,
3074 parked => 1,
3075 prio => 0,
3076 at => $NEXT_TICK || $TICK,
3077 data => WF_AUTOCANCEL,
3078 cb => sub {
3079 if ($Coro::current != $Coro::main) { 3811 if ($Coro::current != $Coro::main) {
3080 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3812 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081 unless ++$bug_warning > 10; 3813 unless ++$bug_warning > 10;
3082 return; 3814 return;
3083 } 3815 }
3084 3816
3085 $NOW = $tick_start = Event::time;
3086
3087 cf::server_tick; # one server iteration 3817 cf::server_tick; # one server iteration
3088 3818
3089 0 && sync_job {#d# 3819 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3090 for(1..10) { 3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3091 my $t = Event::time; 3821 Coro::async_pool {
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3822 $Coro::current->{desc} = "runtime saver";
3093 or die; 3823 write_runtime_sync
3094 3824 or warn "ERROR: unable to write runtime file: $!";
3095 $map->width (50);
3096 $map->height (50);
3097 $map->alloc;
3098 $map->_load_objects ("/tmp/x.map", 1);
3099 my $t = Event::time - $t;
3100
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 }; 3825 };
3826 }
3111 3827
3112 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK;
3114
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool {
3118 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!";
3120 };
3121 }
3122
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3829 $sig->send;
3128 } 3830 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3831 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3832 $sig->send;
3131 } 3833 }
3132 3834
3133 $NOW = Event::time; 3835 $LOAD = ($NOW - $TICK_START) / $TICK;
3134
3135 # if we are delayed by four ticks or more, skip them all
3136 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3137
3138 $TICK_WATCHER->at ($NEXT_TICK);
3139 $TICK_WATCHER->start;
3140
3141 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3837
3144 _post_tick; 3838 if (0) {
3145 3839 if ($NEXT_TICK) {
3146 3840 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d#
3843 }
3147 }, 3844 }
3148); 3845}
3149 3846
3150{ 3847{
3151 BDB::max_poll_time $TICK * 0.1; 3848 # configure BDB
3152 $BDB_POLL_WATCHER = Event->io ( 3849
3153 reentrant => 0,
3154 fd => BDB::poll_fileno,
3155 poll => 'r',
3156 prio => 0,
3157 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb,
3159 );
3160 BDB::min_parallel 8; 3850 BDB::min_parallel 8;
3161 3851 BDB::max_poll_reqs $TICK * 0.1;
3162 BDB::set_sync_prepare { 3852 $AnyEvent::BDB::WATCHER->priority (1);
3163 my $status;
3164 my $current = $Coro::current;
3165 (
3166 sub {
3167 $status = $!;
3168 $current->ready; undef $current;
3169 },
3170 sub {
3171 Coro::schedule while defined $current;
3172 $! = $status;
3173 },
3174 )
3175 };
3176 3853
3177 unless ($DB_ENV) { 3854 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3855 $DB_ENV = BDB::db_env_create;
3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3858 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3859 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3860 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3861
3180 cf::sync_job { 3862 cf::sync_job {
3181 eval { 3863 eval {
3182 BDB::db_env_open 3864 BDB::db_env_open
3183 $DB_ENV, 3865 $DB_ENV,
… …
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3867 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3868 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3869 0666;
3188 3870
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3871 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3872 };
3194 3873
3195 cf::cleanup "db_env_open(db): $@" if $@; 3874 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3875 };
3197 } 3876 }
3877
3878 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3879 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3880 };
3881 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3882 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3883 };
3884 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3885 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3886 };
3198} 3887}
3199 3888
3200{ 3889{
3890 # configure IO::AIO
3891
3201 IO::AIO::min_parallel 8; 3892 IO::AIO::min_parallel 8;
3202
3203 undef $Coro::AIO::WATCHER;
3204 IO::AIO::max_poll_time $TICK * 0.1; 3893 IO::AIO::max_poll_time $TICK * 0.1;
3205 $AIO_POLL_WATCHER = Event->io ( 3894 undef $AnyEvent::AIO::WATCHER;
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 fd => IO::AIO::poll_fileno,
3209 poll => 'r',
3210 prio => 6,
3211 cb => \&IO::AIO::poll_cb,
3212 );
3213} 3895}
3214 3896
3215my $_log_backtrace; 3897my $_log_backtrace;
3216 3898
3217sub _log_backtrace { 3899sub _log_backtrace {
… …
3220 $msg =~ s/\n//; 3902 $msg =~ s/\n//;
3221 3903
3222 # limit the # of concurrent backtraces 3904 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3905 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3906 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg;
3225 async { 3908 async {
3909 $Coro::current->{desc} = "abt $msg";
3910
3226 my @bt = fork_call { 3911 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3912 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3913 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3914 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3915 or die "addr2line: $!";
… …
3238 } 3923 }
3239 3924
3240 @funcs 3925 @funcs
3241 }; 3926 };
3242 3927
3243 LOG llevInfo, "[ABT] $msg\n"; 3928 LOG llevInfo, "[ABT] $perl_bt\n";
3929 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3244 LOG llevInfo, "[ABT] $_\n" for @bt; 3930 LOG llevInfo, "[ABT] $_\n" for @bt;
3245 --$_log_backtrace; 3931 --$_log_backtrace;
3246 }; 3932 };
3247 } else { 3933 } else {
3248 LOG llevInfo, "[ABT] $msg\n"; 3934 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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