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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
63 65
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 76
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 78
74our %COMMAND = (); 79our %COMMAND = ();
75our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 83our %EXTCMD = ();
79our %EXTICMD = (); 84our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
82 87
83our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 89our @EVENT;
85 90
86our $CONFDIR = confdir; 91our $CONFDIR = confdir;
87our $DATADIR = datadir; 92our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
100our %RESOURCE; 105our %RESOURCE;
101 106
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 109our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
106 111
107our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 115our $DB_ENV;
111 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
112our %CFG; 119our %CFG;
113 120
114our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 122our $RUNTIME;
116our $NOW; 123our $NOW;
… …
124 131
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 134our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
129 140
130binmode STDOUT; 141binmode STDOUT;
131binmode STDERR; 142binmode STDERR;
132 143
133# read virtual server time, if available 144# read virtual server time, if available
134unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
135 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
138} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
139 152
140mkdir $_ 153mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 155
143our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 316
304sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
306 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
307=item cf::lock_wait $string 334=item cf::lock_wait $string
308 335
309Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
310 337
311=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
312 339
313Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
316returned. 343returned.
317 344
318Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 346deadlocked coro.
… …
325 352
326Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
327 354
328=cut 355=cut
329 356
330our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 358
333sub lock_wait($) { 359sub lock_wait($) {
334 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 361}
347 362
348sub lock_acquire($) { 363sub lock_acquire($) {
349 my ($key) = @_; 364 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 365}
363 366
364sub lock_active($) { 367sub lock_active($) {
365 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 369}
369 370
370sub freeze_mainloop { 371sub freeze_mainloop {
371 tick_inhibit_inc; 372 tick_inhibit_inc;
372 373
373 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
374} 375}
375 376
376=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
377 378
378Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
730 731
731############################################################################# 732#############################################################################
732 733
733=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
734 735
735Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
738 739
739In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
790=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
791 792
792Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
794 795
795Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
797 798
798These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
799 800
800=over 4 801=over 4
… …
1150 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1151 1152
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1154 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
1156 aio_close $fh; 1160 aio_close $fh;
1157 1161
1158 if (@$objs) { 1162 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1164 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
1164 aio_close $fh; 1171 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1173 }
1167 } else { 1174 } else {
1168 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1169 } 1176 }
1170 1177
1171 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1182 } else {
1173 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1174 } 1184 }
1175 } else { 1185 } else {
1176 aio_unlink $filename; 1186 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1178 } 1188 }
… …
1269 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1270 1280
1271 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1272} 1282}
1273 1283
1284use File::Glob ();
1285
1274cf::player->attach ( 1286cf::player->attach (
1275 on_command => sub { 1287 on_command => sub {
1276 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1277 1289
1278 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
… …
1309 } 1321 }
1310 1322
1311 cf::override; 1323 cf::override;
1312 }, 1324 },
1313); 1325);
1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1314 1339
1315sub load_extensions { 1340sub load_extensions {
1316 cf::sync_job { 1341 cf::sync_job {
1317 my %todo; 1342 my %todo;
1318 1343
… …
1388 1413
1389=back 1414=back
1390 1415
1391=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1392 1417
1393Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1394 1419
1395=cut 1420=cut
1396 1421
1397package cf::player; 1422package cf::player;
1398 1423
… …
1441 1466
1442sub exists($) { 1467sub exists($) {
1443 my ($login) = @_; 1468 my ($login) = @_;
1444 1469
1445 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1447} 1472}
1448 1473
1449sub find($) { 1474sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1476 my $login = $_[0];
… …
1622 } 1647 }
1623 1648
1624 \@paths 1649 \@paths
1625} 1650}
1626 1651
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1653
1629Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1630 1655
1631=item $player->ext_reply ($msgid, @msg) 1656=item $player->ext_reply ($msgid, @msg)
1632 1657
1633Sends an ext reply to the player. 1658Sends an ext reply to the player.
1634 1659
… …
1847 1872
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1850} 1875}
1851 1876
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1877sub decay_objects {
1862 my ($self) = @_; 1878 my ($self) = @_;
1863 1879
1864 return if $self->{deny_reset}; 1880 return if $self->{deny_reset};
1865 1881
… …
1947sub find { 1963sub find {
1948 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1949 1965
1950 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1951 1967
1952 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1954 1970
1955 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1960 or return; 1973 or return;
1961 1974
1962 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1963 1976
… …
2030 2043
2031 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2045 $self->decay_objects;
2033 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2034 $self->update_buttons; 2047 $self->update_buttons;
2035 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick; 2048 cf::cede_to_tick;
2038 $self->activate; 2049 $self->activate;
2039 } 2050 }
2040 2051
2041 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
… …
2383 2394
2384our $SAY_CHANNEL = { 2395our $SAY_CHANNEL = {
2385 id => "say", 2396 id => "say",
2386 title => "Map", 2397 title => "Map",
2387 reply => "say ", 2398 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2400};
2390 2401
2391our $CHAT_CHANNEL = { 2402our $CHAT_CHANNEL = {
2392 id => "chat", 2403 id => "chat",
2393 title => "Chat", 2404 title => "Chat",
… …
2448 2459
2449=item $player_object->enter_link 2460=item $player_object->enter_link
2450 2461
2451Freezes the player and moves him/her to a special map (C<{link}>). 2462Freezes the player and moves him/her to a special map (C<{link}>).
2452 2463
2453The player should be reasonably safe there for short amounts of time. You 2464The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2465for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link
2467map.
2455 2468
2456Will never block. 2469Will never block.
2457 2470
2458=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2459 2472
… …
2517 2530
2518 $map->load; 2531 $map->load;
2519 $map->load_neighbours; 2532 $map->load_neighbours;
2520 2533
2521 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2522 $self->activate_recursive; 2536 $self->activate_recursive;
2523 2537
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2526} 2540}
… …
2689 $self->contr->savebed ($map, $x, $y) 2703 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2704 if $exit->flag (cf::FLAG_DAMNED);
2691 2705
2692 1 2706 1
2693 }) { 2707 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2709 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2712
2699 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
… …
2765 id => "infobox", 2779 id => "infobox",
2766 title => "Body Parts", 2780 title => "Body Parts",
2767 reply => undef, 2781 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2769 }, 2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2770 "c/uptime" => { 2820 "c/uptime" => {
2771 id => "infobox", 2821 id => "infobox",
2772 title => "Uptime", 2822 title => "Uptime",
2773 reply => undef, 2823 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
… …
2783 id => "party", 2833 id => "party",
2784 title => "Party", 2834 title => "Party",
2785 reply => "gsay ", 2835 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 2836 tooltip => "Messages and chat related to your party",
2787 }, 2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2788); 2846);
2789 2847
2790sub cf::client::send_msg { 2848sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2792 2850
2793 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2794 2853
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 2855
2797 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2800 2859
2801 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2805 2862
2806 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 2868 }
2813 2869
2814 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2815 } 2871 }
2816 2872
2817 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2818 2874
2819 if ($self->can_msg) {
2820 # default colour, mask it out 2875 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2823 2878
2824 my $pkt = "msg " 2879 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 2880 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 2882 );
2828 2883
2829 # try lzf for large packets 2884 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt 2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf}; 2886 if 1024 <= length $pkt and $self->{can_lzf};
2832 2887
2833 # split very large packets 2888 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) { 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag"; 2891 $pkt = "frag";
2837 } 2892 }
2838 2893
2839 $self->send_packet ($pkt); 2894 $self->send_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 2895}
2866 2896
2867=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2868 2898
2869Sends an ext event to the client. 2899Sends an ext event to the client.
… …
3044The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3045 3075
3046 cf::object 3076 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3078 insert remove name archname title slaying race decrease split
3079 value
3049 3080
3050 cf::object::player 3081 cf::object::player
3051 player 3082 player
3052 3083
3053 cf::player 3084 cf::player
… …
3059=cut 3090=cut
3060 3091
3061for ( 3092for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3068) { 3099) {
3069 no strict 'refs'; 3100 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3088 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3089 3120
3090 my $qcode = $code; 3121 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3093 3126
3094 local $_; 3127 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3096 3129
3097 my $eval = 3130 my $eval =
… …
3327 reload_treasures; 3360 reload_treasures;
3328 3361
3329 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3330} 3363}
3331 3364
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3365sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3367 or return;
3343 3368
3344 local $/; 3369 local $/;
… …
3376 seek $fh, 0, 0; 3401 seek $fh, 0, 0;
3377 print $fh $$; 3402 print $fh $$;
3378} 3403}
3379 3404
3380sub main { 3405sub main {
3381 atomic; 3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3419
3383 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3423 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3425 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
3390 }; 3427 };
3391 3428
3392 { 3429 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3430
3431 cf::sync_job {
3432 reload_resources;
3394 reload_config; 3433 reload_config;
3395 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
3396 load_extensions; 3447 load_extensions;
3397 3448
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3449 utime time, time, $RUNTIMEFILE;
3402 3450
3403 # no (long-running) fork's whatsoever before this point(!) 3451 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3405 3456
3406 EV::loop; 3457 EV::loop;
3407} 3458}
3408 3459
3409############################################################################# 3460#############################################################################
… …
3467 my $uuid = "$LOCALDIR/uuid"; 3518 my $uuid = "$LOCALDIR/uuid";
3468 3519
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3521 or return;
3471 3522
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3531 $uuid_skip = 0;
3474 3532
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3534 and return;
3477 3535
… …
3499} 3557}
3500 3558
3501sub emergency_save() { 3559sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3503 3561
3504 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3505 3563
3506 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
3507 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3576 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3578 $pl->save;
3516 } 3579 }
3517 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3518 3581
3519 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3585 $map->valid or next;
3523 $map->save; 3586 $map->save;
3524 } 3587 }
3525 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3526 3589
3527 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3530 3593
3531 warn "begin write uuid\n"; 3594 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3595 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3596 warn "emergency_perl_save: end write uuid\n";
3534 }; 3597 };
3535 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3536 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3537} 3605}
3538 3606
3539sub post_cleanup { 3607sub post_cleanup {
3540 my ($make_core) = @_; 3608 my ($make_core) = @_;
3541 3609
… …
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3636 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3637 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3639 }
3572 warn "cleared package #$pkg\n";#d# 3640 warn "cleared package $pkg\n";#d#
3573} 3641}
3574
3575our $RELOAD; # how many times to reload
3576 3642
3577sub do_reload_perl() { 3643sub do_reload_perl() {
3578 # can/must only be called in main 3644 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3580 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3581 return; 3647 return;
3582 } 3648 }
3583 3649
3584 return if $RELOAD++; 3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3585 3653
3586 while ($RELOAD) { 3654 while ($RELOAD) {
3587 warn "reloading..."; 3655 warn "reloading...";
3588 3656
3589 warn "entering sync_job"; 3657 warn "entering sync_job";
… …
3650 clear_package "safe::$_" 3718 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3720
3653 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3724
3657 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3726 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3660 3728
… …
3668 cf::reload_config; 3736 cf::reload_config;
3669 3737
3670 warn "loading extensions"; 3738 warn "loading extensions";
3671 cf::load_extensions; 3739 cf::load_extensions;
3672 3740
3741 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3679 3752
3680 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3681 3754
3682 1 3755 1
3683 } or do { 3756 } or do {
… …
3686 }; 3759 };
3687 3760
3688 warn "reloaded"; 3761 warn "reloaded";
3689 --$RELOAD; 3762 --$RELOAD;
3690 } 3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3691}; 3767};
3692 3768
3693our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3694 3770
3695sub reload_perl() { 3771sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3698 3774
3775 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions;
3777
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3779 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3781 };
3702 }; 3782 };
3703} 3783}
3704 3784
3705register_command "reload" => sub { 3785register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
… …
3832 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3833 3913
3834 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3837 async { 3918 async {
3838 $Coro::current->{desc} = "abt $msg"; 3919 $Coro::current->{desc} = "abt $msg";
3839 3920
3840 my @bt = fork_call { 3921 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
… …
3852 } 3933 }
3853 3934
3854 @funcs 3935 @funcs
3855 }; 3936 };
3856 3937
3857 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 3941 --$_log_backtrace;
3860 }; 3942 };
3861 } else { 3943 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 3946 }
3865} 3947}
3866 3948
3867# load additional modules 3949# load additional modules
3868use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3869 3951
3870END { cf::emergency_save } 3952END { cf::emergency_save }
3871 3953
38721 39541
3873 3955

Diff Legend

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