portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WinKD: Remove winkd_lock_tryenter()

Browse source 
* Use `winkd_lock_enter()` and make it possible to break it through `RzCons`
This commit is contained in:
GustavoLCR 2022-05-02 22:10:20 -03:00 committed by Anton Kochkov
parent 210f87573e
commit 3cabf34561
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
librz/debug/p/debug_winkd.c
View file

@ -41,7 +41,9 @@ static RzDebugReasonType rz_debug_winkd_wait(RzDebug *dbg, int pid) {
RzDebugReasonType reason = RZ_DEBUG_REASON_UNKNOWN;
kd_packet_t *pkt = NULL;
kd_stc_64 *stc;
winkd_lock_enter(kdctx);
if (!winkd_lock_enter(kdctx)) {
return RZ_DEBUG_REASON_UNKNOWN;
}
for (;;) {
void *bed = rz_cons_sleep_begin();
int ret = winkd_wait_packet(kdctx, KD_PACKET_TYPE_STATE_CHANGE64, &pkt);

19
subprojects/rzwinkd/winkd.c
View file

@ -30,15 +30,12 @@
bool winkd_lock_enter(KdCtx *ctx) {
rz_cons_break_push(winkd_break, ctx);
rz_th_lock_enter(ctx->dontmix);
return true;
}
bool winkd_lock_tryenter(KdCtx *ctx) {
if (!rz_th_lock_tryenter(ctx->dontmix)) {
return false;
while (!rz_th_lock_tryenter(ctx->dontmix)) {
if (rz_cons_is_breaked()) {
rz_cons_break_pop();
return false;
}
}
rz_cons_break_push(winkd_break, ctx);
return true;
}
@ -244,7 +241,8 @@ static int do_io_reply(KdCtx *ctx, kd_packet_t *pkt) {
int ret;
ioc.req = 0x3430;
ioc.ret = KD_RET_ENOENT;
winkd_lock_enter(ctx);
while (!winkd_lock_enter(ctx)) {
};
id = pkt->id;
ret = kd_send_data_packet(ctx->desc, KD_PACKET_TYPE_FILE_IO,
(ctx->seq_id ^= 1), (uint8_t *)&ioc, sizeof(kd_ioc_t), NULL, 0);
@ -990,7 +988,8 @@ int winkd_sync(KdCtx *ctx) {
return 0;
}
winkd_lock_enter(ctx);
while (!winkd_lock_enter(ctx)) {
};
if (ctx->desc->iob->type == KD_IO_NET) {
// Read a KD packet to initialize KDNet interface

1
subprojects/rzwinkd/winkd.h
View file

@ -168,5 +168,4 @@ int winkd_write_at_phys(KdCtx *ctx, const ut64 offset, const uint8_t *buf, const
void winkd_break(void *ctx);
bool winkd_lock_enter(KdCtx *ctx);
bool winkd_lock_leave(KdCtx *ctx);
bool winkd_lock_tryenter(KdCtx *ctx);
#endif