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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.460 by root, Mon Dec 15 17:04:53 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
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::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";
38Compress::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
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 76
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 78
49our %COMMAND = (); 79our %COMMAND = ();
50our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
51 81
52our @EXTS = (); # list of extension package names 82our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 83our %EXTCMD = ();
84our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
56 87
57our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 89our @EVENT;
59 90
60our $CONFDIR = confdir; 91our $CONFDIR = confdir;
61our $DATADIR = datadir; 92our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
71 106
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 109our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
79 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 115our $DB_ENV;
82 116
83our %CFG; 117our %CFG;
84 118
85our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 120our $RUNTIME;
121our $NOW;
87 122
88our %PLAYER; # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 124our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
91 126
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 129
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
97our $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)
98 138
99binmode STDOUT; 139binmode STDOUT;
100binmode STDERR; 140binmode STDERR;
101 141
102# read virtual server time, if available 142# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
107} 147}
108 148
109mkdir $_ 149mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
155 195
156The raw value load value from the last tick. 196The raw value load value from the last tick.
157 197
158=item %cf::CFG 198=item %cf::CFG
159 199
160Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 201from wherever your confdir points to.
162 202
163=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
164 204
165These 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
166returns 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
167per 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.
168 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
169=back 215=back
170 216
171=cut 217=cut
172 218
173BEGIN { 219BEGIN {
… …
177 $msg .= "\n" 223 $msg .= "\n"
178 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
179 225
180 $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;
181 227
182 utf8::encode $msg;
183 LOG llevError, $msg; 228 LOG llevError, $msg;
184 }; 229 };
185} 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#?
186 246
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 257for my $pkg (qw(
198 cf::global cf::attachable 258 cf::global cf::attachable
199 cf::object cf::object::player 259 cf::object cf::object::player
200 cf::client cf::player 260 cf::client cf::player
201 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
202 cf::map cf::party cf::region 263 cf::party cf::region
203)) { 264)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 266}
207 267
208$Event::DIED = sub { 268$EV::DIED = sub {
209 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
210}; 270};
211 271
212############################################################################# 272#############################################################################
213 273
… …
236 $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;
237 $d 297 $d
238 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
239} 299}
240 300
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
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
309=cut
310
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312
313sub encode_json($) { $json_coder->encode ($_[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}
329
251=item cf::lock_wait $string 330=item cf::lock_wait $string
252 331
253Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
254 333
255=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
256 335
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
260returned. 339returned.
261 340
341Locks are *not* recursive, locking from the same coro twice results in a
342deadlocked coro.
343
262Lock 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
263uses map_find and cf::map::load uses map_load). 345uses map_find and cf::map::load uses map_load).
264 346
265=item $locked = cf::lock_active $string 347=item $locked = cf::lock_active $string
266 348
267Return 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.
268 350
269=cut 351=cut
270 352
271our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
272 354
273sub lock_wait($) { 355sub lock_wait($) {
274 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
275
276 # wait for lock, if any
277 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule;
280 }
281} 357}
282 358
283sub lock_acquire($) { 359sub lock_acquire($) {
284 my ($key) = @_; 360 $LOCKS->guard ($_[0])
285
286 # wait, to be sure we are not locked
287 lock_wait $key;
288
289 $LOCK{$key} = [];
290
291 Coro::guard {
292 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} };
294 }
295} 361}
296 362
297sub lock_active($) { 363sub lock_active($) {
298 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
299
300 ! ! $LOCK{$key}
301} 365}
302 366
303sub freeze_mainloop { 367sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
305 369
306 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
307 $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 }
308 }; 431 }
309 $TICK_WATCHER->stop; 432};
310 $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;
311} 446}
312 447
313=item cf::async { BLOCK } 448=item cf::async { BLOCK }
314 449
315Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
… …
320 455
321BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
322 457
323=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
324 459
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
327partly 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
328acceptable. 463acceptable.
329 464
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
… …
336 471
337sub sync_job(&) { 472sub sync_job(&) {
338 my ($job) = @_; 473 my ($job) = @_;
339 474
340 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 476 my $time = EV::time;
342 477
343 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
345 480
346 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 482
348 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
349 484
350 my $busy = 1; 485 my $busy = 1;
351 my @res; 486 my @res;
352 487
353 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 490 @res = eval { $job->() };
355 warn $@ if $@; 491 warn $@ if $@;
356 undef $busy; 492 undef $busy;
357 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
358 494
359 while ($busy) { 495 while ($busy) {
360 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
361 } 500 }
501 }
362 502
363 $time = Event::time - $time; 503 my $time = EV::time - $time;
364 504
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
369 506
370 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
371 } else { 508 } else {
372 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
373 510
… …
398=item fork_call { }, $args 535=item fork_call { }, $args
399 536
400Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
404 541
405=cut 542=cut
406 543
407sub fork_call(&@) { 544sub fork_call(&@) {
408 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
409 546
410# 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,
411# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 550
415 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 552 reset_signals;
428 local $SIG{__WARN__}; 553 &$cb
429 local $SIG{__DIE__}; 554 }, @args;
430 eval {
431 close $fh1;
432 555
433 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
435 };
436 558
437 warn $@ if $@; 559=item $coin = coin_from_name $name
438 _exit 0; 560
439 } 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
440} 584}
441 585
442=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
443 587
444Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
446=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
447 591
448Stores 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
449data 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).
450 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
451=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}
452 618
453our $DB; 619our $DB;
454 620
455sub db_init { 621sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 622 cf::sync_job {
460 eval { 623 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 624 };
470} 625}
471 626
472sub db_get($$) { 627sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
474 629
… …
524 if (1) { 679 if (1) {
525 $md5 = 680 $md5 =
526 join "\x00", 681 join "\x00",
527 $processversion, 682 $processversion,
528 map { 683 map {
529 Coro::cede; 684 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 686 } 0.. $#$src;
532 687
533 688
534 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
… …
572 727
573############################################################################# 728#############################################################################
574 729
575=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
576 731
577Many 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
578attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
580 735
581In 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>
582C<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
583Crossfire TRT). 738Deliantra).
584 739
585=over 4 740=over 4
586 741
587=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
588 743
… …
632=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
633 788
634Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
636 791
637Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
638that 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.
639 794
640These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
641 796
642=over 4 797=over 4
… …
840 "; 995 ";
841 die if $@; 996 die if $@;
842} 997}
843 998
844our $override; 999our $override;
845our @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?
846 1001
847sub override { 1002sub override {
848 $override = 1; 1003 $override = 1;
849 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
850} 1005}
851 1006
852sub do_invoke { 1007sub do_invoke {
853 my $event = shift; 1008 my $event = shift;
854 my $callbacks = shift; 1009 my $callbacks = shift;
855 1010
856 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
857 1012
858 local $override; 1013 local $override;
859 1014
860 for (@$callbacks) { 1015 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
… …
870 } 1025 }
871 1026
872 0 1027 0
873} 1028}
874 1029
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1031
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1033
879Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
880 1035
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1039
885=back 1040=back
886 1041
887=cut 1042=cut
888 1043
889############################################################################# 1044#############################################################################
890# 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}
891 1088
892sub reattach { 1089sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1091 my ($obj) = @_;
895 1092
1093 # no longer needed after getting rid of delete_package?
896 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
897 1095
898 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
899 1097
900 @$registry = (); 1098 @$registry = ();
901 1099
… …
916cf::attachable->attach ( 1114cf::attachable->attach (
917 prio => -1000000, 1115 prio => -1000000,
918 on_instantiate => sub { 1116 on_instantiate => sub {
919 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
920 1118
921 $data = from_json $data; 1119 $data = decode_json $data;
922 1120
923 for (@$data) { 1121 for (@$data) {
924 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
925 1123
926 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
942sub object_freezer_save { 1140sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
944 1142
945 sync_job { 1143 sync_job {
946 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
949 1148
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1153 aio_close $fh;
955 1154
956 if (@$objs) { 1155 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1161 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
964 } 1163 }
965 } else { 1164 } else {
966 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
967 } 1166 }
968 1167
969 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1172 } else {
971 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
972 } 1174 }
973 } else { 1175 } else {
974 aio_unlink $filename; 1176 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
976 } 1178 }
977 } 1179 };
978} 1180}
979 1181
980sub object_freezer_as_string { 1182sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
982 1184
… …
994 or return; 1196 or return;
995 1197
996 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
998 or return; 1200 or return;
1201
999 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1000 } 1204 }
1001 1205
1206 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1004 return ($data, $av); 1210 ($data, $av)
1005} 1211}
1006 1212
1007=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1008 1214
1009=over 4 1215=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1235 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1236}
1031 1237
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1238=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1239
1034Register a callback fro execution when the client sends an extcmd packet. 1240Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is
1243the logged-in player. Ext commands can only be processed after a player
1244has logged in successfully.
1035 1245
1036If the callback returns something, it is sent back as if reply was being 1246If the callback returns something, it is sent back as if reply was being
1037called. 1247called.
1038 1248
1249=item cf::register_exticmd $name => \&callback($ns,$packet);
1250
1251Register a callback for execution when the client sends an (asynchronous)
1252exticmd packet. Exti commands are processed by the server as soon as they
1253are received, i.e. out of order w.r.t. other commands. The first argument
1254is a client socket. Exti commands can be received anytime, even before
1255log-in.
1256
1257If the callback returns something, it is sent back as if reply was being
1258called.
1259
1039=cut 1260=cut
1040 1261
1041sub register_extcmd { 1262sub register_extcmd {
1042 my ($name, $cb) = @_; 1263 my ($name, $cb) = @_;
1043 1264
1044 $EXTCMD{$name} = $cb; 1265 $EXTCMD{$name} = $cb;
1045} 1266}
1267
1268sub register_exticmd {
1269 my ($name, $cb) = @_;
1270
1271 $EXTICMD{$name} = $cb;
1272}
1273
1274use File::Glob ();
1046 1275
1047cf::player->attach ( 1276cf::player->attach (
1048 on_command => sub { 1277 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1050 1279
… …
1058 cf::override; 1287 cf::override;
1059 }, 1288 },
1060 on_extcmd => sub { 1289 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1290 my ($pl, $buf) = @_;
1062 1291
1063 my $msg = eval { from_json $buf }; 1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1293
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1302 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1303 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1071 } else { 1309 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1311 }
1074 1312
1075 cf::override; 1313 cf::override;
1076 }, 1314 },
1077); 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}
1078 1329
1079sub load_extensions { 1330sub load_extensions {
1080 cf::sync_job { 1331 cf::sync_job {
1081 my %todo; 1332 my %todo;
1082 1333
… …
1102 1353
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1356
1106 $ext{source} = 1357 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1109 . $source 1360 . $source
1110 . "\n};\n1"; 1361 . "\n};\n1";
1111 1362
1112 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1128 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1130 1381
1131 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1383 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1385 }
1136 1386
1137 warn $msg; 1387 warn $msg;
1138 } 1388 }
1139 1389
… …
1153 1403
1154=back 1404=back
1155 1405
1156=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1157 1407
1158Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1159 1409
1160=cut 1410=cut
1161 1411
1162package cf::player; 1412package cf::player;
1163 1413
1164use Coro::AIO; 1414use Coro::AIO;
1165 1415
1166=head3 cf::player 1416=head3 cf::player
1167 1417
1168=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}
1169 1433
1170=item cf::player::find $login 1434=item cf::player::find $login
1171 1435
1172Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1173 1437
… …
1192 1456
1193sub exists($) { 1457sub exists($) {
1194 my ($login) = @_; 1458 my ($login) = @_;
1195 1459
1196 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1198} 1462}
1199 1463
1200sub find($) { 1464sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1466 my $login = $_[0];
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1477
1214 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1217 } 1487 }
1218 } 1488 }
1219} 1489}
1220 1490
… …
1229 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1230 1500
1231 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1233 1503
1504 cf::get_slot 0.01;
1505
1234 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1235 Coro::cede; 1507 cf::cede_to_tick;
1236} 1508}
1237 1509
1238sub new($) { 1510sub new($) {
1239 my ($login) = @_; 1511 my ($login) = @_;
1240 1512
… …
1246 $cf::PLAYER{$login} = $self; 1518 $cf::PLAYER{$login} = $self;
1247 1519
1248 $self 1520 $self
1249} 1521}
1250 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
1251=item $pl->quit_character 1533=item $pl->quit_character
1252 1534
1253Nukes the player without looking back. If logged in, the connection will 1535Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1536be destroyed. May block for a long time.
1255 1537
… …
1259 my ($pl) = @_; 1541 my ($pl) = @_;
1260 1542
1261 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1262 1544
1263 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1264 $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
1265 1547
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1270 1554
1271 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1308 or return []; 1592 or return [];
1309 1593
1310 my @logins; 1594 my @logins;
1311 1595
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1316 1606
1317 utf8::decode $login; 1607 utf8::decode $login;
1318 push @logins, $login; 1608 push @logins, $login;
1319 } 1609 }
1320 1610
… …
1347 } 1637 }
1348 1638
1349 \@paths 1639 \@paths
1350} 1640}
1351 1641
1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1643
1644Expand deliantra pod fragments into protocol xml.
1645
1352=item $player->ext_reply ($msgid, %msg) 1646=item $player->ext_reply ($msgid, @msg)
1353 1647
1354Sends an ext reply to the player. 1648Sends an ext reply to the player.
1355 1649
1356=cut 1650=cut
1357 1651
1358sub ext_reply($$%) { 1652sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1653 my ($self, $id, @msg) = @_;
1360 1654
1361 $msg{msgid} = $id; 1655 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1656}
1365 1657
1366=item $player->ext_event ($type, %msg) 1658=item $player->ext_msg ($type, @msg)
1367 1659
1368Sends an ext event to the client. 1660Sends an ext event to the client.
1369 1661
1370=cut 1662=cut
1371 1663
1372sub ext_event($$%) { 1664sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1665 my ($self, $type, @msg) = @_;
1374 1666
1375 $self->ns->ext_event ($type, %msg); 1667 $self->ns->ext_msg ($type, @msg);
1376} 1668}
1377 1669
1378=head3 cf::region 1670=head3 cf::region
1379 1671
1380=over 4 1672=over 4
… …
1393 my ($path) = @_; 1685 my ($path) = @_;
1394 1686
1395 my ($match, $specificity); 1687 my ($match, $specificity);
1396 1688
1397 for my $region (list) { 1689 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1690 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1691 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1692 if $region->specificity > $specificity;
1401 } 1693 }
1402 } 1694 }
1403 1695
… …
1424our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1426 1718
1427sub generate_random_map { 1719sub generate_random_map {
1428 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
1429 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1725 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1523 $self->init; # pass $1 etc. 1818 $self->init; # pass $1 etc.
1524 return $self; 1819 return $self;
1525 } 1820 }
1526 } 1821 }
1527 1822
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1823 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1824 ()
1530} 1825}
1531 1826
1532sub init { 1827sub init {
1533 my ($self) = @_; 1828 my ($self) = @_;
… …
1555 1850
1556# the temporary/swap location 1851# the temporary/swap location
1557sub save_path { 1852sub save_path {
1558 my ($self) = @_; 1853 my ($self) = @_;
1559 1854
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1562} 1857}
1563 1858
1564# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1565sub uniq_path { 1860sub uniq_path {
1566 my ($self) = @_; 1861 my ($self) = @_;
1567 1862
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1570} 1865}
1571 1866
1572# and all this just because we cannot iterate over 1867# and all this just because we cannot iterate over
1573# all maps in C++... 1868# all maps in C++...
… …
1596 1891
1597sub load_header_from($) { 1892sub load_header_from($) {
1598 my ($self, $path) = @_; 1893 my ($self, $path) = @_;
1599 1894
1600 utf8::encode $path; 1895 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1896 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1904
1607 $self->{load_path} = $path; 1905 $self->{load_path} = $path;
1608 1906
1609 1 1907 1
1610} 1908}
… …
1664sub find { 1962sub find {
1665 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1666 1964
1667 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1668 1966
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1670 1969
1671 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path";
1673 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
1674 or return; 1972 or return;
1675 1973
1676 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1677 1975
… …
1679 or return; 1977 or return;
1680 1978
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1979 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1980 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1981 #$cf::WAIT_FOR_TICK->wait;
1982 undef $guard2;
1983 undef $guard1;
1684 $map->reset; 1984 $map->reset;
1685 undef $guard;
1686 return find $path; 1985 return find $path;
1687 } 1986 }
1688 1987
1689 $cf::MAP{$path} = $map 1988 $cf::MAP{$path} = $map
1690 } 1989 }
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 1998 local $self->{deny_reset} = 1; # loading can take a long time
1700 1999
1701 my $path = $self->{path}; 2000 my $path = $self->{path};
1702 2001
1703 { 2002 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2003 my $guard = cf::lock_acquire "map_data:$path";
1705 2004
2005 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2006 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2007
1708 $self->in_memory (cf::MAP_LOADING); 2008 $self->in_memory (cf::MAP_LOADING);
1709 2009
1710 $self->alloc; 2010 $self->alloc;
1711 2011
1712 $self->pre_load; 2012 $self->pre_load;
1713 Coro::cede; 2013 cf::cede_to_tick;
1714 2014
2015 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2017 $self->_load_objects ($f)
1716 or return; 2018 or return;
1717 2019
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2020 $self->post_load_original
1719 if delete $self->{load_original}; 2021 if delete $self->{load_original};
1720 2022
1721 if (my $uniq = $self->uniq_path) { 2023 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2024 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2025 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2027 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2028 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs;
2030 }
1726 } 2031 }
1727 } 2032 }
1728 2033
1729 Coro::cede; 2034 $f->resolve_delayed_derefs;
2035
2036 cf::cede_to_tick;
1730 # now do the right thing for maps 2037 # now do the right thing for maps
1731 $self->link_multipart_objects; 2038 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2039 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2040 unless $self->difficulty;
1734 Coro::cede; 2041 cf::cede_to_tick;
1735 2042
1736 unless ($self->{deny_activate}) { 2043 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2044 $self->decay_objects;
1738 $self->fix_auto_apply; 2045 $self->fix_auto_apply;
1739 $self->update_buttons; 2046 $self->update_buttons;
1740 Coro::cede; 2047 cf::cede_to_tick;
1741 $self->set_darkness_map; 2048 $self->set_darkness_map;
1742 Coro::cede; 2049 cf::cede_to_tick;
1743 $self->activate; 2050 $self->activate;
1744 } 2051 }
1745 2052
2053 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME);
2055
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2056 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2057 }
1748 2058
1749 $self->post_load; 2059 $self->post_load;
1750} 2060}
1751 2061
… …
1760 2070
1761 $self 2071 $self
1762} 2072}
1763 2073
1764# 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
1765sub load_diag { 2075sub load_neighbours {
1766 my ($map) = @_; 2076 my ($map) = @_;
1767 2077
1768 my @diag; # diagonal neighbours 2078 my @neigh; # diagonal neighbours
1769 2079
1770 for (0 .. 3) { 2080 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2081 my $neigh = $map->tile_path ($_)
1772 or next; 2082 or next;
1773 $neigh = find $neigh, $map 2083 $neigh = find $neigh, $map
1774 or next; 2084 or next;
1775 $neigh->load; 2085 $neigh->load;
1776 2086
2087 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2090 }
1780 2091
1781 for (@diag) { 2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2094 my $neigh = find $path, $origin
1783 or next; 2095 or next;
1784 $neigh->load; 2096 $neigh->load;
1785 } 2097 }
1786} 2098}
1787 2099
… …
1792} 2104}
1793 2105
1794sub do_load_sync { 2106sub do_load_sync {
1795 my ($map) = @_; 2107 my ($map) = @_;
1796 2108
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main;
2111
1797 cf::sync_job { $map->load }; 2112 cf::sync_job { $map->load };
1798} 2113}
1799 2114
1800our %MAP_PREFETCH; 2115our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2116our $MAP_PREFETCHER = undef;
1802 2117
1803sub find_async { 2118sub find_async {
1804 my ($path, $origin) = @_; 2119 my ($path, $origin, $load) = @_;
1805 2120
1806 $path = normalise $path, $origin && $origin->{path}; 2121 $path = normalise $path, $origin && $origin->{path};
1807 2122
1808 if (my $map = $cf::MAP{$path}) { 2123 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2125 }
1811 2126
1812 undef $MAP_PREFETCH{$path}; 2127 $MAP_PREFETCH{$path} |= $load;
2128
1813 $MAP_PREFETCHER ||= cf::async { 2129 $MAP_PREFETCHER ||= cf::async {
2130 $Coro::current->{desc} = "map prefetcher";
2131
1814 while (%MAP_PREFETCH) { 2132 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2133 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2134 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2135 $map->load if $v;
2136 }
1819 2137
1820 delete $MAP_PREFETCH{$path}; 2138 delete $MAP_PREFETCH{$k};
1821 } 2139 }
1822 } 2140 }
1823 undef $MAP_PREFETCHER; 2141 undef $MAP_PREFETCHER;
1824 }; 2142 };
1825 $MAP_PREFETCHER->prio (6); 2143 $MAP_PREFETCHER->prio (6);
… …
1828} 2146}
1829 2147
1830sub save { 2148sub save {
1831 my ($self) = @_; 2149 my ($self) = @_;
1832 2150
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2152
1835 $self->{last_save} = $cf::RUNTIME; 2153 $self->{last_save} = $cf::RUNTIME;
1836 2154
1837 return unless $self->dirty; 2155 return unless $self->dirty;
1838 2156
… …
1844 return if $self->{deny_save}; 2162 return if $self->{deny_save};
1845 2163
1846 local $self->{last_access} = $self->last_access;#d# 2164 local $self->{last_access} = $self->last_access;#d#
1847 2165
1848 cf::async { 2166 cf::async {
2167 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2168 $_->contr->save for $self->players;
1850 }; 2169 };
2170
2171 cf::get_slot 0.02;
1851 2172
1852 if ($uniq) { 2173 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2174 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2175 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2176 } else {
… …
1861 my ($self) = @_; 2182 my ($self) = @_;
1862 2183
1863 # save first because save cedes 2184 # save first because save cedes
1864 $self->save; 2185 $self->save;
1865 2186
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2188
1868 return if $self->players; 2189 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2190 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2191 return if $self->{deny_save};
1871 2192
2193 $self->in_memory (cf::MAP_SWAPPED);
2194
2195 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2197 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2198}
1875 2199
1876sub reset_at { 2200sub reset_at {
1877 my ($self) = @_; 2201 my ($self) = @_;
1878 2202
… …
1910 if $uniq; 2234 if $uniq;
1911 } 2235 }
1912 2236
1913 delete $cf::MAP{$self->path}; 2237 delete $cf::MAP{$self->path};
1914 2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2241 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2242
1919 $self->unlink_save; 2243 $self->unlink_save;
1920 $self->destroy; 2244 $self->destroy;
1921} 2245}
1922 2246
1923my $nuke_counter = "aaaa"; 2247my $nuke_counter = "aaaa";
1924 2248
1925sub nuke { 2249sub nuke {
1926 my ($self) = @_; 2250 my ($self) = @_;
1927 2251
2252 {
2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254
1928 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
1929 2256
1930 $self->unlink_save; 2257 $self->unlink_save;
1931 2258
1932 bless $self, "cf::map"; 2259 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2260 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2261 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2262 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2264
1938 $cf::MAP{$self->path} = $self; 2265 $cf::MAP{$self->path} = $self;
2266 }
1939 2267
1940 $self->reset; # polite request, might not happen 2268 $self->reset; # polite request, might not happen
1941} 2269}
1942 2270
1943=item $maps = cf::map::tmp_maps 2271=item $maps = cf::map::tmp_maps
… …
1985 2313
1986sub unique_maps() { 2314sub unique_maps() {
1987 [ 2315 [
1988 map { 2316 map {
1989 utf8::decode $_; 2317 utf8::decode $_;
1990 /\.map$/ 2318 s/\.map$//; # TODO future compatibility hack
2319 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2320 ? ()
1991 ? normalise $_ 2321 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2322 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2323 ]
1995} 2324}
1996 2325
1997package cf;
1998
1999=back 2326=back
2000 2327
2001=head3 cf::object 2328=head3 cf::object
2002 2329
2003=cut 2330=cut
… …
2006 2333
2007=over 4 2334=over 4
2008 2335
2009=item $ob->inv_recursive 2336=item $ob->inv_recursive
2010 2337
2011Returns 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.
2012 2340
2013=cut 2341=cut
2014 2342
2015sub inv_recursive_; 2343sub inv_recursive_;
2016sub inv_recursive_ { 2344sub inv_recursive_ {
… …
2019 2347
2020sub inv_recursive { 2348sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2349 inv_recursive_ inv $_[0]
2022} 2350}
2023 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
2024package cf; 2380package cf;
2025 2381
2026=back 2382=back
2027 2383
2028=head3 cf::object::player 2384=head3 cf::object::player
… …
2034Sends 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>
2035can 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
2036dialogue with the given NPC character. 2392dialogue with the given NPC character.
2037 2393
2038=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};
2039 2409
2040# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2411# with dialog boxes.
2042#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
2043sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
… …
2050 2420
2051 } else { 2421 } else {
2052 my $pl = $self->contr; 2422 my $pl = $self->contr;
2053 2423
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2424 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2426 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2427
2060 } else { 2428 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2431 }
2064 } 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 (@_);
2065} 2443}
2066 2444
2067=item $player_object->may ("access") 2445=item $player_object->may ("access")
2068 2446
2069Returns wether the given player is authorized to access resource "access" 2447Returns wether the given player is authorized to access resource "access"
… …
2082 2460
2083=item $player_object->enter_link 2461=item $player_object->enter_link
2084 2462
2085Freezes 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}>).
2086 2464
2087The 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.
2088I<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.
2089 2469
2090Will never block. 2470Will never block.
2091 2471
2092=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2093 2473
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2528 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2529 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2530 if $x <=0 && $y <= 0;
2151 2531
2152 $map->load; 2532 $map->load;
2153 $map->load_diag; 2533 $map->load_neighbours;
2154 2534
2155 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2156 $self->activate_recursive; 2537 $self->activate_recursive;
2157 2538
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2540 $self->enter_map ($map, $x, $y);
2160} 2541}
2161 2542
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2544
2164Moves 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
2165her, loading and preparing them map, calling the provided $check callback 2546her, loading and preparing them map, calling the provided $check callback
2166that 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
2167the 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 >>.
2168 2553
2169=cut 2554=cut
2170 2555
2171our $GOTOGEN; 2556our $GOTOGEN;
2172 2557
2173sub cf::object::player::goto { 2558sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2559 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2560
2176 # 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
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2563
2179 $self->enter_link; 2564 $self->enter_link;
2180 2565
2181 (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
2182 my $map = eval { 2588 my $map = eval {
2183 my $map = cf::map::find $path; 2589 my $map = defined $path ? cf::map::find $path : undef;
2184 2590
2185 if ($map) { 2591 if ($map) {
2186 $map = $map->customise_for ($self); 2592 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2593 $map = $check->($map) if $check && $map;
2188 } else { 2594 } else {
2189 $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);
2190 } 2596 }
2191 2597
2192 $map 2598 $map
2193 }; 2599 };
2194 2600
… …
2199 2605
2200 if ($gen == $self->{_goto_generation}) { 2606 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2607 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2608 $self->leave_link ($map, $x, $y);
2203 } 2609 }
2610
2611 $done->() if $done;
2204 })->prio (1); 2612 })->prio (1);
2205} 2613}
2206 2614
2207=item $player_object->enter_exit ($exit_object) 2615=item $player_object->enter_exit ($exit_object)
2208 2616
… …
2228} 2636}
2229 2637
2230sub prepare_random_map { 2638sub prepare_random_map {
2231 my ($exit) = @_; 2639 my ($exit) = @_;
2232 2640
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2641 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2642 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2643 # that depends on the exit object
2238 2644
2239 my $rmp = parse_random_map_params $exit->msg; 2645 my $rmp = parse_random_map_params $exit->msg;
… …
2241 if ($exit->map) { 2647 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2648 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2649 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2650 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2652
2653 $exit->map->touch;
2246 } 2654 }
2247 2655
2248 $rmp->{random_seed} ||= $exit->random_seed; 2656 $rmp->{random_seed} ||= $exit->random_seed;
2249 2657
2250 my $data = cf::to_json $rmp; 2658 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2659 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2660 my $meta = "$RANDOMDIR/$md5.meta";
2253 2661
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2662 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2663 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2664 undef $fh;
2257 aio_rename "$meta~", $meta; 2665 aio_rename "$meta~", $meta;
2258 2666
2667 my $slaying = "?random/$md5";
2668
2669 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2670 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2671 $exit->msg (undef);
2672 }
2261 } 2673 }
2262} 2674}
2263 2675
2264sub cf::object::player::enter_exit { 2676sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2677 my ($self, $exit) = @_;
2266 2678
2267 return unless $self->type == cf::PLAYER; 2679 return unless $self->type == cf::PLAYER;
2268 2680
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2681 $self->enter_link;
2281 2682
2282 (async { 2683 (async {
2283 $self->deactivate_recursive; # just to be sure 2684 $Coro::current->{desc} = "enter_exit";
2685
2284 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
2285 $self->goto ($slaying, $hp, $sp); 2701 $self->goto ($map, $x, $y);
2286 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
2287 1; 2707 1
2288 }) { 2708 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "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. "
2291 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2713
2294 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
… …
2313 2733
2314 utf8::encode $text; 2734 utf8::encode $text;
2315 $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);
2316} 2736}
2317 2737
2738=item $client->send_msg ($channel, $msg, $color, [extra...])
2739
2740Send a drawinfo or msg packet to the client, formatting the msg for the
2741client if neccessary. C<$type> should be a string identifying the type of
2742the message, with C<log> being the default. If C<$color> is negative, suppress
2743the message unless the client supports the msg packet.
2744
2745=cut
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
2811sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_;
2813
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;
2840
2841 if ($self->can_msg) {
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);
2862 } else {
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
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887}
2888
2318=item $client->ext_event ($type, %msg) 2889=item $client->ext_msg ($type, @msg)
2319 2890
2320Sends an exti event to the client. 2891Sends an ext event to the client.
2321 2892
2322=cut 2893=cut
2323 2894
2324sub cf::client::ext_event($$%) { 2895sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2896 my ($self, $type, @msg) = @_;
2326 2897
2898 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2901 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%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 }
2329} 2922}
2330 2923
2331=item $success = $client->query ($flags, "text", \&cb) 2924=item $success = $client->query ($flags, "text", \&cb)
2332 2925
2333Queues a query to the client, calling the given callback with 2926Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2927the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2928C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2929
2337Queries can fail, so check the return code. Or don't, as queries will become 2930Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2931become reliable at some point in the future.
2339 2932
2340=cut 2933=cut
2341 2934
2342sub cf::client::query { 2935sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2936 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2944 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2945 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2946
2354 $self->send_packet ($self->{query_queue}[0][0]) 2947 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2948 if @{ $self->{query_queue} } == 1;
2949
2950 1
2356} 2951}
2357 2952
2358cf::client->attach ( 2953cf::client->attach (
2954 on_connect => sub {
2955 my ($ns) = @_;
2956
2957 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2958 },
2359 on_reply => sub { 2959 on_reply => sub {
2360 my ($ns, $msg) = @_; 2960 my ($ns, $msg) = @_;
2361 2961
2362 # this weird shuffling is so that direct followup queries 2962 # this weird shuffling is so that direct followup queries
2363 # get handled first 2963 # get handled first
… …
2375 } else { 2975 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2976 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2977 }
2378 } 2978 }
2379 }, 2979 },
2980 on_exticmd => sub {
2981 my ($ns, $buf) = @_;
2982
2983 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2984
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
2993 if (my $cb = $EXTICMD{$type}) {
2994 @reply = $cb->($ns, @payload);
2995 }
2996
2997 $ns->ext_reply ($reply, @reply)
2998 if $reply;
2999
3000 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 }
3003
3004 cf::override;
3005 },
2380); 3006);
2381 3007
2382=item $client->async (\&cb) 3008=item $client->async (\&cb)
2383 3009
2384Create a new coroutine, running the specified callback. The coroutine will 3010Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 3051our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3052our $safe_hole = new Safe::Hole;
2427 3053
2428$SIG{FPE} = 'IGNORE'; 3054$SIG{FPE} = 'IGNORE';
2429 3055
2430$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));
2431 3061
2432# here we export the classes and methods available to script code 3062# here we export the classes and methods available to script code
2433 3063
2434=pod 3064=pod
2435 3065
2436The following functions and methods are available within a safe environment: 3066The following functions and methods are available within a safe environment:
2437 3067
2438 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
2439 cf::object::player player 3072 cf::object::player
2440 cf::player peaceful 3073 player
2441 cf::map trigger 3074
3075 cf::player
3076 peaceful
3077
3078 cf::map
3079 trigger
2442 3080
2443=cut 3081=cut
2444 3082
2445for ( 3083for (
2446 ["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)],
2447 ["cf::object::player" => qw(player)], 3087 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3088 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3089 ["cf::map" => qw(trigger)],
2450) { 3090) {
2451 no strict 'refs'; 3091 no strict 'refs';
… …
2527# the server's init and main functions 3167# the server's init and main functions
2528 3168
2529sub load_facedata($) { 3169sub load_facedata($) {
2530 my ($path) = @_; 3170 my ($path) = @_;
2531 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
2532 warn "loading facedata from $path\n"; 3178 warn "loading facedata from $path\n";
2533 3179
2534 my $facedata; 3180 my $facedata;
2535 0 < aio_load $path, $facedata 3181 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3182 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 3184 $facedata = Coro::Storable::thaw $facedata;
2539 3185
2540 $facedata->{version} == 2 3186 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3187 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 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
2543 { 3196 {
2544 my $faces = $facedata->{faceinfo}; 3197 my $faces = $facedata->{faceinfo};
2545 3198
2546 while (my ($face, $info) = each %$faces) { 3199 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3200 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3202 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3206
3207 cf::cede_to_tick;
2552 } 3208 }
2553 3209
2554 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3211 next unless $info->{smooth};
3212
2556 my $idx = cf::face::find $face 3213 my $idx = cf::face::find $face
2557 or next; 3214 or next;
3215
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3216 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3219 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3220 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3221 }
2563 Coro::cede; 3222
3223 cf::cede_to_tick;
2564 } 3224 }
2565 } 3225 }
2566 3226
2567 { 3227 {
2568 my $anims = $facedata->{animinfo}; 3228 my $anims = $facedata->{animinfo};
2569 3229
2570 while (my ($anim, $info) = each %$anims) { 3230 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3231 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3232 cf::cede_to_tick;
2573 } 3233 }
2574 3234
2575 cf::anim::invalidate_all; # d'oh 3235 cf::anim::invalidate_all; # d'oh
2576 } 3236 }
2577 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
2578 1 3273 1
2579} 3274}
2580 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
2581sub 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
2582 load_resource_file "$MAPDIR/regions" 3319 load_resource_file "$MAPDIR/regions"
2583 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 }
2584} 3326}
2585 3327
2586sub reload_facedata { 3328sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3329 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3330 or die "unable to load facedata\n";
… …
2599} 3341}
2600 3342
2601sub reload_resources { 3343sub reload_resources {
2602 warn "reloading resource files...\n"; 3344 warn "reloading resource files...\n";
2603 3345
3346 reload_facedata;
3347 reload_archetypes;
2604 reload_regions; 3348 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3349 reload_treasures;
2609 3350
2610 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
2611} 3352}
2612 3353
2613sub init { 3354sub reload_config {
2614 reload_resources;
2615}
2616
2617sub cfg_load {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3356 or return;
2620 3357
2621 local $/; 3358 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
2623 3360
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3362
2626 $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};
2627 $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};
… …
2633 }; 3370 };
2634 warn $@ if $@; 3371 warn $@ if $@;
2635 } 3372 }
2636} 3373}
2637 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
2638sub 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
2639 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
2641 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#
2642 (async { 3413 (async {
2643 Event::one_event; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3415 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
2645 }; 3417 };
2646 3418
2647 cfg_load; 3419 evthread_start IO::AIO::poll_fileno;
3420
3421 cf::sync_job {
3422 reload_resources;
3423 reload_config;
2648 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
2649 load_extensions; 3437 load_extensions;
2650 3438
2651 $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
2652 Event::loop; 3447 EV::loop;
2653} 3448}
2654 3449
2655############################################################################# 3450#############################################################################
2656# initialisation and cleanup 3451# initialisation and cleanup
2657 3452
2658# install some emergency cleanup handlers 3453# install some emergency cleanup handlers
2659BEGIN { 3454BEGIN {
3455 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3456 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3457 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3458 cf::cleanup "SIG$signal";
2668 },
2669 ); 3459 };
2670 } 3460 }
2671} 3461}
2672 3462
2673sub write_runtime { 3463sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime";
2675
2676 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
2678 3466
2679 IO::AIO::aio_utime $runtime, undef, undef; 3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3468
2681 my $guard = cf::lock_acquire "write_runtime"; 3469 my $guard = cf::lock_acquire "write_runtime";
2682 3470
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2684 or return; 3472 or return;
2685 3473
2686 my $value = $cf::RUNTIME + 90 + 10; 3474 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3475 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3476 # 60 allows for the watchdog to kill the server.
… …
2698 aio_utime $fh, undef, undef; 3486 aio_utime $fh, undef, undef;
2699 3487
2700 close $fh 3488 close $fh
2701 or return; 3489 or return;
2702 3490
2703 aio_rename "$runtime~", $runtime 3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3492 and return;
2705 3493
2706 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
2707 3495
2708 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 };
2709} 3547}
2710 3548
2711sub emergency_save() { 3549sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
2713 3551
2714 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
2715 3553
2716 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
2717 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
2718 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
2719 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
2721 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3566 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3568 $pl->save;
2725 } 3569 }
2726 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
2727 3571
2728 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
2729 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
2730 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
2731 $map->valid or next; 3575 $map->valid or next;
2732 $map->save; 3576 $map->save;
2733 } 3577 }
2734 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
2735 3579
2736 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
2738 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";
2739 }; 3587 };
2740 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
2741 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
2742} 3595}
2743 3596
2744sub post_cleanup { 3597sub post_cleanup {
2745 my ($make_core) = @_; 3598 my ($make_core) = @_;
2746 3599
2747 warn Carp::longmess "post_cleanup backtrace" 3600 warn Carp::longmess "post_cleanup backtrace"
2748 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#
2749} 3631}
2750 3632
2751sub do_reload_perl() { 3633sub do_reload_perl() {
2752 # can/must only be called in main 3634 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
2754 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
2755 return; 3637 return;
2756 } 3638 }
2757 3639
3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3643
3644 while ($RELOAD) {
2758 warn "reloading..."; 3645 warn "reloading...";
2759 3646
2760 warn "entering sync_job"; 3647 warn "entering sync_job";
2761 3648
2762 cf::sync_job { 3649 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3651 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3652 cf::write_runtime_sync; # external watchdog should not bark
2766 3653
2767 warn "syncing database to disk"; 3654 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3655 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3656
2770 # 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
2771 3658
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests"; 3659 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3660 while (IO::AIO::nreqs || BDB::nreqs) {
2783 warn "iterate..."; 3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = ();
2791
2792 warn "removing commands";
2793 %COMMAND = ();
2794
2795 warn "removing ext commands";
2796 %EXTCMD = ();
2797
2798 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg";
2801
2802 if (my $cb = $pkg->can ("unload")) {
2803 eval {
2804 $cb->($pkg);
2805 1
2806 } or warn "$pkg unloaded, but with errors: $@";
2807 } 3662 }
2808 3663
2809 warn "... nuking $pkg"; 3664 warn "cancelling all extension coros";
2810 Symbol::delete_package $pkg; 3665 $_->cancel for values %EXT_CORO;
2811 } 3666 %EXT_CORO = ();
2812 3667
2813 warn "unloading all perl modules loaded from $LIBDIR"; 3668 warn "removing commands";
2814 while (my ($k, $v) = each %INC) { 3669 %COMMAND = ();
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 3670
3671 warn "removing ext/exti commands";
3672 %EXTCMD = ();
3673 %EXTICMD = ();
3674
3675 warn "unloading/nuking all extensions";
3676 for my $pkg (@EXTS) {
2817 warn "... unloading $k"; 3677 warn "... unloading $pkg";
2818 delete $INC{$k};
2819 3678
2820 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g;
2822
2823 if (my $cb = $k->can ("unload_module")) { 3679 if (my $cb = $pkg->can ("unload")) {
3680 eval {
2824 $cb->(); 3681 $cb->($pkg);
3682 1
3683 } or warn "$pkg unloaded, but with errors: $@";
3684 }
3685
3686 warn "... clearing $pkg";
3687 clear_package $pkg;
2825 } 3688 }
2826 3689
2827 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;
2828 } 3705 }
2829 3706
2830 warn "getting rid of safe::, as good as possible"; 3707 warn "getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 3708 clear_package "safe::$_"
2832 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);
2833 3710
2834 warn "unloading cf.pm \"a bit\""; 3711 warn "unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 3712 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 3713 delete $INC{"cf/pod.pm"};
2837 3714
2838 # don't, removes xs symbols, too, 3715 # don't, removes xs symbols, too,
2839 # and global variables created in xs 3716 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 3717 #clear_package __PACKAGE__;
2841 3718
2842 warn "unload completed, starting to reload now"; 3719 warn "unload completed, starting to reload now";
2843 3720
2844 warn "reloading cf.pm"; 3721 warn "reloading cf.pm";
2845 require cf; 3722 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3724
2848 warn "loading config and database again"; 3725 warn "loading config and database again";
2849 cf::cfg_load; 3726 cf::reload_config;
2850 3727
2851 warn "loading extensions"; 3728 warn "loading extensions";
2852 cf::load_extensions; 3729 cf::load_extensions;
2853 3730
3731 if ($REATTACH_ON_RELOAD) {
2854 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
2857 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 3737 reattach $_ for values %PLAYER;
3738 }
2860 3739
3740 warn "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742
2861 warn "leaving sync_job"; 3743 warn "leaving sync_job";
2862 3744
2863 1 3745 1
2864 } or do { 3746 } or do {
2865 warn $@; 3747 warn $@;
2866 warn "error while reloading, exiting."; 3748 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3749 };
2869 3750
2870 warn "reloaded"; 3751 warn "reloaded";
3752 --$RELOAD;
3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
2871}; 3757};
2872 3758
2873our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
2874 3760
2875sub reload_perl() { 3761sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
2878 3764
2879 $RELOAD_WATCHER ||= Event->timer ( 3765 $RELOAD_WATCHER ||= cf::async {
2880 reentrant => 0, 3766 Coro::AIO::aio_wait cache_extensions;
2881 after => 0, 3767
2882 data => WF_AUTOCANCEL, 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2883 cb => sub {
2884 do_reload_perl; 3769 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
2886 }, 3771 };
2887 ); 3772 };
2888} 3773}
2889 3774
2890register_command "reload" => sub { 3775register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;
2892 3777
2893 if ($who->flag (FLAG_WIZ)) { 3778 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3779 $who->message ("reloading server.");
3780 async {
3781 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3782 reload_perl;
3783 };
2896 } 3784 }
2897}; 3785};
2898 3786
2899unshift @INC, $LIBDIR; 3787unshift @INC, $LIBDIR;
2900 3788
… …
2902 3790
2903our @WAIT_FOR_TICK; 3791our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3792our @WAIT_FOR_TICK_BEGIN;
2905 3793
2906sub wait_for_tick { 3794sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3796
2910 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3798 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3799 $signal->wait;
2913} 3800}
2914 3801
2915sub wait_for_tick_begin { 3802sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3803 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3804
2919 my $signal = new Coro::Signal; 3805 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3806 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3807 $signal->wait;
2922} 3808}
2923 3809
2924 my $min = 1e6;#d# 3810sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3811 if ($Coro::current != $Coro::main) {
2934 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"
2935 unless ++$bug_warning > 10; 3813 unless ++$bug_warning > 10;
2936 return; 3814 return;
2937 } 3815 }
2938 3816
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3817 cf::server_tick; # one server iteration
2942 3818
2943 0 && sync_job {#d# 3819 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3821 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3822 $Coro::current->{desc} = "runtime saver";
2947 or die; 3823 write_runtime_sync
2948 3824 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3825 };
3826 }
2965 3827
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3829 $sig->send;
2982 } 3830 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3831 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3832 $sig->send;
2985 } 3833 }
2986 3834
2987 $NOW = Event::time; 3835 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3837
2998 _post_tick; 3838 if (0) {
2999 3839 if ($NEXT_TICK) {
3000 3840 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d#
3843 }
3001 }, 3844 }
3002); 3845}
3003 3846
3004{ 3847{
3005 BDB::max_poll_time $TICK * 0.1; 3848 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3849
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3850 BDB::min_parallel 8;
3015 3851 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3852 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3853
3031 unless ($DB_ENV) { 3854 unless ($DB_ENV) {
3032 $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);
3033 3861
3034 cf::sync_job { 3862 cf::sync_job {
3035 eval { 3863 eval {
3036 BDB::db_env_open 3864 BDB::db_env_open
3037 $DB_ENV, 3865 $DB_ENV,
… …
3039 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
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3868 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3869 0666;
3042 3870
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3871 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3872 };
3048 3873
3049 cf::cleanup "db_env_open(db): $@" if $@; 3874 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3875 };
3051 } 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 };
3052} 3887}
3053 3888
3054{ 3889{
3890 # configure IO::AIO
3891
3055 IO::AIO::min_parallel 8; 3892 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3893 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3894 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3895}
3068 3896
3069my $_log_backtrace; 3897my $_log_backtrace;
3070 3898
3071sub _log_backtrace { 3899sub _log_backtrace {
… …
3074 $msg =~ s/\n//; 3902 $msg =~ s/\n//;
3075 3903
3076 # limit the # of concurrent backtraces 3904 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3905 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3906 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg;
3079 async { 3908 async {
3909 $Coro::current->{desc} = "abt $msg";
3910
3080 my @bt = fork_call { 3911 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3912 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3913 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 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 |"
3084 or die "addr2line: $!"; 3915 or die "addr2line: $!";
… …
3092 } 3923 }
3093 3924
3094 @funcs 3925 @funcs
3095 }; 3926 };
3096 3927
3097 LOG llevInfo, "[ABT] $msg\n"; 3928 LOG llevInfo, "[ABT] $perl_bt\n";
3929 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 3930 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 3931 --$_log_backtrace;
3100 }; 3932 };
3101 } else { 3933 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 3934 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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