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.117 by root, Mon Jan 1 17:50:26 2007 UTC vs.
Revision 1.141 by root, Fri Jan 5 20:08:53 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
234=item cf::async { BLOCK }
235
236Currently the same as Coro::async_pool, meaning you cannot use
237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
239
240=cut
241
242BEGIN { *async = \&Coro::async_pool }
243
186=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
187 245
188The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 248reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
205 263
206 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 265 # (but this is cancel-safe)
208 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
209 267
210 my $busy = 1; 268 my $busy = 1;
211 my @res; 269 my @res;
212 270
213 (Coro::async { 271 (async {
214 @res = eval { $job->() }; 272 @res = eval { $job->() };
215 warn $@ if $@; 273 warn $@ if $@;
216 undef $busy; 274 undef $busy;
217 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
218 276
219 while ($busy) { 277 while ($busy) {
220 Coro::cede_notself; 278 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 279 }
223 280
224 wantarray ? @res : $res[0] 281 wantarray ? @res : $res[0]
225 } else { 282 } else {
226 # we are in another coroutine, how wonderful, everything just works 283 # we are in another coroutine, how wonderful, everything just works
227 284
228 $job->() 285 $job->()
229 } 286 }
230} 287}
231 288
232=item $coro = cf::coro { BLOCK } 289=item $coro = cf::async_ext { BLOCK }
233 290
234Creates and returns a new coro. This coro is automcatially being canceled 291Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 292extension calling this is being unloaded.
236 293
237=cut 294=cut
238 295
239sub coro(&) { 296sub async_ext(&) {
240 my $cb = shift; 297 my $cb = shift;
241 298
242 my $coro; $coro = async { 299 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 300
249 $coro->on_destroy (sub { 301 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 302 delete $EXT_CORO{$coro+0};
251 }); 303 });
252 $EXT_CORO{$coro+0} = $coro; 304 $EXT_CORO{$coro+0} = $coro;
… …
817 (aio_load "$filename.pst", $av) >= 0 869 (aio_load "$filename.pst", $av) >= 0
818 or return; 870 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 871 $av = eval { (Storable::thaw $av)->{objs} };
820 } 872 }
821 873
874 warn sprintf "loading %s (%d)\n",
875 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 876 return ($data, $av);
823} 877}
824 878
825############################################################################# 879#############################################################################
826# command handling &c 880# command handling &c
… …
1060package cf::map; 1114package cf::map;
1061 1115
1062use Fcntl; 1116use Fcntl;
1063use Coro::AIO; 1117use Coro::AIO;
1064 1118
1065our $MAX_RESET = 7200; 1119our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1120our $DEFAULT_RESET = 3000;
1067 1121
1068sub generate_random_map { 1122sub generate_random_map {
1069 my ($path, $rmp) = @_; 1123 my ($path, $rmp) = @_;
1070 1124
1071 # mit "rum" bekleckern, nicht 1125 # mit "rum" bekleckern, nicht
… …
1087# and all this just because we cannot iterate over 1141# and all this just because we cannot iterate over
1088# all maps in C++... 1142# all maps in C++...
1089sub change_all_map_light { 1143sub change_all_map_light {
1090 my ($change) = @_; 1144 my ($change) = @_;
1091 1145
1092 $_->change_map_light ($change) for values %cf::MAP; 1146 $_->change_map_light ($change)
1147 for grep $_->outdoor, values %cf::MAP;
1093} 1148}
1094 1149
1095sub try_load_header($) { 1150sub try_load_header($) {
1096 my ($path) = @_; 1151 my ($path) = @_;
1097 1152
… …
1100 or return; 1155 or return;
1101 1156
1102 my $map = cf::map::new 1157 my $map = cf::map::new
1103 or return; 1158 or return;
1104 1159
1160 # for better error messages only, will be overwritten
1161 $map->path ($path);
1162
1105 $map->load_header ($path) 1163 $map->load_header ($path)
1106 or return; 1164 or return;
1107 1165
1108 $map->{load_path} = $path; 1166 $map->{load_path} = $path;
1109 1167
1110 $map 1168 $map
1111} 1169}
1112 1170
1171sub find;
1113sub find_map { 1172sub find {
1114 my ($path, $origin) = @_; 1173 my ($path, $origin) = @_;
1115 1174
1116 #warn "find_map<$path,$origin>\n";#d# 1175 #warn "find<$path,$origin>\n";#d#
1117 1176
1118 $path = new cf::path $path, $origin && $origin->path; 1177 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1178 my $key = $path->as_string;
1120 1179
1180 cf::lock_wait "map_find:$key";
1181
1121 $cf::MAP{$key} || do { 1182 $cf::MAP{$key} || do {
1183 my $guard = cf::lock_acquire "map_find:$key";
1184
1122 # do it the slow way 1185 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1186 my $map = try_load_header $path->save_path;
1124 1187
1188 Coro::cede;
1189
1125 if ($map) { 1190 if ($map) {
1191 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d#
1126 # safety 1193 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1194 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1195 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1196 } else {
1130 if (my $rmp = $path->random_map_params) { 1197 if (my $rmp = $path->random_map_params) {
… …
1135 1202
1136 $map or return; 1203 $map or return;
1137 1204
1138 $map->{load_original} = 1; 1205 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1206 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1208 $map->instantiate;
1141 1209
1142 # per-player maps become, after loading, normal maps 1210 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1211 $map->per_player (0) if $path->{user_rel};
1144 } 1212 }
1145 1213
1146 $map->path ($key); 1214 $map->path ($key);
1147 $map->{path} = $path; 1215 $map->{path} = $path;
1148 $map->{last_save} = $cf::RUNTIME; 1216 $map->{last_save} = $cf::RUNTIME;
1149 $map->last_access ($cf::RUNTIME); 1217
1218 Coro::cede;
1150 1219
1151 if ($map->should_reset) { 1220 if ($map->should_reset) {
1152 $map->reset; 1221 $map->reset;
1222 undef $guard;
1153 $map = find_map $path; 1223 $map = find $path
1224 or return;
1154 } 1225 }
1155 1226
1156 $cf::MAP{$key} = $map 1227 $cf::MAP{$key} = $map
1157 } 1228 }
1158} 1229}
1159 1230
1160sub load { 1231sub load {
1161 my ($self) = @_; 1232 my ($self) = @_;
1162 1233
1234 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1236
1163 return if $self->in_memory != cf::MAP_SWAPPED; 1237 return if $self->in_memory != cf::MAP_SWAPPED;
1164 1238
1165 $self->in_memory (cf::MAP_LOADING); 1239 $self->in_memory (cf::MAP_LOADING);
1166
1167 my $path = $self->{path};
1168 1240
1169 $self->alloc; 1241 $self->alloc;
1170 $self->load_objects ($self->{load_path}, 1) 1242 $self->load_objects ($self->{load_path}, 1)
1171 or return; 1243 or return;
1172 1244
… …
1178 if (aio_open $uniq, O_RDONLY, 0) { 1250 if (aio_open $uniq, O_RDONLY, 0) {
1179 $self->clear_unique_items; 1251 $self->clear_unique_items;
1180 $self->load_objects ($uniq, 0); 1252 $self->load_objects ($uniq, 0);
1181 } 1253 }
1182 } 1254 }
1255
1256 Coro::cede;
1183 1257
1184 # now do the right thing for maps 1258 # now do the right thing for maps
1185 $self->link_multipart_objects; 1259 $self->link_multipart_objects;
1186 1260
1187 if ($self->{path}->is_style_map) { 1261 if ($self->{path}->is_style_map) {
… …
1195 $self->difficulty ($self->estimate_difficulty) 1269 $self->difficulty ($self->estimate_difficulty)
1196 unless $self->difficulty; 1270 unless $self->difficulty;
1197 $self->activate; 1271 $self->activate;
1198 } 1272 }
1199 1273
1274 Coro::cede;
1275
1200 $self->in_memory (cf::MAP_IN_MEMORY); 1276 $self->in_memory (cf::MAP_IN_MEMORY);
1201} 1277}
1202 1278
1203sub load_map_sync { 1279sub find_sync {
1204 my ($path, $origin) = @_; 1280 my ($path, $origin) = @_;
1205 1281
1206 #warn "load_map_sync<$path, $origin>\n";#d# 1282 cf::sync_job { cf::map::find $path, $origin }
1283}
1207 1284
1208 cf::sync_job { 1285sub do_load_sync {
1209 my $map = cf::map::find_map $path, $origin 1286 my ($map) = @_;
1210 or return; 1287
1211 $map->load; 1288 cf::sync_job { $map->load };
1212 $map
1213 }
1214} 1289}
1215 1290
1216sub save { 1291sub save {
1217 my ($self) = @_; 1292 my ($self) = @_;
1218 1293
1294 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295
1219 $self->{last_save} = $cf::RUNTIME; 1296 $self->{last_save} = $cf::RUNTIME;
1220 1297
1221 return unless $self->dirty; 1298 return unless $self->dirty;
1222 1299
1223 my $save = $self->{path}->save_path; utf8::encode $save; 1300 my $save = $self->{path}->save_path; utf8::encode $save;
1224 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1225 1302
1226 $self->{load_path} = $save; 1303 $self->{load_path} = $save;
1227 1304
1228 return if $self->{deny_save}; 1305 return if $self->{deny_save};
1306
1307 local $self->{last_access} = $self->last_access;#d#
1229 1308
1230 if ($uniq) { 1309 if ($uniq) {
1231 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1232 $self->save_objects ($uniq, cf::IO_UNIQUES); 1311 $self->save_objects ($uniq, cf::IO_UNIQUES);
1233 } else { 1312 } else {
… …
1236} 1315}
1237 1316
1238sub swap_out { 1317sub swap_out {
1239 my ($self) = @_; 1318 my ($self) = @_;
1240 1319
1320 # save first because save cedes
1321 $self->save;
1322
1323 my $lock = cf::lock_acquire "map_data:" . $self->path;
1324
1241 return if $self->players; 1325 return if $self->players;
1242 return if $self->in_memory != cf::MAP_IN_MEMORY; 1326 return if $self->in_memory != cf::MAP_IN_MEMORY;
1243 return if $self->{deny_save}; 1327 return if $self->{deny_save};
1244 1328
1245 $self->save;
1246 $self->clear; 1329 $self->clear;
1247 $self->in_memory (cf::MAP_SWAPPED); 1330 $self->in_memory (cf::MAP_SWAPPED);
1248} 1331}
1249 1332
1250sub reset_at { 1333sub reset_at {
… …
1288} 1371}
1289 1372
1290sub reset { 1373sub reset {
1291 my ($self) = @_; 1374 my ($self) = @_;
1292 1375
1376 my $lock = cf::lock_acquire "map_data:" . $self->path;
1377
1293 return if $self->players; 1378 return if $self->players;
1294 return if $self->{path}{user_rel};#d# 1379 return if $self->{path}{user_rel};#d#
1295 1380
1296 warn "resetting map ", $self->path;#d# 1381 warn "resetting map ", $self->path;#d#
1297 1382
… …
1316 1401
1317sub customise_for { 1402sub customise_for {
1318 my ($map, $ob) = @_; 1403 my ($map, $ob) = @_;
1319 1404
1320 if ($map->per_player) { 1405 if ($map->per_player) {
1321 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1322 } 1407 }
1323 1408
1324 $map 1409 $map
1325} 1410}
1326 1411
1327sub emergency_save { 1412sub emergency_save {
1328 local $cf::FREEZE = 1; 1413 my $freeze_guard = cf::freeze_mainloop;
1329 1414
1330 warn "enter emergency map save\n"; 1415 warn "enter emergency map save\n";
1331 1416
1332 cf::sync_job { 1417 cf::sync_job {
1333 warn "begin emergency map save\n"; 1418 warn "begin emergency map save\n";
… …
1405=cut 1490=cut
1406 1491
1407sub cf::object::player::enter_link { 1492sub cf::object::player::enter_link {
1408 my ($self) = @_; 1493 my ($self) = @_;
1409 1494
1495 $self->deactivate_recursive;
1496
1410 return if $self->map == $LINK_MAP; 1497 return if $self->map == $LINK_MAP;
1411 1498
1412 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1413 if $self->map; 1500 if $self->map;
1414 1501
1415 $self->enter_map ($LINK_MAP, 20, 20); 1502 $self->enter_map ($LINK_MAP, 20, 20);
1416 $self->deactivate_recursive;
1417} 1503}
1418 1504
1419sub cf::object::player::leave_link { 1505sub cf::object::player::leave_link {
1420 my ($self, $map, $x, $y) = @_; 1506 my ($self, $map, $x, $y) = @_;
1421 1507
1422 my $link_pos = delete $self->{_link_pos}; 1508 my $link_pos = delete $self->{_link_pos};
1423 1509
1424 unless ($map) { 1510 unless ($map) {
1425 # restore original map position 1511 # restore original map position
1426 ($map, $x, $y) = @{ $link_pos || [] }; 1512 ($map, $x, $y) = @{ $link_pos || [] };
1427 $map = cf::map::find_map $map; 1513 $map = cf::map::find $map;
1428 1514
1429 unless ($map) { 1515 unless ($map) {
1430 ($map, $x, $y) = @$EMERGENCY_POSITION; 1516 ($map, $x, $y) = @$EMERGENCY_POSITION;
1431 $map = cf::map::find_map $map 1517 $map = cf::map::find $map
1432 or die "FATAL: cannot load emergency map\n"; 1518 or die "FATAL: cannot load emergency map\n";
1433 } 1519 }
1434 } 1520 }
1435 1521
1436 ($x, $y) = (-1, -1) 1522 ($x, $y) = (-1, -1)
… …
1444 1530
1445 $self->activate_recursive; 1531 $self->activate_recursive;
1446 $self->enter_map ($map, $x, $y); 1532 $self->enter_map ($map, $x, $y);
1447} 1533}
1448 1534
1535cf::player->attach (
1536 on_logout => sub {
1537 my ($pl) = @_;
1538
1539 # abort map switching before logout
1540 if ($pl->ob->{_link_pos}) {
1541 cf::sync_job {
1542 $pl->ob->leave_link
1543 };
1544 }
1545 },
1546 on_login => sub {
1547 my ($pl) = @_;
1548
1549 # try to abort aborted map switching on player login :)
1550 # should happen only on crashes
1551 if ($pl->ob->{_link_pos}) {
1552
1553 $pl->ob->enter_link;
1554 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn
1557 $pl->ob->reply (undef,
1558 "There was an internal problem at your last logout, "
1559 . "the server will try to bring you to your intended destination in a second.",
1560 cf::NDI_RED);
1561 Coro::Timer::sleep 1;
1562 $pl->ob->leave_link;
1563 })->prio (2);
1564 }
1565 },
1566);
1567
1449=item $player_object->goto_map ($map, $x, $y) 1568=item $player_object->goto ($path, $x, $y)
1450 1569
1451=cut 1570=cut
1452 1571
1453sub cf::object::player::goto_map { 1572sub cf::object::player::goto {
1454 my ($self, $path, $x, $y) = @_; 1573 my ($self, $path, $x, $y) = @_;
1455 1574
1456 $self->enter_link; 1575 $self->enter_link;
1457 1576
1458 (Coro::async { 1577 (async {
1459 $path = new cf::path $path; 1578 $path = new cf::path $path;
1460 1579
1461 my $map = cf::map::find_map $path->as_string; 1580 my $map = cf::map::find $path->as_string;
1462 $map = $map->customise_for ($self) if $map; 1581 $map = $map->customise_for ($self) if $map;
1463 1582
1464 warn "entering ", $map->path, " at ($x, $y)\n" 1583# warn "entering ", $map->path, " at ($x, $y)\n"
1465 if $map; 1584# if $map;
1466 1585
1467 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1586 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1468 1587
1469 $self->leave_link ($map, $x, $y); 1588 $self->leave_link ($map, $x, $y);
1470 })->prio (1); 1589 })->prio (1);
… …
1525 1644
1526 return unless $self->type == cf::PLAYER; 1645 return unless $self->type == cf::PLAYER;
1527 1646
1528 $self->enter_link; 1647 $self->enter_link;
1529 1648
1530 (Coro::async { 1649 (async {
1650 $self->deactivate_recursive; # just to be sure
1531 unless (eval { 1651 unless (eval {
1532
1533 prepare_random_map $exit 1652 prepare_random_map $exit
1534 if $exit->slaying eq "/!"; 1653 if $exit->slaying eq "/!";
1535 1654
1536 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1537 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1538 1657
1539 1; 1658 1;
1540 }) { 1659 }) {
1541 $self->message ("Something went wrong deep within the crossfire server. " 1660 $self->message ("Something went wrong deep within the crossfire server. "
1542 . "I'll try to bring you back to the map you were before. " 1661 . "I'll try to bring you back to the map you were before. "
… …
1599 on_reply => sub { 1718 on_reply => sub {
1600 my ($ns, $msg) = @_; 1719 my ($ns, $msg) = @_;
1601 1720
1602 # this weird shuffling is so that direct followup queries 1721 # this weird shuffling is so that direct followup queries
1603 # get handled first 1722 # get handled first
1604 my $queue = delete $ns->{query_queue}; 1723 my $queue = delete $ns->{query_queue}
1724 or return; # be conservative, not sure how that can happen, but we saw a crash here
1605 1725
1606 (shift @$queue)->[1]->($msg); 1726 (shift @$queue)->[1]->($msg);
1607 1727
1608 push @{ $ns->{query_queue} }, @$queue; 1728 push @{ $ns->{query_queue} }, @$queue;
1609 1729
… …
1615 } 1735 }
1616 } 1736 }
1617 }, 1737 },
1618); 1738);
1619 1739
1620=item $client->coro (\&cb) 1740=item $client->async (\&cb)
1621 1741
1622Create a new coroutine, running the specified callback. The coroutine will 1742Create a new coroutine, running the specified callback. The coroutine will
1623be automatically cancelled when the client gets destroyed (e.g. on logout, 1743be automatically cancelled when the client gets destroyed (e.g. on logout,
1624or loss of connection). 1744or loss of connection).
1625 1745
1626=cut 1746=cut
1627 1747
1628sub cf::client::coro { 1748sub cf::client::async {
1629 my ($self, $cb) = @_; 1749 my ($self, $cb) = @_;
1630 1750
1631 my $coro; $coro = async { 1751 my $coro = &Coro::async ($cb);
1632 eval {
1633 $cb->();
1634 };
1635 warn $@ if $@;
1636 };
1637 1752
1638 $coro->on_destroy (sub { 1753 $coro->on_destroy (sub {
1639 delete $self->{_coro}{$coro+0}; 1754 delete $self->{_coro}{$coro+0};
1640 }); 1755 });
1641 1756
… …
1813 1928
1814{ 1929{
1815 my $path = cf::localdir . "/database.pst"; 1930 my $path = cf::localdir . "/database.pst";
1816 1931
1817 sub db_load() { 1932 sub db_load() {
1818 warn "loading database $path\n";#d# remove later
1819 $DB = stat $path ? Storable::retrieve $path : { }; 1933 $DB = stat $path ? Storable::retrieve $path : { };
1820 } 1934 }
1821 1935
1822 my $pid; 1936 my $pid;
1823 1937
1824 sub db_save() { 1938 sub db_save() {
1825 warn "saving database $path\n";#d# remove later
1826 waitpid $pid, 0 if $pid; 1939 waitpid $pid, 0 if $pid;
1827 if (0 == ($pid = fork)) { 1940 if (0 == ($pid = fork)) {
1828 $DB->{_meta}{version} = 1; 1941 $DB->{_meta}{version} = 1;
1829 Storable::nstore $DB, "$path~"; 1942 Storable::nstore $DB, "$path~";
1830 rename "$path~", $path; 1943 rename "$path~", $path;
… …
1878 open my $fh, "<:utf8", cf::confdir . "/config" 1991 open my $fh, "<:utf8", cf::confdir . "/config"
1879 or return; 1992 or return;
1880 1993
1881 local $/; 1994 local $/;
1882 *CFG = YAML::Syck::Load <$fh>; 1995 *CFG = YAML::Syck::Load <$fh>;
1996
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998
1999 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2000 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001
2002 if (exists $CFG{mlockall}) {
2003 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall
2005 and die "WARNING: m(un)lockall failed: $!\n";
2006 };
2007 warn $@ if $@;
2008 }
1883} 2009}
1884 2010
1885sub main { 2011sub main {
1886 # we must not ever block the main coroutine 2012 # we must not ever block the main coroutine
1887 local $Coro::idle = sub { 2013 local $Coro::idle = sub {
1888 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2014 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1889 (Coro::unblock_sub {
1890 Event::one_event; 2015 async { Event::one_event };
1891 })->();
1892 }; 2016 };
1893 2017
1894 cfg_load; 2018 cfg_load;
1895 db_load; 2019 db_load;
1896 load_extensions; 2020 load_extensions;
… …
1907 return; 2031 return;
1908 } 2032 }
1909 2033
1910 warn "reloading..."; 2034 warn "reloading...";
1911 2035
1912 local $FREEZE = 1; 2036 my $guard = freeze_mainloop;
1913 cf::emergency_save; 2037 cf::emergency_save;
1914 2038
1915 eval { 2039 eval {
1916 # if anything goes wrong in here, we should simply crash as we already saved 2040 # if anything goes wrong in here, we should simply crash as we already saved
1917 2041
… …
2053 reentrant => 0, 2177 reentrant => 0,
2054 prio => 0, 2178 prio => 0,
2055 at => $NEXT_TICK || $TICK, 2179 at => $NEXT_TICK || $TICK,
2056 data => WF_AUTOCANCEL, 2180 data => WF_AUTOCANCEL,
2057 cb => sub { 2181 cb => sub {
2058 unless ($FREEZE) {
2059 cf::server_tick; # one server iteration 2182 cf::server_tick; # one server iteration
2060 $RUNTIME += $TICK; 2183 $RUNTIME += $TICK;
2061 }
2062
2063 $NEXT_TICK += $TICK; 2184 $NEXT_TICK += $TICK;
2064 2185
2065 # if we are delayed by four ticks or more, skip them all 2186 # if we are delayed by four ticks or more, skip them all
2066 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2067 2188
… …
2090 or warn "ERROR: unable to write runtime file: $!"; 2211 or warn "ERROR: unable to write runtime file: $!";
2091 })->(); 2212 })->();
2092 }, 2213 },
2093); 2214);
2094 2215
2216END { cf::emergency_save }
2217
20951 22181
2096 2219

Diff Legend

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